From: Ed Warnicke Date: Tue, 4 Nov 2014 22:17:43 +0000 (-0600) Subject: Move adsal into its own subdirectory. X-Git-Tag: release/lithium~888^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=42c32160bfd41de57189bb246fec5ffb48ed8e9e Move adsal into its own subdirectory. Moved various adsal components into an opendaylight/adsal subdir, gave it a parent pom, and changed the root parent pom to have the opendaylight/adsal as a module. Change-Id: I1d0e5a7b2a50c65559c2f80dd47cab491b68d561 Signed-off-by: Ed Warnicke --- diff --git a/features/pom.xml b/features/pom.xml index 5270e3f5cd..ba938c6a6f 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -13,11 +13,6 @@ 3.0 - base - controller - adsal - nsf - extras config config-persister config-netty @@ -25,7 +20,6 @@ flow netconf protocol-framework - adsal-compatibility akka netconf-connector restconf diff --git a/opendaylight/appauth/pom.xml b/opendaylight/adsal/appauth/pom.xml similarity index 97% rename from opendaylight/appauth/pom.xml rename to opendaylight/adsal/appauth/pom.xml index 8a035510bf..7c0c999a0f 100644 --- a/opendaylight/appauth/pom.xml +++ b/opendaylight/adsal/appauth/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../commons/opendaylight + ../../commons/opendaylight appauth 0.5.0-SNAPSHOT diff --git a/opendaylight/appauth/src/main/java/org/opendaylight/controller/appauth/Application.java b/opendaylight/adsal/appauth/src/main/java/org/opendaylight/controller/appauth/Application.java similarity index 100% rename from opendaylight/appauth/src/main/java/org/opendaylight/controller/appauth/Application.java rename to opendaylight/adsal/appauth/src/main/java/org/opendaylight/controller/appauth/Application.java diff --git a/opendaylight/appauth/src/main/java/org/opendaylight/controller/appauth/authorization/Authorization.java b/opendaylight/adsal/appauth/src/main/java/org/opendaylight/controller/appauth/authorization/Authorization.java similarity index 100% rename from opendaylight/appauth/src/main/java/org/opendaylight/controller/appauth/authorization/Authorization.java rename to opendaylight/adsal/appauth/src/main/java/org/opendaylight/controller/appauth/authorization/Authorization.java diff --git a/opendaylight/arphandler/pom.xml b/opendaylight/adsal/arphandler/pom.xml similarity index 98% rename from opendaylight/arphandler/pom.xml rename to opendaylight/adsal/arphandler/pom.xml index ffd528beb0..d9e18ea6ab 100644 --- a/opendaylight/arphandler/pom.xml +++ b/opendaylight/adsal/arphandler/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../commons/opendaylight + ../../commons/opendaylight arphandler 0.6.0-SNAPSHOT diff --git a/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/ARPCacheEvent.java b/opendaylight/adsal/arphandler/src/main/java/org/opendaylight/controller/arphandler/ARPCacheEvent.java similarity index 100% rename from opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/ARPCacheEvent.java rename to opendaylight/adsal/arphandler/src/main/java/org/opendaylight/controller/arphandler/ARPCacheEvent.java diff --git a/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/ARPEvent.java b/opendaylight/adsal/arphandler/src/main/java/org/opendaylight/controller/arphandler/ARPEvent.java similarity index 100% rename from opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/ARPEvent.java rename to opendaylight/adsal/arphandler/src/main/java/org/opendaylight/controller/arphandler/ARPEvent.java diff --git a/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/ARPReply.java b/opendaylight/adsal/arphandler/src/main/java/org/opendaylight/controller/arphandler/ARPReply.java similarity index 100% rename from opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/ARPReply.java rename to opendaylight/adsal/arphandler/src/main/java/org/opendaylight/controller/arphandler/ARPReply.java diff --git a/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/ARPRequest.java b/opendaylight/adsal/arphandler/src/main/java/org/opendaylight/controller/arphandler/ARPRequest.java similarity index 100% rename from opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/ARPRequest.java rename to opendaylight/adsal/arphandler/src/main/java/org/opendaylight/controller/arphandler/ARPRequest.java diff --git a/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/Activator.java b/opendaylight/adsal/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/Activator.java similarity index 100% rename from opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/Activator.java rename to opendaylight/adsal/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/Activator.java diff --git a/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java b/opendaylight/adsal/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java similarity index 100% rename from opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java rename to opendaylight/adsal/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java diff --git a/opendaylight/arphandler/src/test/java/org/opendaylight/controller/arphandler/internal/ArphandlerTest.java b/opendaylight/adsal/arphandler/src/test/java/org/opendaylight/controller/arphandler/internal/ArphandlerTest.java similarity index 100% rename from opendaylight/arphandler/src/test/java/org/opendaylight/controller/arphandler/internal/ArphandlerTest.java rename to opendaylight/adsal/arphandler/src/test/java/org/opendaylight/controller/arphandler/internal/ArphandlerTest.java diff --git a/opendaylight/clustering/integrationtest/pom.xml b/opendaylight/adsal/clustering/integrationtest/pom.xml similarity index 93% rename from opendaylight/clustering/integrationtest/pom.xml rename to opendaylight/adsal/clustering/integrationtest/pom.xml index fecf4f8034..ea18d61f03 100644 --- a/opendaylight/clustering/integrationtest/pom.xml +++ b/opendaylight/adsal/clustering/integrationtest/pom.xml @@ -11,9 +11,9 @@ clustering.services.integrationtest 0.5.0-SNAPSHOT - ../implementation/target/jacoco-it.exec + ../../implementation/target/jacoco-it.exec - ../implementation/target/jacoco.exec + ../../implementation/target/jacoco.exec @@ -92,7 +92,7 @@ org.jacoco jacoco-maven-plugin - ../implementation/target/jacoco-it.exec + ../../implementation/target/jacoco-it.exec org.opendaylight.controller.* diff --git a/opendaylight/clustering/integrationtest/src/test/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusteringServicesIT.java b/opendaylight/adsal/clustering/integrationtest/src/test/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusteringServicesIT.java similarity index 100% rename from opendaylight/clustering/integrationtest/src/test/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusteringServicesIT.java rename to opendaylight/adsal/clustering/integrationtest/src/test/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusteringServicesIT.java diff --git a/opendaylight/clustering/integrationtest/src/test/resources/logback.xml b/opendaylight/adsal/clustering/integrationtest/src/test/resources/logback.xml similarity index 100% rename from opendaylight/clustering/integrationtest/src/test/resources/logback.xml rename to opendaylight/adsal/clustering/integrationtest/src/test/resources/logback.xml diff --git a/opendaylight/clustering/services/pom.xml b/opendaylight/adsal/clustering/services/pom.xml similarity index 96% rename from opendaylight/clustering/services/pom.xml rename to opendaylight/adsal/clustering/services/pom.xml index 8c66e70cbe..550f580ebd 100644 --- a/opendaylight/clustering/services/pom.xml +++ b/opendaylight/adsal/clustering/services/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight clustering.services diff --git a/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/CacheConfigException.java b/opendaylight/adsal/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/CacheConfigException.java similarity index 100% rename from opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/CacheConfigException.java rename to opendaylight/adsal/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/CacheConfigException.java diff --git a/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/CacheExistException.java b/opendaylight/adsal/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/CacheExistException.java similarity index 100% rename from opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/CacheExistException.java rename to opendaylight/adsal/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/CacheExistException.java diff --git a/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/CacheListenerAddException.java b/opendaylight/adsal/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/CacheListenerAddException.java similarity index 100% rename from opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/CacheListenerAddException.java rename to opendaylight/adsal/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/CacheListenerAddException.java diff --git a/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/ICacheUpdateAware.java b/opendaylight/adsal/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/ICacheUpdateAware.java similarity index 100% rename from opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/ICacheUpdateAware.java rename to opendaylight/adsal/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/ICacheUpdateAware.java diff --git a/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterContainerServices.java b/opendaylight/adsal/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterContainerServices.java similarity index 100% rename from opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterContainerServices.java rename to opendaylight/adsal/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterContainerServices.java diff --git a/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterGlobalServices.java b/opendaylight/adsal/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterGlobalServices.java similarity index 100% rename from opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterGlobalServices.java rename to opendaylight/adsal/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterGlobalServices.java diff --git a/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterServices.java b/opendaylight/adsal/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterServices.java similarity index 100% rename from opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterServices.java rename to opendaylight/adsal/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterServices.java diff --git a/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterServicesCommon.java b/opendaylight/adsal/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterServicesCommon.java similarity index 100% rename from opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterServicesCommon.java rename to opendaylight/adsal/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterServicesCommon.java diff --git a/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/ICoordinatorChangeAware.java b/opendaylight/adsal/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/ICoordinatorChangeAware.java similarity index 100% rename from opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/ICoordinatorChangeAware.java rename to opendaylight/adsal/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/ICoordinatorChangeAware.java diff --git a/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IGetUpdates.java b/opendaylight/adsal/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IGetUpdates.java similarity index 100% rename from opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IGetUpdates.java rename to opendaylight/adsal/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IGetUpdates.java diff --git a/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IListenRoleChange.java b/opendaylight/adsal/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IListenRoleChange.java similarity index 100% rename from opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IListenRoleChange.java rename to opendaylight/adsal/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IListenRoleChange.java diff --git a/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/ListenRoleChangeAddException.java b/opendaylight/adsal/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/ListenRoleChangeAddException.java similarity index 100% rename from opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/ListenRoleChangeAddException.java rename to opendaylight/adsal/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/ListenRoleChangeAddException.java diff --git a/opendaylight/clustering/services_implementation/pom.xml b/opendaylight/adsal/clustering/services_implementation/pom.xml similarity index 98% rename from opendaylight/clustering/services_implementation/pom.xml rename to opendaylight/adsal/clustering/services_implementation/pom.xml index f11f7a14c0..36cd35d891 100644 --- a/opendaylight/clustering/services_implementation/pom.xml +++ b/opendaylight/adsal/clustering/services_implementation/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight clustering.services-implementation diff --git a/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/Activator.java b/opendaylight/adsal/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/Activator.java similarity index 100% rename from opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/Activator.java rename to opendaylight/adsal/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/Activator.java diff --git a/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/CacheListenerContainer.java b/opendaylight/adsal/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/CacheListenerContainer.java similarity index 100% rename from opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/CacheListenerContainer.java rename to opendaylight/adsal/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/CacheListenerContainer.java diff --git a/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClassResolver.java b/opendaylight/adsal/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClassResolver.java similarity index 100% rename from opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClassResolver.java rename to opendaylight/adsal/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClassResolver.java diff --git a/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterContainerManager.java b/opendaylight/adsal/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterContainerManager.java similarity index 100% rename from opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterContainerManager.java rename to opendaylight/adsal/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterContainerManager.java diff --git a/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterGlobalManager.java b/opendaylight/adsal/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterGlobalManager.java similarity index 100% rename from opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterGlobalManager.java rename to opendaylight/adsal/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterGlobalManager.java diff --git a/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManager.java b/opendaylight/adsal/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManager.java similarity index 100% rename from opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManager.java rename to opendaylight/adsal/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManager.java diff --git a/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManagerCLI.java b/opendaylight/adsal/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManagerCLI.java similarity index 100% rename from opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManagerCLI.java rename to opendaylight/adsal/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManagerCLI.java diff --git a/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManagerCommon.java b/opendaylight/adsal/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManagerCommon.java similarity index 100% rename from opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManagerCommon.java rename to opendaylight/adsal/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManagerCommon.java diff --git a/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/GetUpdatesContainer.java b/opendaylight/adsal/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/GetUpdatesContainer.java similarity index 100% rename from opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/GetUpdatesContainer.java rename to opendaylight/adsal/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/GetUpdatesContainer.java diff --git a/opendaylight/clustering/services_implementation/src/main/resources/config/infinispan-config.xml b/opendaylight/adsal/clustering/services_implementation/src/main/resources/config/infinispan-config.xml similarity index 100% rename from opendaylight/clustering/services_implementation/src/main/resources/config/infinispan-config.xml rename to opendaylight/adsal/clustering/services_implementation/src/main/resources/config/infinispan-config.xml diff --git a/opendaylight/clustering/services_implementation/src/main/resources/config/jgroups.xml b/opendaylight/adsal/clustering/services_implementation/src/main/resources/config/jgroups.xml similarity index 100% rename from opendaylight/clustering/services_implementation/src/main/resources/config/jgroups.xml rename to opendaylight/adsal/clustering/services_implementation/src/main/resources/config/jgroups.xml diff --git a/opendaylight/clustering/services_implementation/src/test/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManagerTest.java b/opendaylight/adsal/clustering/services_implementation/src/test/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManagerTest.java similarity index 100% rename from opendaylight/clustering/services_implementation/src/test/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManagerTest.java rename to opendaylight/adsal/clustering/services_implementation/src/test/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManagerTest.java diff --git a/opendaylight/clustering/stub/pom.xml b/opendaylight/adsal/clustering/stub/pom.xml similarity index 96% rename from opendaylight/clustering/stub/pom.xml rename to opendaylight/adsal/clustering/stub/pom.xml index 211dcc29d0..7ab30110f3 100644 --- a/opendaylight/clustering/stub/pom.xml +++ b/opendaylight/adsal/clustering/stub/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight clustering.stub diff --git a/opendaylight/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/Activator.java b/opendaylight/adsal/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/Activator.java similarity index 100% rename from opendaylight/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/Activator.java rename to opendaylight/adsal/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/Activator.java diff --git a/opendaylight/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/ClusterContainerManager.java b/opendaylight/adsal/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/ClusterContainerManager.java similarity index 100% rename from opendaylight/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/ClusterContainerManager.java rename to opendaylight/adsal/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/ClusterContainerManager.java diff --git a/opendaylight/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/ClusterGlobalManager.java b/opendaylight/adsal/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/ClusterGlobalManager.java similarity index 100% rename from opendaylight/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/ClusterGlobalManager.java rename to opendaylight/adsal/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/ClusterGlobalManager.java diff --git a/opendaylight/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/ClusterManagerCommon.java b/opendaylight/adsal/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/ClusterManagerCommon.java similarity index 100% rename from opendaylight/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/ClusterManagerCommon.java rename to opendaylight/adsal/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/ClusterManagerCommon.java diff --git a/opendaylight/clustering/stub/src/test/java/org/opendaylight/controller/clustering/stub/internal/TestClusteringStub.java b/opendaylight/adsal/clustering/stub/src/test/java/org/opendaylight/controller/clustering/stub/internal/TestClusteringStub.java similarity index 100% rename from opendaylight/clustering/stub/src/test/java/org/opendaylight/controller/clustering/stub/internal/TestClusteringStub.java rename to opendaylight/adsal/clustering/stub/src/test/java/org/opendaylight/controller/clustering/stub/internal/TestClusteringStub.java diff --git a/opendaylight/clustering/test/pom.xml b/opendaylight/adsal/clustering/test/pom.xml similarity index 98% rename from opendaylight/clustering/test/pom.xml rename to opendaylight/adsal/clustering/test/pom.xml index 93294f2290..93407ea3d7 100644 --- a/opendaylight/clustering/test/pom.xml +++ b/opendaylight/adsal/clustering/test/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight clustering.test diff --git a/opendaylight/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/Activator.java b/opendaylight/adsal/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/Activator.java similarity index 100% rename from opendaylight/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/Activator.java rename to opendaylight/adsal/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/Activator.java diff --git a/opendaylight/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/ComplexClass.java b/opendaylight/adsal/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/ComplexClass.java similarity index 100% rename from opendaylight/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/ComplexClass.java rename to opendaylight/adsal/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/ComplexClass.java diff --git a/opendaylight/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/ComplexClass1.java b/opendaylight/adsal/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/ComplexClass1.java similarity index 100% rename from opendaylight/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/ComplexClass1.java rename to opendaylight/adsal/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/ComplexClass1.java diff --git a/opendaylight/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/ComplexContainer.java b/opendaylight/adsal/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/ComplexContainer.java similarity index 100% rename from opendaylight/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/ComplexContainer.java rename to opendaylight/adsal/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/ComplexContainer.java diff --git a/opendaylight/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/IComplex.java b/opendaylight/adsal/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/IComplex.java similarity index 100% rename from opendaylight/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/IComplex.java rename to opendaylight/adsal/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/IComplex.java diff --git a/opendaylight/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/LoggingListener.java b/opendaylight/adsal/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/LoggingListener.java similarity index 100% rename from opendaylight/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/LoggingListener.java rename to opendaylight/adsal/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/LoggingListener.java diff --git a/opendaylight/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/SimpleClient.java b/opendaylight/adsal/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/SimpleClient.java similarity index 100% rename from opendaylight/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/SimpleClient.java rename to opendaylight/adsal/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/SimpleClient.java diff --git a/opendaylight/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/StringContainer.java b/opendaylight/adsal/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/StringContainer.java similarity index 100% rename from opendaylight/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/StringContainer.java rename to opendaylight/adsal/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/StringContainer.java diff --git a/opendaylight/clustering/test/src/test/java/org/opendaylight/controller/clustering/test/internal/TestClusteringTest.java b/opendaylight/adsal/clustering/test/src/test/java/org/opendaylight/controller/clustering/test/internal/TestClusteringTest.java similarity index 100% rename from opendaylight/clustering/test/src/test/java/org/opendaylight/controller/clustering/test/internal/TestClusteringTest.java rename to opendaylight/adsal/clustering/test/src/test/java/org/opendaylight/controller/clustering/test/internal/TestClusteringTest.java diff --git a/opendaylight/commons/httpclient/pom.xml b/opendaylight/adsal/commons/httpclient/pom.xml similarity index 97% rename from opendaylight/commons/httpclient/pom.xml rename to opendaylight/adsal/commons/httpclient/pom.xml index 3848044b43..93a537c00c 100644 --- a/opendaylight/commons/httpclient/pom.xml +++ b/opendaylight/adsal/commons/httpclient/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight commons.httpclient diff --git a/opendaylight/commons/httpclient/src/main/java/org/opendaylight/controller/commons/httpclient/HTTPClient.java b/opendaylight/adsal/commons/httpclient/src/main/java/org/opendaylight/controller/commons/httpclient/HTTPClient.java similarity index 100% rename from opendaylight/commons/httpclient/src/main/java/org/opendaylight/controller/commons/httpclient/HTTPClient.java rename to opendaylight/adsal/commons/httpclient/src/main/java/org/opendaylight/controller/commons/httpclient/HTTPClient.java diff --git a/opendaylight/commons/httpclient/src/main/java/org/opendaylight/controller/commons/httpclient/HTTPRequest.java b/opendaylight/adsal/commons/httpclient/src/main/java/org/opendaylight/controller/commons/httpclient/HTTPRequest.java similarity index 100% rename from opendaylight/commons/httpclient/src/main/java/org/opendaylight/controller/commons/httpclient/HTTPRequest.java rename to opendaylight/adsal/commons/httpclient/src/main/java/org/opendaylight/controller/commons/httpclient/HTTPRequest.java diff --git a/opendaylight/commons/httpclient/src/main/java/org/opendaylight/controller/commons/httpclient/HTTPResponse.java b/opendaylight/adsal/commons/httpclient/src/main/java/org/opendaylight/controller/commons/httpclient/HTTPResponse.java similarity index 100% rename from opendaylight/commons/httpclient/src/main/java/org/opendaylight/controller/commons/httpclient/HTTPResponse.java rename to opendaylight/adsal/commons/httpclient/src/main/java/org/opendaylight/controller/commons/httpclient/HTTPResponse.java diff --git a/opendaylight/commons/integrationtest/pom.xml b/opendaylight/adsal/commons/integrationtest/pom.xml similarity index 98% rename from opendaylight/commons/integrationtest/pom.xml rename to opendaylight/adsal/commons/integrationtest/pom.xml index 4769a03b2f..1701964bf1 100644 --- a/opendaylight/commons/integrationtest/pom.xml +++ b/opendaylight/adsal/commons/integrationtest/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight commons.integrationtest diff --git a/opendaylight/configuration/api/pom.xml b/opendaylight/adsal/configuration/api/pom.xml similarity index 96% rename from opendaylight/configuration/api/pom.xml rename to opendaylight/adsal/configuration/api/pom.xml index 50f19278c6..dec934bf6e 100644 --- a/opendaylight/configuration/api/pom.xml +++ b/opendaylight/adsal/configuration/api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight configuration diff --git a/opendaylight/configuration/api/src/main/java/org/opendaylight/controller/configuration/ConfigurationEvent.java b/opendaylight/adsal/configuration/api/src/main/java/org/opendaylight/controller/configuration/ConfigurationEvent.java similarity index 100% rename from opendaylight/configuration/api/src/main/java/org/opendaylight/controller/configuration/ConfigurationEvent.java rename to opendaylight/adsal/configuration/api/src/main/java/org/opendaylight/controller/configuration/ConfigurationEvent.java diff --git a/opendaylight/configuration/api/src/main/java/org/opendaylight/controller/configuration/ConfigurationObject.java b/opendaylight/adsal/configuration/api/src/main/java/org/opendaylight/controller/configuration/ConfigurationObject.java similarity index 100% rename from opendaylight/configuration/api/src/main/java/org/opendaylight/controller/configuration/ConfigurationObject.java rename to opendaylight/adsal/configuration/api/src/main/java/org/opendaylight/controller/configuration/ConfigurationObject.java diff --git a/opendaylight/configuration/api/src/main/java/org/opendaylight/controller/configuration/IConfigurationAware.java b/opendaylight/adsal/configuration/api/src/main/java/org/opendaylight/controller/configuration/IConfigurationAware.java similarity index 100% rename from opendaylight/configuration/api/src/main/java/org/opendaylight/controller/configuration/IConfigurationAware.java rename to opendaylight/adsal/configuration/api/src/main/java/org/opendaylight/controller/configuration/IConfigurationAware.java diff --git a/opendaylight/configuration/api/src/main/java/org/opendaylight/controller/configuration/IConfigurationAwareCommon.java b/opendaylight/adsal/configuration/api/src/main/java/org/opendaylight/controller/configuration/IConfigurationAwareCommon.java similarity index 100% rename from opendaylight/configuration/api/src/main/java/org/opendaylight/controller/configuration/IConfigurationAwareCommon.java rename to opendaylight/adsal/configuration/api/src/main/java/org/opendaylight/controller/configuration/IConfigurationAwareCommon.java diff --git a/opendaylight/configuration/api/src/main/java/org/opendaylight/controller/configuration/IConfigurationContainerAware.java b/opendaylight/adsal/configuration/api/src/main/java/org/opendaylight/controller/configuration/IConfigurationContainerAware.java similarity index 100% rename from opendaylight/configuration/api/src/main/java/org/opendaylight/controller/configuration/IConfigurationContainerAware.java rename to opendaylight/adsal/configuration/api/src/main/java/org/opendaylight/controller/configuration/IConfigurationContainerAware.java diff --git a/opendaylight/configuration/api/src/main/java/org/opendaylight/controller/configuration/IConfigurationContainerService.java b/opendaylight/adsal/configuration/api/src/main/java/org/opendaylight/controller/configuration/IConfigurationContainerService.java similarity index 100% rename from opendaylight/configuration/api/src/main/java/org/opendaylight/controller/configuration/IConfigurationContainerService.java rename to opendaylight/adsal/configuration/api/src/main/java/org/opendaylight/controller/configuration/IConfigurationContainerService.java diff --git a/opendaylight/configuration/api/src/main/java/org/opendaylight/controller/configuration/IConfigurationService.java b/opendaylight/adsal/configuration/api/src/main/java/org/opendaylight/controller/configuration/IConfigurationService.java similarity index 100% rename from opendaylight/configuration/api/src/main/java/org/opendaylight/controller/configuration/IConfigurationService.java rename to opendaylight/adsal/configuration/api/src/main/java/org/opendaylight/controller/configuration/IConfigurationService.java diff --git a/opendaylight/configuration/api/src/main/java/org/opendaylight/controller/configuration/IConfigurationServiceCommon.java b/opendaylight/adsal/configuration/api/src/main/java/org/opendaylight/controller/configuration/IConfigurationServiceCommon.java similarity index 100% rename from opendaylight/configuration/api/src/main/java/org/opendaylight/controller/configuration/IConfigurationServiceCommon.java rename to opendaylight/adsal/configuration/api/src/main/java/org/opendaylight/controller/configuration/IConfigurationServiceCommon.java diff --git a/opendaylight/configuration/implementation/pom.xml b/opendaylight/adsal/configuration/implementation/pom.xml similarity index 97% rename from opendaylight/configuration/implementation/pom.xml rename to opendaylight/adsal/configuration/implementation/pom.xml index 4387de70ea..a35d2e9406 100644 --- a/opendaylight/configuration/implementation/pom.xml +++ b/opendaylight/adsal/configuration/implementation/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight configuration.implementation diff --git a/opendaylight/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/Activator.java b/opendaylight/adsal/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/Activator.java similarity index 100% rename from opendaylight/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/Activator.java rename to opendaylight/adsal/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/Activator.java diff --git a/opendaylight/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/ConfigurationService.java b/opendaylight/adsal/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/ConfigurationService.java similarity index 100% rename from opendaylight/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/ConfigurationService.java rename to opendaylight/adsal/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/ConfigurationService.java diff --git a/opendaylight/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/ContainerConfigurationService.java b/opendaylight/adsal/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/ContainerConfigurationService.java similarity index 100% rename from opendaylight/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/ContainerConfigurationService.java rename to opendaylight/adsal/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/ContainerConfigurationService.java diff --git a/opendaylight/configuration/implementation/src/test/java/org/opendaylight/controller/configuration/internal/ConfigurationAwareTest.java b/opendaylight/adsal/configuration/implementation/src/test/java/org/opendaylight/controller/configuration/internal/ConfigurationAwareTest.java similarity index 100% rename from opendaylight/configuration/implementation/src/test/java/org/opendaylight/controller/configuration/internal/ConfigurationAwareTest.java rename to opendaylight/adsal/configuration/implementation/src/test/java/org/opendaylight/controller/configuration/internal/ConfigurationAwareTest.java diff --git a/opendaylight/configuration/implementation/src/test/java/org/opendaylight/controller/configuration/internal/ConfigurationContainerAwareTest.java b/opendaylight/adsal/configuration/implementation/src/test/java/org/opendaylight/controller/configuration/internal/ConfigurationContainerAwareTest.java similarity index 100% rename from opendaylight/configuration/implementation/src/test/java/org/opendaylight/controller/configuration/internal/ConfigurationContainerAwareTest.java rename to opendaylight/adsal/configuration/implementation/src/test/java/org/opendaylight/controller/configuration/internal/ConfigurationContainerAwareTest.java diff --git a/opendaylight/configuration/implementation/src/test/java/org/opendaylight/controller/configuration/internal/ConfigurationContainerImplTest.java b/opendaylight/adsal/configuration/implementation/src/test/java/org/opendaylight/controller/configuration/internal/ConfigurationContainerImplTest.java similarity index 100% rename from opendaylight/configuration/implementation/src/test/java/org/opendaylight/controller/configuration/internal/ConfigurationContainerImplTest.java rename to opendaylight/adsal/configuration/implementation/src/test/java/org/opendaylight/controller/configuration/internal/ConfigurationContainerImplTest.java diff --git a/opendaylight/configuration/implementation/src/test/java/org/opendaylight/controller/configuration/internal/ConfigurationImplTest.java b/opendaylight/adsal/configuration/implementation/src/test/java/org/opendaylight/controller/configuration/internal/ConfigurationImplTest.java similarity index 100% rename from opendaylight/configuration/implementation/src/test/java/org/opendaylight/controller/configuration/internal/ConfigurationImplTest.java rename to opendaylight/adsal/configuration/implementation/src/test/java/org/opendaylight/controller/configuration/internal/ConfigurationImplTest.java diff --git a/opendaylight/configuration/integrationtest/.gitignore b/opendaylight/adsal/configuration/integrationtest/.gitignore similarity index 100% rename from opendaylight/configuration/integrationtest/.gitignore rename to opendaylight/adsal/configuration/integrationtest/.gitignore diff --git a/opendaylight/configuration/integrationtest/pom.xml b/opendaylight/adsal/configuration/integrationtest/pom.xml similarity index 100% rename from opendaylight/configuration/integrationtest/pom.xml rename to opendaylight/adsal/configuration/integrationtest/pom.xml diff --git a/opendaylight/configuration/integrationtest/src/test/java/org/opendaylight/controller/configuration/internal/ConfigurationIT.java b/opendaylight/adsal/configuration/integrationtest/src/test/java/org/opendaylight/controller/configuration/internal/ConfigurationIT.java similarity index 100% rename from opendaylight/configuration/integrationtest/src/test/java/org/opendaylight/controller/configuration/internal/ConfigurationIT.java rename to opendaylight/adsal/configuration/integrationtest/src/test/java/org/opendaylight/controller/configuration/internal/ConfigurationIT.java diff --git a/opendaylight/configuration/integrationtest/src/test/resources/logback.xml b/opendaylight/adsal/configuration/integrationtest/src/test/resources/logback.xml similarity index 100% rename from opendaylight/configuration/integrationtest/src/test/resources/logback.xml rename to opendaylight/adsal/configuration/integrationtest/src/test/resources/logback.xml diff --git a/opendaylight/connectionmanager/api/pom.xml b/opendaylight/adsal/connectionmanager/api/pom.xml similarity index 96% rename from opendaylight/connectionmanager/api/pom.xml rename to opendaylight/adsal/connectionmanager/api/pom.xml index 2718ed1afe..aee485419c 100644 --- a/opendaylight/connectionmanager/api/pom.xml +++ b/opendaylight/adsal/connectionmanager/api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight connectionmanager diff --git a/opendaylight/connectionmanager/api/src/main/java/org/opendaylight/controller/connectionmanager/ConnectionMgmtScheme.java b/opendaylight/adsal/connectionmanager/api/src/main/java/org/opendaylight/controller/connectionmanager/ConnectionMgmtScheme.java similarity index 100% rename from opendaylight/connectionmanager/api/src/main/java/org/opendaylight/controller/connectionmanager/ConnectionMgmtScheme.java rename to opendaylight/adsal/connectionmanager/api/src/main/java/org/opendaylight/controller/connectionmanager/ConnectionMgmtScheme.java diff --git a/opendaylight/connectionmanager/api/src/main/java/org/opendaylight/controller/connectionmanager/IConnectionManager.java b/opendaylight/adsal/connectionmanager/api/src/main/java/org/opendaylight/controller/connectionmanager/IConnectionManager.java similarity index 100% rename from opendaylight/connectionmanager/api/src/main/java/org/opendaylight/controller/connectionmanager/IConnectionManager.java rename to opendaylight/adsal/connectionmanager/api/src/main/java/org/opendaylight/controller/connectionmanager/IConnectionManager.java diff --git a/opendaylight/connectionmanager/api/src/main/java/org/opendaylight/controller/connectionmanager/NodeAccessPermission.java b/opendaylight/adsal/connectionmanager/api/src/main/java/org/opendaylight/controller/connectionmanager/NodeAccessPermission.java similarity index 100% rename from opendaylight/connectionmanager/api/src/main/java/org/opendaylight/controller/connectionmanager/NodeAccessPermission.java rename to opendaylight/adsal/connectionmanager/api/src/main/java/org/opendaylight/controller/connectionmanager/NodeAccessPermission.java diff --git a/opendaylight/connectionmanager/implementation/pom.xml b/opendaylight/adsal/connectionmanager/implementation/pom.xml similarity index 97% rename from opendaylight/connectionmanager/implementation/pom.xml rename to opendaylight/adsal/connectionmanager/implementation/pom.xml index fe2514e58a..b8293609a2 100644 --- a/opendaylight/connectionmanager/implementation/pom.xml +++ b/opendaylight/adsal/connectionmanager/implementation/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight connectionmanager.implementation diff --git a/opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/internal/Activator.java b/opendaylight/adsal/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/internal/Activator.java similarity index 100% rename from opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/internal/Activator.java rename to opendaylight/adsal/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/internal/Activator.java diff --git a/opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/internal/ConnectionManager.java b/opendaylight/adsal/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/internal/ConnectionManager.java similarity index 100% rename from opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/internal/ConnectionManager.java rename to opendaylight/adsal/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/internal/ConnectionManager.java diff --git a/opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/internal/ConnectionMgmtEvent.java b/opendaylight/adsal/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/internal/ConnectionMgmtEvent.java similarity index 100% rename from opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/internal/ConnectionMgmtEvent.java rename to opendaylight/adsal/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/internal/ConnectionMgmtEvent.java diff --git a/opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/internal/ConnectionMgmtEventType.java b/opendaylight/adsal/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/internal/ConnectionMgmtEventType.java similarity index 100% rename from opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/internal/ConnectionMgmtEventType.java rename to opendaylight/adsal/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/internal/ConnectionMgmtEventType.java diff --git a/opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/AbstractScheme.java b/opendaylight/adsal/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/AbstractScheme.java similarity index 100% rename from opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/AbstractScheme.java rename to opendaylight/adsal/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/AbstractScheme.java diff --git a/opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/AnyControllerScheme.java b/opendaylight/adsal/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/AnyControllerScheme.java similarity index 100% rename from opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/AnyControllerScheme.java rename to opendaylight/adsal/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/AnyControllerScheme.java diff --git a/opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/ControllerConfig.java b/opendaylight/adsal/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/ControllerConfig.java similarity index 100% rename from opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/ControllerConfig.java rename to opendaylight/adsal/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/ControllerConfig.java diff --git a/opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/LoadBalancedScheme.java b/opendaylight/adsal/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/LoadBalancedScheme.java similarity index 100% rename from opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/LoadBalancedScheme.java rename to opendaylight/adsal/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/LoadBalancedScheme.java diff --git a/opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/RoundRobinScheme.java b/opendaylight/adsal/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/RoundRobinScheme.java similarity index 100% rename from opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/RoundRobinScheme.java rename to opendaylight/adsal/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/RoundRobinScheme.java diff --git a/opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/SchemeFactory.java b/opendaylight/adsal/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/SchemeFactory.java similarity index 100% rename from opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/SchemeFactory.java rename to opendaylight/adsal/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/SchemeFactory.java diff --git a/opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/SingleControllerScheme.java b/opendaylight/adsal/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/SingleControllerScheme.java similarity index 100% rename from opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/SingleControllerScheme.java rename to opendaylight/adsal/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/SingleControllerScheme.java diff --git a/opendaylight/containermanager/api/pom.xml b/opendaylight/adsal/containermanager/api/pom.xml similarity index 97% rename from opendaylight/containermanager/api/pom.xml rename to opendaylight/adsal/containermanager/api/pom.xml index c9b54a1b6c..31b209410d 100644 --- a/opendaylight/containermanager/api/pom.xml +++ b/opendaylight/adsal/containermanager/api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight containermanager diff --git a/opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerChangeEvent.java b/opendaylight/adsal/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerChangeEvent.java similarity index 100% rename from opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerChangeEvent.java rename to opendaylight/adsal/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerChangeEvent.java diff --git a/opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerConfig.java b/opendaylight/adsal/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerConfig.java similarity index 100% rename from opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerConfig.java rename to opendaylight/adsal/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerConfig.java diff --git a/opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerData.java b/opendaylight/adsal/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerData.java similarity index 100% rename from opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerData.java rename to opendaylight/adsal/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerData.java diff --git a/opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerFlowChangeEvent.java b/opendaylight/adsal/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerFlowChangeEvent.java similarity index 100% rename from opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerFlowChangeEvent.java rename to opendaylight/adsal/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerFlowChangeEvent.java diff --git a/opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerFlowConfig.java b/opendaylight/adsal/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerFlowConfig.java similarity index 100% rename from opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerFlowConfig.java rename to opendaylight/adsal/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerFlowConfig.java diff --git a/opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/IContainerAuthorization.java b/opendaylight/adsal/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/IContainerAuthorization.java similarity index 100% rename from opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/IContainerAuthorization.java rename to opendaylight/adsal/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/IContainerAuthorization.java diff --git a/opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/IContainerManager.java b/opendaylight/adsal/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/IContainerManager.java similarity index 100% rename from opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/IContainerManager.java rename to opendaylight/adsal/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/IContainerManager.java diff --git a/opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/IContainerManagerShell.java b/opendaylight/adsal/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/IContainerManagerShell.java similarity index 100% rename from opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/IContainerManagerShell.java rename to opendaylight/adsal/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/IContainerManagerShell.java diff --git a/opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/NodeConnectorsChangeEvent.java b/opendaylight/adsal/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/NodeConnectorsChangeEvent.java similarity index 100% rename from opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/NodeConnectorsChangeEvent.java rename to opendaylight/adsal/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/NodeConnectorsChangeEvent.java diff --git a/opendaylight/containermanager/implementation/pom.xml b/opendaylight/adsal/containermanager/implementation/pom.xml similarity index 98% rename from opendaylight/containermanager/implementation/pom.xml rename to opendaylight/adsal/containermanager/implementation/pom.xml index 013cd62576..b096ba6c01 100644 --- a/opendaylight/containermanager/implementation/pom.xml +++ b/opendaylight/adsal/containermanager/implementation/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight containermanager.implementation diff --git a/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/Activator.java b/opendaylight/adsal/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/Activator.java similarity index 100% rename from opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/Activator.java rename to opendaylight/adsal/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/Activator.java diff --git a/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerImpl.java b/opendaylight/adsal/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerImpl.java similarity index 100% rename from opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerImpl.java rename to opendaylight/adsal/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerImpl.java diff --git a/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java b/opendaylight/adsal/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java similarity index 100% rename from opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java rename to opendaylight/adsal/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java diff --git a/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/IContainerInternal.java b/opendaylight/adsal/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/IContainerInternal.java similarity index 100% rename from opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/IContainerInternal.java rename to opendaylight/adsal/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/IContainerInternal.java diff --git a/opendaylight/containermanager/it.implementation/pom.xml b/opendaylight/adsal/containermanager/it.implementation/pom.xml similarity index 97% rename from opendaylight/containermanager/it.implementation/pom.xml rename to opendaylight/adsal/containermanager/it.implementation/pom.xml index 8e0475d4a3..e5ad7a7508 100644 --- a/opendaylight/containermanager/it.implementation/pom.xml +++ b/opendaylight/adsal/containermanager/it.implementation/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight containermanager.it.implementation diff --git a/opendaylight/containermanager/it.implementation/src/main/java/org/opendaylight/controller/containermanager/internal/Activator.java b/opendaylight/adsal/containermanager/it.implementation/src/main/java/org/opendaylight/controller/containermanager/internal/Activator.java similarity index 100% rename from opendaylight/containermanager/it.implementation/src/main/java/org/opendaylight/controller/containermanager/internal/Activator.java rename to opendaylight/adsal/containermanager/it.implementation/src/main/java/org/opendaylight/controller/containermanager/internal/Activator.java diff --git a/opendaylight/containermanager/it.implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerImpl.java b/opendaylight/adsal/containermanager/it.implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerImpl.java similarity index 100% rename from opendaylight/containermanager/it.implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerImpl.java rename to opendaylight/adsal/containermanager/it.implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerImpl.java diff --git a/opendaylight/containermanager/it.implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java b/opendaylight/adsal/containermanager/it.implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java similarity index 100% rename from opendaylight/containermanager/it.implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java rename to opendaylight/adsal/containermanager/it.implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java diff --git a/opendaylight/containermanager/it.implementation/src/test/java/org/opendaylight/controller/containermanager/internal/ContainerImplTest.java b/opendaylight/adsal/containermanager/it.implementation/src/test/java/org/opendaylight/controller/containermanager/internal/ContainerImplTest.java similarity index 100% rename from opendaylight/containermanager/it.implementation/src/test/java/org/opendaylight/controller/containermanager/internal/ContainerImplTest.java rename to opendaylight/adsal/containermanager/it.implementation/src/test/java/org/opendaylight/controller/containermanager/internal/ContainerImplTest.java diff --git a/opendaylight/containermanager/it.implementation/src/test/java/org/opendaylight/controller/containermanager/internal/ContainerManagerTest.java b/opendaylight/adsal/containermanager/it.implementation/src/test/java/org/opendaylight/controller/containermanager/internal/ContainerManagerTest.java similarity index 100% rename from opendaylight/containermanager/it.implementation/src/test/java/org/opendaylight/controller/containermanager/internal/ContainerManagerTest.java rename to opendaylight/adsal/containermanager/it.implementation/src/test/java/org/opendaylight/controller/containermanager/internal/ContainerManagerTest.java diff --git a/opendaylight/containermanager/shell/pom.xml b/opendaylight/adsal/containermanager/shell/pom.xml similarity index 96% rename from opendaylight/containermanager/shell/pom.xml rename to opendaylight/adsal/containermanager/shell/pom.xml index c1c2d2055b..065df2c829 100644 --- a/opendaylight/containermanager/shell/pom.xml +++ b/opendaylight/adsal/containermanager/shell/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight containermanager.shell ${containermanager.shell.version} diff --git a/opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/AddContainer.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/AddContainer.java similarity index 100% rename from opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/AddContainer.java rename to opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/AddContainer.java diff --git a/opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/AddContainerEntry.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/AddContainerEntry.java similarity index 100% rename from opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/AddContainerEntry.java rename to opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/AddContainerEntry.java diff --git a/opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/AddContainerFlow.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/AddContainerFlow.java similarity index 100% rename from opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/AddContainerFlow.java rename to opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/AddContainerFlow.java diff --git a/opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetAuthorizedGroups.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetAuthorizedGroups.java similarity index 100% rename from opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetAuthorizedGroups.java rename to opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetAuthorizedGroups.java diff --git a/opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetAuthorizedResources.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetAuthorizedResources.java similarity index 100% rename from opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetAuthorizedResources.java rename to opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetAuthorizedResources.java diff --git a/opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetResourcesForGroup.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetResourcesForGroup.java similarity index 100% rename from opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetResourcesForGroup.java rename to opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetResourcesForGroup.java diff --git a/opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetRoles.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetRoles.java similarity index 100% rename from opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetRoles.java rename to opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetRoles.java diff --git a/opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetUserLevel.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetUserLevel.java similarity index 100% rename from opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetUserLevel.java rename to opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetUserLevel.java diff --git a/opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetUserResources.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetUserResources.java similarity index 100% rename from opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetUserResources.java rename to opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetUserResources.java diff --git a/opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/CreateContainer.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/CreateContainer.java similarity index 100% rename from opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/CreateContainer.java rename to opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/CreateContainer.java diff --git a/opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Pfc.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Pfc.java similarity index 100% rename from opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Pfc.java rename to opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Pfc.java diff --git a/opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psc.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psc.java similarity index 100% rename from opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psc.java rename to opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psc.java diff --git a/opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psd.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psd.java similarity index 100% rename from opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psd.java rename to opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psd.java diff --git a/opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psm.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psm.java similarity index 100% rename from opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psm.java rename to opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psm.java diff --git a/opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psp.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psp.java similarity index 100% rename from opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psp.java rename to opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psp.java diff --git a/opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/RemoveContainer.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/RemoveContainer.java similarity index 100% rename from opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/RemoveContainer.java rename to opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/RemoveContainer.java diff --git a/opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/RemoveContainerEntry.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/RemoveContainerEntry.java similarity index 100% rename from opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/RemoveContainerEntry.java rename to opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/RemoveContainerEntry.java diff --git a/opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/RemoveContainerFlow.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/RemoveContainerFlow.java similarity index 100% rename from opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/RemoveContainerFlow.java rename to opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/RemoveContainerFlow.java diff --git a/opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/SaveConfig.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/SaveConfig.java similarity index 100% rename from opendaylight/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/SaveConfig.java rename to opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/SaveConfig.java diff --git a/opendaylight/containermanager/shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/opendaylight/adsal/containermanager/shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml similarity index 100% rename from opendaylight/containermanager/shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml rename to opendaylight/adsal/containermanager/shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml diff --git a/opendaylight/containermanager/shell/src/test/java/org/opendaylight/controller/containermanager/shell/ContainerManagerShellTest.java b/opendaylight/adsal/containermanager/shell/src/test/java/org/opendaylight/controller/containermanager/shell/ContainerManagerShellTest.java similarity index 100% rename from opendaylight/containermanager/shell/src/test/java/org/opendaylight/controller/containermanager/shell/ContainerManagerShellTest.java rename to opendaylight/adsal/containermanager/shell/src/test/java/org/opendaylight/controller/containermanager/shell/ContainerManagerShellTest.java diff --git a/opendaylight/dummy-console/README b/opendaylight/adsal/dummy-console/README similarity index 100% rename from opendaylight/dummy-console/README rename to opendaylight/adsal/dummy-console/README diff --git a/opendaylight/dummy-console/pom.xml b/opendaylight/adsal/dummy-console/pom.xml similarity index 95% rename from opendaylight/dummy-console/pom.xml rename to opendaylight/adsal/dummy-console/pom.xml index 4195e53310..c8a1a22ae7 100644 --- a/opendaylight/dummy-console/pom.xml +++ b/opendaylight/adsal/dummy-console/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../commons/opendaylight + ../../commons/opendaylight dummy-console 1.2.0-SNAPSHOT diff --git a/opendaylight/dummy-console/src/main/java/org/eclipse/osgi/framework/console/CommandInterpreter.java b/opendaylight/adsal/dummy-console/src/main/java/org/eclipse/osgi/framework/console/CommandInterpreter.java similarity index 100% rename from opendaylight/dummy-console/src/main/java/org/eclipse/osgi/framework/console/CommandInterpreter.java rename to opendaylight/adsal/dummy-console/src/main/java/org/eclipse/osgi/framework/console/CommandInterpreter.java diff --git a/opendaylight/dummy-console/src/main/java/org/eclipse/osgi/framework/console/CommandProvider.java b/opendaylight/adsal/dummy-console/src/main/java/org/eclipse/osgi/framework/console/CommandProvider.java similarity index 100% rename from opendaylight/dummy-console/src/main/java/org/eclipse/osgi/framework/console/CommandProvider.java rename to opendaylight/adsal/dummy-console/src/main/java/org/eclipse/osgi/framework/console/CommandProvider.java diff --git a/features/adsal-compatibility/pom.xml b/opendaylight/adsal/features/adsal-compatibility/pom.xml similarity index 96% rename from features/adsal-compatibility/pom.xml rename to opendaylight/adsal/features/adsal-compatibility/pom.xml index 7b8af64445..d8d1888ba3 100644 --- a/features/adsal-compatibility/pom.xml +++ b/opendaylight/adsal/features/adsal-compatibility/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../opendaylight/commons/opendaylight + ../../../../opendaylight/commons/opendaylight features-adsal-compatibility jar diff --git a/features/adsal-compatibility/src/main/resources/features.xml b/opendaylight/adsal/features/adsal-compatibility/src/main/resources/features.xml similarity index 100% rename from features/adsal-compatibility/src/main/resources/features.xml rename to opendaylight/adsal/features/adsal-compatibility/src/main/resources/features.xml diff --git a/features/adsal/pom.xml b/opendaylight/adsal/features/adsal/pom.xml similarity index 98% rename from features/adsal/pom.xml rename to opendaylight/adsal/features/adsal/pom.xml index 429edf828f..57fa1e2c3f 100644 --- a/features/adsal/pom.xml +++ b/opendaylight/adsal/features/adsal/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../opendaylight/commons/opendaylight + ../../../../opendaylight/commons/opendaylight features-adsal ${sal.version} diff --git a/features/adsal/src/main/resources/features.xml b/opendaylight/adsal/features/adsal/src/main/resources/features.xml similarity index 100% rename from features/adsal/src/main/resources/features.xml rename to opendaylight/adsal/features/adsal/src/main/resources/features.xml diff --git a/features/base/pom.xml b/opendaylight/adsal/features/base/pom.xml similarity index 99% rename from features/base/pom.xml rename to opendaylight/adsal/features/base/pom.xml index 3dbb9391b0..795a323cc1 100644 --- a/features/base/pom.xml +++ b/opendaylight/adsal/features/base/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../opendaylight/commons/opendaylight + ../../../../opendaylight/commons/opendaylight features-base jar diff --git a/features/base/src/main/resources/features.xml b/opendaylight/adsal/features/base/src/main/resources/features.xml similarity index 100% rename from features/base/src/main/resources/features.xml rename to opendaylight/adsal/features/base/src/main/resources/features.xml diff --git a/features/controller/pom.xml b/opendaylight/adsal/features/controller/pom.xml similarity index 95% rename from features/controller/pom.xml rename to opendaylight/adsal/features/controller/pom.xml index 5dd2bd4a2a..34be32ff7f 100644 --- a/features/controller/pom.xml +++ b/opendaylight/adsal/features/controller/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../opendaylight/commons/opendaylight + ../../../../opendaylight/commons/opendaylight controller-features pom diff --git a/features/controller/src/main/resources/features.xml b/opendaylight/adsal/features/controller/src/main/resources/features.xml similarity index 100% rename from features/controller/src/main/resources/features.xml rename to opendaylight/adsal/features/controller/src/main/resources/features.xml diff --git a/features/extras/pom.xml b/opendaylight/adsal/features/extras/pom.xml similarity index 97% rename from features/extras/pom.xml rename to opendaylight/adsal/features/extras/pom.xml index e4356e6b49..103fbefad4 100644 --- a/features/extras/pom.xml +++ b/opendaylight/adsal/features/extras/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../opendaylight/commons/opendaylight + ../../../../opendaylight/commons/opendaylight extras-features kar diff --git a/features/extras/src/main/resources/features.xml b/opendaylight/adsal/features/extras/src/main/resources/features.xml similarity index 100% rename from features/extras/src/main/resources/features.xml rename to opendaylight/adsal/features/extras/src/main/resources/features.xml diff --git a/features/nsf/pom.xml b/opendaylight/adsal/features/nsf/pom.xml similarity index 99% rename from features/nsf/pom.xml rename to opendaylight/adsal/features/nsf/pom.xml index 00dc219b39..0c8e838009 100644 --- a/features/nsf/pom.xml +++ b/opendaylight/adsal/features/nsf/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../opendaylight/commons/opendaylight + ../../../../opendaylight/commons/opendaylight features-nsf ${nsf.version} diff --git a/features/nsf/src/main/resources/features.xml b/opendaylight/adsal/features/nsf/src/main/resources/features.xml similarity index 100% rename from features/nsf/src/main/resources/features.xml rename to opendaylight/adsal/features/nsf/src/main/resources/features.xml diff --git a/opendaylight/forwarding/staticrouting/pom.xml b/opendaylight/adsal/forwarding/staticrouting/pom.xml similarity index 97% rename from opendaylight/forwarding/staticrouting/pom.xml rename to opendaylight/adsal/forwarding/staticrouting/pom.xml index b006cece40..526c384750 100644 --- a/opendaylight/forwarding/staticrouting/pom.xml +++ b/opendaylight/adsal/forwarding/staticrouting/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight forwarding.staticrouting diff --git a/opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/IForwardingStaticRouting.java b/opendaylight/adsal/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/IForwardingStaticRouting.java similarity index 100% rename from opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/IForwardingStaticRouting.java rename to opendaylight/adsal/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/IForwardingStaticRouting.java diff --git a/opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/IStaticRoutingAware.java b/opendaylight/adsal/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/IStaticRoutingAware.java similarity index 100% rename from opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/IStaticRoutingAware.java rename to opendaylight/adsal/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/IStaticRoutingAware.java diff --git a/opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/StaticRoute.java b/opendaylight/adsal/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/StaticRoute.java similarity index 100% rename from opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/StaticRoute.java rename to opendaylight/adsal/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/StaticRoute.java diff --git a/opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/StaticRouteConfig.java b/opendaylight/adsal/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/StaticRouteConfig.java similarity index 100% rename from opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/StaticRouteConfig.java rename to opendaylight/adsal/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/StaticRouteConfig.java diff --git a/opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/Activator.java b/opendaylight/adsal/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/Activator.java similarity index 100% rename from opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/Activator.java rename to opendaylight/adsal/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/Activator.java diff --git a/opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementation.java b/opendaylight/adsal/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementation.java similarity index 100% rename from opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementation.java rename to opendaylight/adsal/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementation.java diff --git a/opendaylight/forwarding/staticrouting/src/test/java/org/opendaylight/controller/forwarding/staticrouting/StaticRouteConfigTest.java b/opendaylight/adsal/forwarding/staticrouting/src/test/java/org/opendaylight/controller/forwarding/staticrouting/StaticRouteConfigTest.java similarity index 100% rename from opendaylight/forwarding/staticrouting/src/test/java/org/opendaylight/controller/forwarding/staticrouting/StaticRouteConfigTest.java rename to opendaylight/adsal/forwarding/staticrouting/src/test/java/org/opendaylight/controller/forwarding/staticrouting/StaticRouteConfigTest.java diff --git a/opendaylight/forwarding/staticrouting/src/test/java/org/opendaylight/controller/forwarding/staticrouting/StaticRouteTest.java b/opendaylight/adsal/forwarding/staticrouting/src/test/java/org/opendaylight/controller/forwarding/staticrouting/StaticRouteTest.java similarity index 100% rename from opendaylight/forwarding/staticrouting/src/test/java/org/opendaylight/controller/forwarding/staticrouting/StaticRouteTest.java rename to opendaylight/adsal/forwarding/staticrouting/src/test/java/org/opendaylight/controller/forwarding/staticrouting/StaticRouteTest.java diff --git a/opendaylight/forwarding/staticrouting/src/test/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementationTest.java b/opendaylight/adsal/forwarding/staticrouting/src/test/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementationTest.java similarity index 100% rename from opendaylight/forwarding/staticrouting/src/test/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementationTest.java rename to opendaylight/adsal/forwarding/staticrouting/src/test/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementationTest.java diff --git a/opendaylight/forwardingrulesmanager/api/pom.xml b/opendaylight/adsal/forwardingrulesmanager/api/pom.xml similarity index 97% rename from opendaylight/forwardingrulesmanager/api/pom.xml rename to opendaylight/adsal/forwardingrulesmanager/api/pom.xml index 3f667e16f0..fc3549a597 100644 --- a/opendaylight/forwardingrulesmanager/api/pom.xml +++ b/opendaylight/adsal/forwardingrulesmanager/api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight forwardingrulesmanager diff --git a/opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowConfig.java b/opendaylight/adsal/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowConfig.java similarity index 100% rename from opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowConfig.java rename to opendaylight/adsal/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowConfig.java diff --git a/opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowEntry.java b/opendaylight/adsal/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowEntry.java similarity index 100% rename from opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowEntry.java rename to opendaylight/adsal/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowEntry.java diff --git a/opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowEntryInstall.java b/opendaylight/adsal/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowEntryInstall.java similarity index 100% rename from opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowEntryInstall.java rename to opendaylight/adsal/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowEntryInstall.java diff --git a/opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/IForwardingRulesManager.java b/opendaylight/adsal/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/IForwardingRulesManager.java similarity index 100% rename from opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/IForwardingRulesManager.java rename to opendaylight/adsal/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/IForwardingRulesManager.java diff --git a/opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/IForwardingRulesManagerAware.java b/opendaylight/adsal/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/IForwardingRulesManagerAware.java similarity index 100% rename from opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/IForwardingRulesManagerAware.java rename to opendaylight/adsal/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/IForwardingRulesManagerAware.java diff --git a/opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/PortGroup.java b/opendaylight/adsal/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/PortGroup.java similarity index 100% rename from opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/PortGroup.java rename to opendaylight/adsal/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/PortGroup.java diff --git a/opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/PortGroupChangeListener.java b/opendaylight/adsal/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/PortGroupChangeListener.java similarity index 100% rename from opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/PortGroupChangeListener.java rename to opendaylight/adsal/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/PortGroupChangeListener.java diff --git a/opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/PortGroupConfig.java b/opendaylight/adsal/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/PortGroupConfig.java similarity index 100% rename from opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/PortGroupConfig.java rename to opendaylight/adsal/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/PortGroupConfig.java diff --git a/opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/PortGroupProvider.java b/opendaylight/adsal/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/PortGroupProvider.java similarity index 100% rename from opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/PortGroupProvider.java rename to opendaylight/adsal/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/PortGroupProvider.java diff --git a/opendaylight/forwardingrulesmanager/api/src/test/java/org/opendaylight/controller/forwardingrulesmanager/frmTest.java b/opendaylight/adsal/forwardingrulesmanager/api/src/test/java/org/opendaylight/controller/forwardingrulesmanager/frmTest.java similarity index 100% rename from opendaylight/forwardingrulesmanager/api/src/test/java/org/opendaylight/controller/forwardingrulesmanager/frmTest.java rename to opendaylight/adsal/forwardingrulesmanager/api/src/test/java/org/opendaylight/controller/forwardingrulesmanager/frmTest.java diff --git a/opendaylight/forwardingrulesmanager/implementation/pom.xml b/opendaylight/adsal/forwardingrulesmanager/implementation/pom.xml similarity index 98% rename from opendaylight/forwardingrulesmanager/implementation/pom.xml rename to opendaylight/adsal/forwardingrulesmanager/implementation/pom.xml index 959b71f855..80a275c03c 100644 --- a/opendaylight/forwardingrulesmanager/implementation/pom.xml +++ b/opendaylight/adsal/forwardingrulesmanager/implementation/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight forwardingrulesmanager.implementation diff --git a/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/implementation/data/FlowEntryDistributionOrder.java b/opendaylight/adsal/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/implementation/data/FlowEntryDistributionOrder.java similarity index 100% rename from opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/implementation/data/FlowEntryDistributionOrder.java rename to opendaylight/adsal/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/implementation/data/FlowEntryDistributionOrder.java diff --git a/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/Activator.java b/opendaylight/adsal/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/Activator.java similarity index 100% rename from opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/Activator.java rename to opendaylight/adsal/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/Activator.java diff --git a/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/FlowEntryDistributionOrderFutureTask.java b/opendaylight/adsal/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/FlowEntryDistributionOrderFutureTask.java similarity index 100% rename from opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/FlowEntryDistributionOrderFutureTask.java rename to opendaylight/adsal/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/FlowEntryDistributionOrderFutureTask.java diff --git a/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManager.java b/opendaylight/adsal/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManager.java similarity index 100% rename from opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManager.java rename to opendaylight/adsal/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManager.java diff --git a/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManagerCLI.java b/opendaylight/adsal/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManagerCLI.java similarity index 100% rename from opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManagerCLI.java rename to opendaylight/adsal/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManagerCLI.java diff --git a/opendaylight/forwardingrulesmanager/integrationtest/pom.xml b/opendaylight/adsal/forwardingrulesmanager/integrationtest/pom.xml similarity index 95% rename from opendaylight/forwardingrulesmanager/integrationtest/pom.xml rename to opendaylight/adsal/forwardingrulesmanager/integrationtest/pom.xml index 60b934a492..0f9b3caea9 100644 --- a/opendaylight/forwardingrulesmanager/integrationtest/pom.xml +++ b/opendaylight/adsal/forwardingrulesmanager/integrationtest/pom.xml @@ -11,9 +11,9 @@ forwardingrulesmanager.integrationtest 0.5.0-SNAPSHOT - ../implementation/target/jacoco-it.exec + ../../implementation/target/jacoco-it.exec - ../implementation/target/jacoco.exec + ../../implementation/target/jacoco.exec @@ -141,7 +141,7 @@ org.jacoco jacoco-maven-plugin - ../implementation/target/jacoco-it.exec + ../../implementation/target/jacoco-it.exec org.opendaylight.controller.* diff --git a/opendaylight/forwardingrulesmanager/integrationtest/src/test/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManagerIT.java b/opendaylight/adsal/forwardingrulesmanager/integrationtest/src/test/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManagerIT.java similarity index 100% rename from opendaylight/forwardingrulesmanager/integrationtest/src/test/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManagerIT.java rename to opendaylight/adsal/forwardingrulesmanager/integrationtest/src/test/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManagerIT.java diff --git a/opendaylight/forwardingrulesmanager/integrationtest/src/test/resources/logback.xml b/opendaylight/adsal/forwardingrulesmanager/integrationtest/src/test/resources/logback.xml similarity index 100% rename from opendaylight/forwardingrulesmanager/integrationtest/src/test/resources/logback.xml rename to opendaylight/adsal/forwardingrulesmanager/integrationtest/src/test/resources/logback.xml diff --git a/opendaylight/hosttracker/api/pom.xml b/opendaylight/adsal/hosttracker/api/pom.xml similarity index 97% rename from opendaylight/hosttracker/api/pom.xml rename to opendaylight/adsal/hosttracker/api/pom.xml index 10532baa6e..6bc28f03c3 100644 --- a/opendaylight/hosttracker/api/pom.xml +++ b/opendaylight/adsal/hosttracker/api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight hosttracker 0.6.0-SNAPSHOT diff --git a/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/HostIdFactory.java b/opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/HostIdFactory.java similarity index 100% rename from opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/HostIdFactory.java rename to opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/HostIdFactory.java diff --git a/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IHostId.java b/opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IHostId.java similarity index 100% rename from opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IHostId.java rename to opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IHostId.java diff --git a/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IHostTrackerShell.java b/opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IHostTrackerShell.java similarity index 100% rename from opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IHostTrackerShell.java rename to opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IHostTrackerShell.java diff --git a/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IPHostId.java b/opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IPHostId.java similarity index 100% rename from opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IPHostId.java rename to opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IPHostId.java diff --git a/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IPMacHostId.java b/opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IPMacHostId.java similarity index 100% rename from opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IPMacHostId.java rename to opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IPMacHostId.java diff --git a/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IfHostListener.java b/opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IfHostListener.java similarity index 100% rename from opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IfHostListener.java rename to opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IfHostListener.java diff --git a/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IfIptoHost.java b/opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IfIptoHost.java similarity index 100% rename from opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IfIptoHost.java rename to opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IfIptoHost.java diff --git a/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IfNewHostNotify.java b/opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IfNewHostNotify.java similarity index 100% rename from opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IfNewHostNotify.java rename to opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/IfNewHostNotify.java diff --git a/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnector.java b/opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnector.java similarity index 100% rename from opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnector.java rename to opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnector.java diff --git a/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/IHostFinder.java b/opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/IHostFinder.java similarity index 100% rename from opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/IHostFinder.java rename to opendaylight/adsal/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/IHostFinder.java diff --git a/opendaylight/hosttracker/api/src/test/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnectorTest.java b/opendaylight/adsal/hosttracker/api/src/test/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnectorTest.java similarity index 100% rename from opendaylight/hosttracker/api/src/test/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnectorTest.java rename to opendaylight/adsal/hosttracker/api/src/test/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnectorTest.java diff --git a/opendaylight/hosttracker/implementation/pom.xml b/opendaylight/adsal/hosttracker/implementation/pom.xml similarity index 98% rename from opendaylight/hosttracker/implementation/pom.xml rename to opendaylight/adsal/hosttracker/implementation/pom.xml index 370f88defa..64254e8b92 100644 --- a/opendaylight/hosttracker/implementation/pom.xml +++ b/opendaylight/adsal/hosttracker/implementation/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight hosttracker.implementation 0.6.0-SNAPSHOT diff --git a/opendaylight/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/Activator.java b/opendaylight/adsal/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/Activator.java similarity index 100% rename from opendaylight/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/Activator.java rename to opendaylight/adsal/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/Activator.java diff --git a/opendaylight/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTracker.java b/opendaylight/adsal/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTracker.java similarity index 100% rename from opendaylight/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTracker.java rename to opendaylight/adsal/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTracker.java diff --git a/opendaylight/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTrackerCallable.java b/opendaylight/adsal/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTrackerCallable.java similarity index 100% rename from opendaylight/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTrackerCallable.java rename to opendaylight/adsal/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTrackerCallable.java diff --git a/opendaylight/hosttracker/implementation/src/test/java/org/opendaylight/controller/hosttracker/internal/HostTrackerTest.java b/opendaylight/adsal/hosttracker/implementation/src/test/java/org/opendaylight/controller/hosttracker/internal/HostTrackerTest.java similarity index 100% rename from opendaylight/hosttracker/implementation/src/test/java/org/opendaylight/controller/hosttracker/internal/HostTrackerTest.java rename to opendaylight/adsal/hosttracker/implementation/src/test/java/org/opendaylight/controller/hosttracker/internal/HostTrackerTest.java diff --git a/opendaylight/hosttracker/integrationtest/pom.xml b/opendaylight/adsal/hosttracker/integrationtest/pom.xml similarity index 95% rename from opendaylight/hosttracker/integrationtest/pom.xml rename to opendaylight/adsal/hosttracker/integrationtest/pom.xml index dabccf3f71..63610cc3e3 100644 --- a/opendaylight/hosttracker/integrationtest/pom.xml +++ b/opendaylight/adsal/hosttracker/integrationtest/pom.xml @@ -11,9 +11,9 @@ hosttracker.integrationtest 0.6.0-SNAPSHOT - ../implementaiton/target/jacoco-it.exec + ../../implementaiton/target/jacoco-it.exec - ../implementation/target/jacoco.exec + ../../implementation/target/jacoco.exec @@ -134,7 +134,7 @@ org.jacoco jacoco-maven-plugin - ../implementation/target/jacoco-it.exec + ../../implementation/target/jacoco-it.exec org.opendaylight.controller.* diff --git a/opendaylight/hosttracker/integrationtest/src/test/java/org/opendaylight/controller/hosttracker/internal/HostTrackerIT.java b/opendaylight/adsal/hosttracker/integrationtest/src/test/java/org/opendaylight/controller/hosttracker/internal/HostTrackerIT.java similarity index 100% rename from opendaylight/hosttracker/integrationtest/src/test/java/org/opendaylight/controller/hosttracker/internal/HostTrackerIT.java rename to opendaylight/adsal/hosttracker/integrationtest/src/test/java/org/opendaylight/controller/hosttracker/internal/HostTrackerIT.java diff --git a/opendaylight/hosttracker/integrationtest/src/test/resources/logback.xml b/opendaylight/adsal/hosttracker/integrationtest/src/test/resources/logback.xml similarity index 100% rename from opendaylight/hosttracker/integrationtest/src/test/resources/logback.xml rename to opendaylight/adsal/hosttracker/integrationtest/src/test/resources/logback.xml diff --git a/opendaylight/hosttracker/shell/pom.xml b/opendaylight/adsal/hosttracker/shell/pom.xml similarity index 96% rename from opendaylight/hosttracker/shell/pom.xml rename to opendaylight/adsal/hosttracker/shell/pom.xml index 9088ae359b..0292e113ee 100644 --- a/opendaylight/hosttracker/shell/pom.xml +++ b/opendaylight/adsal/hosttracker/shell/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight hosttracker.shell ${hosttracker.shell.version} diff --git a/opendaylight/hosttracker/shell/src/main/java/org/opendaylight/controller/hosttracker/shell/DumpFailedARPReqList.java b/opendaylight/adsal/hosttracker/shell/src/main/java/org/opendaylight/controller/hosttracker/shell/DumpFailedARPReqList.java similarity index 100% rename from opendaylight/hosttracker/shell/src/main/java/org/opendaylight/controller/hosttracker/shell/DumpFailedARPReqList.java rename to opendaylight/adsal/hosttracker/shell/src/main/java/org/opendaylight/controller/hosttracker/shell/DumpFailedARPReqList.java diff --git a/opendaylight/hosttracker/shell/src/main/java/org/opendaylight/controller/hosttracker/shell/DumpPendingARPReqList.java b/opendaylight/adsal/hosttracker/shell/src/main/java/org/opendaylight/controller/hosttracker/shell/DumpPendingARPReqList.java similarity index 100% rename from opendaylight/hosttracker/shell/src/main/java/org/opendaylight/controller/hosttracker/shell/DumpPendingARPReqList.java rename to opendaylight/adsal/hosttracker/shell/src/main/java/org/opendaylight/controller/hosttracker/shell/DumpPendingARPReqList.java diff --git a/opendaylight/hosttracker/shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/opendaylight/adsal/hosttracker/shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml similarity index 100% rename from opendaylight/hosttracker/shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml rename to opendaylight/adsal/hosttracker/shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml diff --git a/opendaylight/hosttracker/shell/src/test/java/org/opendaylight/controller/hosttracker/shell/HostTrackerShellTest.java b/opendaylight/adsal/hosttracker/shell/src/test/java/org/opendaylight/controller/hosttracker/shell/HostTrackerShellTest.java similarity index 100% rename from opendaylight/hosttracker/shell/src/test/java/org/opendaylight/controller/hosttracker/shell/HostTrackerShellTest.java rename to opendaylight/adsal/hosttracker/shell/src/test/java/org/opendaylight/controller/hosttracker/shell/HostTrackerShellTest.java diff --git a/opendaylight/hosttracker_new/api/pom.xml b/opendaylight/adsal/hosttracker_new/api/pom.xml similarity index 97% rename from opendaylight/hosttracker_new/api/pom.xml rename to opendaylight/adsal/hosttracker_new/api/pom.xml index db27345d18..cdb3fd95b6 100644 --- a/opendaylight/hosttracker_new/api/pom.xml +++ b/opendaylight/adsal/hosttracker_new/api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight hosttracker_new 0.5.0-SNAPSHOT diff --git a/opendaylight/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/Entity.java b/opendaylight/adsal/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/Entity.java similarity index 100% rename from opendaylight/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/Entity.java rename to opendaylight/adsal/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/Entity.java diff --git a/opendaylight/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IDevice.java b/opendaylight/adsal/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IDevice.java similarity index 100% rename from opendaylight/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IDevice.java rename to opendaylight/adsal/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IDevice.java diff --git a/opendaylight/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IDeviceListener.java b/opendaylight/adsal/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IDeviceListener.java similarity index 100% rename from opendaylight/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IDeviceListener.java rename to opendaylight/adsal/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IDeviceListener.java diff --git a/opendaylight/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IDeviceService.java b/opendaylight/adsal/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IDeviceService.java similarity index 100% rename from opendaylight/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IDeviceService.java rename to opendaylight/adsal/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IDeviceService.java diff --git a/opendaylight/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IEntityClass.java b/opendaylight/adsal/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IEntityClass.java similarity index 100% rename from opendaylight/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IEntityClass.java rename to opendaylight/adsal/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IEntityClass.java diff --git a/opendaylight/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IEntityClassListener.java b/opendaylight/adsal/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IEntityClassListener.java similarity index 100% rename from opendaylight/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IEntityClassListener.java rename to opendaylight/adsal/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IEntityClassListener.java diff --git a/opendaylight/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IEntityClassifierService.java b/opendaylight/adsal/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IEntityClassifierService.java similarity index 100% rename from opendaylight/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IEntityClassifierService.java rename to opendaylight/adsal/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IEntityClassifierService.java diff --git a/opendaylight/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IfHostListener.java b/opendaylight/adsal/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IfHostListener.java similarity index 100% rename from opendaylight/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IfHostListener.java rename to opendaylight/adsal/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IfHostListener.java diff --git a/opendaylight/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IfIptoHost.java b/opendaylight/adsal/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IfIptoHost.java similarity index 100% rename from opendaylight/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IfIptoHost.java rename to opendaylight/adsal/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IfIptoHost.java diff --git a/opendaylight/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IfNewHostNotify.java b/opendaylight/adsal/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IfNewHostNotify.java similarity index 100% rename from opendaylight/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IfNewHostNotify.java rename to opendaylight/adsal/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/IfNewHostNotify.java diff --git a/opendaylight/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/SwitchPort.java b/opendaylight/adsal/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/SwitchPort.java similarity index 100% rename from opendaylight/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/SwitchPort.java rename to opendaylight/adsal/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/SwitchPort.java diff --git a/opendaylight/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnector.java b/opendaylight/adsal/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnector.java similarity index 100% rename from opendaylight/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnector.java rename to opendaylight/adsal/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnector.java diff --git a/opendaylight/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/IHostFinder.java b/opendaylight/adsal/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/IHostFinder.java similarity index 100% rename from opendaylight/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/IHostFinder.java rename to opendaylight/adsal/hosttracker_new/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/IHostFinder.java diff --git a/opendaylight/hosttracker_new/api/src/test/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnectorTest.java b/opendaylight/adsal/hosttracker_new/api/src/test/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnectorTest.java similarity index 100% rename from opendaylight/hosttracker_new/api/src/test/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnectorTest.java rename to opendaylight/adsal/hosttracker_new/api/src/test/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnectorTest.java diff --git a/opendaylight/hosttracker_new/implementation/pom.xml b/opendaylight/adsal/hosttracker_new/implementation/pom.xml similarity index 98% rename from opendaylight/hosttracker_new/implementation/pom.xml rename to opendaylight/adsal/hosttracker_new/implementation/pom.xml index d3661a12c8..268465eed3 100644 --- a/opendaylight/hosttracker_new/implementation/pom.xml +++ b/opendaylight/adsal/hosttracker_new/implementation/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight hosttracker_new.implementation 0.5.0-SNAPSHOT diff --git a/opendaylight/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/Activator.java b/opendaylight/adsal/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/Activator.java similarity index 100% rename from opendaylight/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/Activator.java rename to opendaylight/adsal/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/Activator.java diff --git a/opendaylight/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/AttachmentPoint.java b/opendaylight/adsal/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/AttachmentPoint.java similarity index 100% rename from opendaylight/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/AttachmentPoint.java rename to opendaylight/adsal/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/AttachmentPoint.java diff --git a/opendaylight/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DefaultEntityClassifier.java b/opendaylight/adsal/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DefaultEntityClassifier.java similarity index 100% rename from opendaylight/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DefaultEntityClassifier.java rename to opendaylight/adsal/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DefaultEntityClassifier.java diff --git a/opendaylight/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/Device.java b/opendaylight/adsal/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/Device.java similarity index 100% rename from opendaylight/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/Device.java rename to opendaylight/adsal/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/Device.java diff --git a/opendaylight/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DeviceIndex.java b/opendaylight/adsal/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DeviceIndex.java similarity index 100% rename from opendaylight/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DeviceIndex.java rename to opendaylight/adsal/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DeviceIndex.java diff --git a/opendaylight/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DeviceIndexInterator.java b/opendaylight/adsal/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DeviceIndexInterator.java similarity index 100% rename from opendaylight/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DeviceIndexInterator.java rename to opendaylight/adsal/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DeviceIndexInterator.java diff --git a/opendaylight/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DeviceIterator.java b/opendaylight/adsal/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DeviceIterator.java similarity index 100% rename from opendaylight/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DeviceIterator.java rename to opendaylight/adsal/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DeviceIterator.java diff --git a/opendaylight/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DeviceManagerImpl.java b/opendaylight/adsal/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DeviceManagerImpl.java similarity index 100% rename from opendaylight/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DeviceManagerImpl.java rename to opendaylight/adsal/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DeviceManagerImpl.java diff --git a/opendaylight/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DeviceMultiIndex.java b/opendaylight/adsal/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DeviceMultiIndex.java similarity index 100% rename from opendaylight/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DeviceMultiIndex.java rename to opendaylight/adsal/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DeviceMultiIndex.java diff --git a/opendaylight/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DeviceUniqueIndex.java b/opendaylight/adsal/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DeviceUniqueIndex.java similarity index 100% rename from opendaylight/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DeviceUniqueIndex.java rename to opendaylight/adsal/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/DeviceUniqueIndex.java diff --git a/opendaylight/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/IndexedEntity.java b/opendaylight/adsal/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/IndexedEntity.java similarity index 100% rename from opendaylight/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/IndexedEntity.java rename to opendaylight/adsal/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/IndexedEntity.java diff --git a/opendaylight/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/internal/DeviceManagerImplTest.java b/opendaylight/adsal/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/internal/DeviceManagerImplTest.java similarity index 100% rename from opendaylight/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/internal/DeviceManagerImplTest.java rename to opendaylight/adsal/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/internal/DeviceManagerImplTest.java diff --git a/opendaylight/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/internal/DeviceUniqueIndexTest.java b/opendaylight/adsal/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/internal/DeviceUniqueIndexTest.java similarity index 100% rename from opendaylight/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/internal/DeviceUniqueIndexTest.java rename to opendaylight/adsal/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/internal/DeviceUniqueIndexTest.java diff --git a/opendaylight/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/test/MockDevice.java b/opendaylight/adsal/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/test/MockDevice.java similarity index 100% rename from opendaylight/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/test/MockDevice.java rename to opendaylight/adsal/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/test/MockDevice.java diff --git a/opendaylight/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/test/MockDeviceManager.java b/opendaylight/adsal/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/test/MockDeviceManager.java similarity index 100% rename from opendaylight/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/test/MockDeviceManager.java rename to opendaylight/adsal/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/test/MockDeviceManager.java diff --git a/opendaylight/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/test/MockEntityClassifier.java b/opendaylight/adsal/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/test/MockEntityClassifier.java similarity index 100% rename from opendaylight/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/test/MockEntityClassifier.java rename to opendaylight/adsal/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/test/MockEntityClassifier.java diff --git a/opendaylight/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/test/MockEntityClassifierMac.java b/opendaylight/adsal/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/test/MockEntityClassifierMac.java similarity index 100% rename from opendaylight/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/test/MockEntityClassifierMac.java rename to opendaylight/adsal/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/test/MockEntityClassifierMac.java diff --git a/opendaylight/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/test/MockFlexEntityClassifier.java b/opendaylight/adsal/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/test/MockFlexEntityClassifier.java similarity index 100% rename from opendaylight/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/test/MockFlexEntityClassifier.java rename to opendaylight/adsal/hosttracker_new/implementation/src/test/java/org/opendaylight/controller/hosttracker/test/MockFlexEntityClassifier.java diff --git a/opendaylight/karaf-tomcat-security/pom.xml b/opendaylight/adsal/karaf-tomcat-security/pom.xml similarity index 96% rename from opendaylight/karaf-tomcat-security/pom.xml rename to opendaylight/adsal/karaf-tomcat-security/pom.xml index 30d57d048a..d2dc040bba 100644 --- a/opendaylight/karaf-tomcat-security/pom.xml +++ b/opendaylight/adsal/karaf-tomcat-security/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../commons/opendaylight + ../../commons/opendaylight karaf-tomcat-security diff --git a/opendaylight/karaf-tomcat-security/src/main/java/org/opendaylight/controller/karafsecurity/ControllerCustomRealm.java b/opendaylight/adsal/karaf-tomcat-security/src/main/java/org/opendaylight/controller/karafsecurity/ControllerCustomRealm.java similarity index 100% rename from opendaylight/karaf-tomcat-security/src/main/java/org/opendaylight/controller/karafsecurity/ControllerCustomRealm.java rename to opendaylight/adsal/karaf-tomcat-security/src/main/java/org/opendaylight/controller/karafsecurity/ControllerCustomRealm.java diff --git a/opendaylight/logging/bridge/pom.xml b/opendaylight/adsal/logging/bridge/pom.xml similarity index 97% rename from opendaylight/logging/bridge/pom.xml rename to opendaylight/adsal/logging/bridge/pom.xml index dc37e30179..5ebbe4564b 100644 --- a/opendaylight/logging/bridge/pom.xml +++ b/opendaylight/adsal/logging/bridge/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight logging.bridge diff --git a/opendaylight/logging/bridge/src/main/java/org/opendaylight/controller/logging/bridge/internal/Activator.java b/opendaylight/adsal/logging/bridge/src/main/java/org/opendaylight/controller/logging/bridge/internal/Activator.java similarity index 100% rename from opendaylight/logging/bridge/src/main/java/org/opendaylight/controller/logging/bridge/internal/Activator.java rename to opendaylight/adsal/logging/bridge/src/main/java/org/opendaylight/controller/logging/bridge/internal/Activator.java diff --git a/opendaylight/logging/bridge/src/main/java/org/opendaylight/controller/logging/bridge/internal/LogListenerImpl.java b/opendaylight/adsal/logging/bridge/src/main/java/org/opendaylight/controller/logging/bridge/internal/LogListenerImpl.java similarity index 100% rename from opendaylight/logging/bridge/src/main/java/org/opendaylight/controller/logging/bridge/internal/LogListenerImpl.java rename to opendaylight/adsal/logging/bridge/src/main/java/org/opendaylight/controller/logging/bridge/internal/LogListenerImpl.java diff --git a/opendaylight/logging/bridge/src/main/java/org/opendaylight/controller/logging/bridge/internal/UncaughtExceptionPolicy.java b/opendaylight/adsal/logging/bridge/src/main/java/org/opendaylight/controller/logging/bridge/internal/UncaughtExceptionPolicy.java similarity index 100% rename from opendaylight/logging/bridge/src/main/java/org/opendaylight/controller/logging/bridge/internal/UncaughtExceptionPolicy.java rename to opendaylight/adsal/logging/bridge/src/main/java/org/opendaylight/controller/logging/bridge/internal/UncaughtExceptionPolicy.java diff --git a/opendaylight/logging/bridge/src/test/java/org/opendaylight/controller/logging/bridge/internal/LogListenerImplTest.java b/opendaylight/adsal/logging/bridge/src/test/java/org/opendaylight/controller/logging/bridge/internal/LogListenerImplTest.java similarity index 100% rename from opendaylight/logging/bridge/src/test/java/org/opendaylight/controller/logging/bridge/internal/LogListenerImplTest.java rename to opendaylight/adsal/logging/bridge/src/test/java/org/opendaylight/controller/logging/bridge/internal/LogListenerImplTest.java diff --git a/opendaylight/northbound/archetype-app-northbound/pom.xml b/opendaylight/adsal/northbound/archetype-app-northbound/pom.xml similarity index 100% rename from opendaylight/northbound/archetype-app-northbound/pom.xml rename to opendaylight/adsal/northbound/archetype-app-northbound/pom.xml diff --git a/opendaylight/northbound/archetype-app-northbound/src/main/resources/META-INF/maven/archetype-metadata.xml b/opendaylight/adsal/northbound/archetype-app-northbound/src/main/resources/META-INF/maven/archetype-metadata.xml similarity index 100% rename from opendaylight/northbound/archetype-app-northbound/src/main/resources/META-INF/maven/archetype-metadata.xml rename to opendaylight/adsal/northbound/archetype-app-northbound/src/main/resources/META-INF/maven/archetype-metadata.xml diff --git a/opendaylight/northbound/archetype-app-northbound/src/main/resources/archetype-resources/pom.xml b/opendaylight/adsal/northbound/archetype-app-northbound/src/main/resources/archetype-resources/pom.xml similarity index 97% rename from opendaylight/northbound/archetype-app-northbound/src/main/resources/archetype-resources/pom.xml rename to opendaylight/adsal/northbound/archetype-app-northbound/src/main/resources/archetype-resources/pom.xml index adb0c98705..73bdf0921b 100644 --- a/opendaylight/northbound/archetype-app-northbound/src/main/resources/archetype-resources/pom.xml +++ b/opendaylight/adsal/northbound/archetype-app-northbound/src/main/resources/archetype-resources/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight ${artifactId} diff --git a/opendaylight/northbound/archetype-app-northbound/src/main/resources/archetype-resources/src/main/java/Northbound.java b/opendaylight/adsal/northbound/archetype-app-northbound/src/main/resources/archetype-resources/src/main/java/Northbound.java similarity index 100% rename from opendaylight/northbound/archetype-app-northbound/src/main/resources/archetype-resources/src/main/java/Northbound.java rename to opendaylight/adsal/northbound/archetype-app-northbound/src/main/resources/archetype-resources/src/main/java/Northbound.java diff --git a/opendaylight/northbound/archetype-app-northbound/src/main/resources/archetype-resources/src/main/resources/WEB-INF/web.xml b/opendaylight/adsal/northbound/archetype-app-northbound/src/main/resources/archetype-resources/src/main/resources/WEB-INF/web.xml similarity index 100% rename from opendaylight/northbound/archetype-app-northbound/src/main/resources/archetype-resources/src/main/resources/WEB-INF/web.xml rename to opendaylight/adsal/northbound/archetype-app-northbound/src/main/resources/archetype-resources/src/main/resources/WEB-INF/web.xml diff --git a/opendaylight/northbound/archetype-app-northbound/src/test/resources/projects/basic/archetype.properties b/opendaylight/adsal/northbound/archetype-app-northbound/src/test/resources/projects/basic/archetype.properties similarity index 100% rename from opendaylight/northbound/archetype-app-northbound/src/test/resources/projects/basic/archetype.properties rename to opendaylight/adsal/northbound/archetype-app-northbound/src/test/resources/projects/basic/archetype.properties diff --git a/opendaylight/northbound/archetype-app-northbound/src/test/resources/projects/basic/goal.txt b/opendaylight/adsal/northbound/archetype-app-northbound/src/test/resources/projects/basic/goal.txt similarity index 100% rename from opendaylight/northbound/archetype-app-northbound/src/test/resources/projects/basic/goal.txt rename to opendaylight/adsal/northbound/archetype-app-northbound/src/test/resources/projects/basic/goal.txt diff --git a/opendaylight/northbound/bundlescanner/api/pom.xml b/opendaylight/adsal/northbound/bundlescanner/api/pom.xml similarity index 96% rename from opendaylight/northbound/bundlescanner/api/pom.xml rename to opendaylight/adsal/northbound/bundlescanner/api/pom.xml index 78bfd38579..d94272b342 100644 --- a/opendaylight/northbound/bundlescanner/api/pom.xml +++ b/opendaylight/adsal/northbound/bundlescanner/api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../../commons/opendaylight + ../../../../commons/opendaylight bundlescanner diff --git a/opendaylight/northbound/bundlescanner/api/src/main/java/org/opendaylight/controller/northbound/bundlescanner/IBundleScanService.java b/opendaylight/adsal/northbound/bundlescanner/api/src/main/java/org/opendaylight/controller/northbound/bundlescanner/IBundleScanService.java similarity index 100% rename from opendaylight/northbound/bundlescanner/api/src/main/java/org/opendaylight/controller/northbound/bundlescanner/IBundleScanService.java rename to opendaylight/adsal/northbound/bundlescanner/api/src/main/java/org/opendaylight/controller/northbound/bundlescanner/IBundleScanService.java diff --git a/opendaylight/northbound/bundlescanner/implementation/pom.xml b/opendaylight/adsal/northbound/bundlescanner/implementation/pom.xml similarity index 97% rename from opendaylight/northbound/bundlescanner/implementation/pom.xml rename to opendaylight/adsal/northbound/bundlescanner/implementation/pom.xml index 5694b2adcf..d4d57a1be9 100644 --- a/opendaylight/northbound/bundlescanner/implementation/pom.xml +++ b/opendaylight/adsal/northbound/bundlescanner/implementation/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../../commons/opendaylight + ../../../../commons/opendaylight bundlescanner.implementation diff --git a/opendaylight/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/Activator.java b/opendaylight/adsal/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/Activator.java similarity index 100% rename from opendaylight/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/Activator.java rename to opendaylight/adsal/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/Activator.java diff --git a/opendaylight/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/BundleInfo.java b/opendaylight/adsal/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/BundleInfo.java similarity index 100% rename from opendaylight/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/BundleInfo.java rename to opendaylight/adsal/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/BundleInfo.java diff --git a/opendaylight/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/BundleScanServiceImpl.java b/opendaylight/adsal/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/BundleScanServiceImpl.java similarity index 100% rename from opendaylight/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/BundleScanServiceImpl.java rename to opendaylight/adsal/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/BundleScanServiceImpl.java diff --git a/opendaylight/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/BundleScanner.java b/opendaylight/adsal/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/BundleScanner.java similarity index 100% rename from opendaylight/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/BundleScanner.java rename to opendaylight/adsal/northbound/bundlescanner/implementation/src/main/java/org/opendaylight/controller/northbound/bundlescanner/internal/BundleScanner.java diff --git a/opendaylight/northbound/bundlescanner/implementation/src/test/java/bundle_base/Animal.java b/opendaylight/adsal/northbound/bundlescanner/implementation/src/test/java/bundle_base/Animal.java similarity index 100% rename from opendaylight/northbound/bundlescanner/implementation/src/test/java/bundle_base/Animal.java rename to opendaylight/adsal/northbound/bundlescanner/implementation/src/test/java/bundle_base/Animal.java diff --git a/opendaylight/northbound/bundlescanner/implementation/src/test/java/bundle_base/BasePerson.java b/opendaylight/adsal/northbound/bundlescanner/implementation/src/test/java/bundle_base/BasePerson.java similarity index 100% rename from opendaylight/northbound/bundlescanner/implementation/src/test/java/bundle_base/BasePerson.java rename to opendaylight/adsal/northbound/bundlescanner/implementation/src/test/java/bundle_base/BasePerson.java diff --git a/opendaylight/northbound/bundlescanner/implementation/src/test/java/bundle_base/Mammal.java b/opendaylight/adsal/northbound/bundlescanner/implementation/src/test/java/bundle_base/Mammal.java similarity index 100% rename from opendaylight/northbound/bundlescanner/implementation/src/test/java/bundle_base/Mammal.java rename to opendaylight/adsal/northbound/bundlescanner/implementation/src/test/java/bundle_base/Mammal.java diff --git a/opendaylight/northbound/bundlescanner/implementation/src/test/java/bundle_base/NoAnnotation.java b/opendaylight/adsal/northbound/bundlescanner/implementation/src/test/java/bundle_base/NoAnnotation.java similarity index 100% rename from opendaylight/northbound/bundlescanner/implementation/src/test/java/bundle_base/NoAnnotation.java rename to opendaylight/adsal/northbound/bundlescanner/implementation/src/test/java/bundle_base/NoAnnotation.java diff --git a/opendaylight/northbound/bundlescanner/implementation/src/test/java/bundle_base/NonRelevantAnnotation.java b/opendaylight/adsal/northbound/bundlescanner/implementation/src/test/java/bundle_base/NonRelevantAnnotation.java similarity index 100% rename from opendaylight/northbound/bundlescanner/implementation/src/test/java/bundle_base/NonRelevantAnnotation.java rename to opendaylight/adsal/northbound/bundlescanner/implementation/src/test/java/bundle_base/NonRelevantAnnotation.java diff --git a/opendaylight/northbound/bundlescanner/implementation/src/test/java/bundle_base/Person.java b/opendaylight/adsal/northbound/bundlescanner/implementation/src/test/java/bundle_base/Person.java similarity index 100% rename from opendaylight/northbound/bundlescanner/implementation/src/test/java/bundle_base/Person.java rename to opendaylight/adsal/northbound/bundlescanner/implementation/src/test/java/bundle_base/Person.java diff --git a/opendaylight/northbound/bundlescanner/implementation/src/test/java/bundle_misc/Misc.java b/opendaylight/adsal/northbound/bundlescanner/implementation/src/test/java/bundle_misc/Misc.java similarity index 100% rename from opendaylight/northbound/bundlescanner/implementation/src/test/java/bundle_misc/Misc.java rename to opendaylight/adsal/northbound/bundlescanner/implementation/src/test/java/bundle_misc/Misc.java diff --git a/opendaylight/northbound/bundlescanner/implementation/src/test/java/bundle_sub1/NoAnnotation.java b/opendaylight/adsal/northbound/bundlescanner/implementation/src/test/java/bundle_sub1/NoAnnotation.java similarity index 100% rename from opendaylight/northbound/bundlescanner/implementation/src/test/java/bundle_sub1/NoAnnotation.java rename to opendaylight/adsal/northbound/bundlescanner/implementation/src/test/java/bundle_sub1/NoAnnotation.java diff --git a/opendaylight/northbound/bundlescanner/implementation/src/test/java/bundle_sub1/Zoo.java b/opendaylight/adsal/northbound/bundlescanner/implementation/src/test/java/bundle_sub1/Zoo.java similarity index 100% rename from opendaylight/northbound/bundlescanner/implementation/src/test/java/bundle_sub1/Zoo.java rename to opendaylight/adsal/northbound/bundlescanner/implementation/src/test/java/bundle_sub1/Zoo.java diff --git a/opendaylight/northbound/bundlescanner/implementation/src/test/java/bundle_sub2/Agent.java b/opendaylight/adsal/northbound/bundlescanner/implementation/src/test/java/bundle_sub2/Agent.java similarity index 100% rename from opendaylight/northbound/bundlescanner/implementation/src/test/java/bundle_sub2/Agent.java rename to opendaylight/adsal/northbound/bundlescanner/implementation/src/test/java/bundle_sub2/Agent.java diff --git a/opendaylight/northbound/bundlescanner/implementation/src/test/java/bundle_sub2/Customer.java b/opendaylight/adsal/northbound/bundlescanner/implementation/src/test/java/bundle_sub2/Customer.java similarity index 100% rename from opendaylight/northbound/bundlescanner/implementation/src/test/java/bundle_sub2/Customer.java rename to opendaylight/adsal/northbound/bundlescanner/implementation/src/test/java/bundle_sub2/Customer.java diff --git a/opendaylight/northbound/bundlescanner/implementation/src/test/java/bundle_sub2/NoAnnotation.java b/opendaylight/adsal/northbound/bundlescanner/implementation/src/test/java/bundle_sub2/NoAnnotation.java similarity index 100% rename from opendaylight/northbound/bundlescanner/implementation/src/test/java/bundle_sub2/NoAnnotation.java rename to opendaylight/adsal/northbound/bundlescanner/implementation/src/test/java/bundle_sub2/NoAnnotation.java diff --git a/opendaylight/northbound/bundlescanner/implementation/src/test/java/org/opendaylight/controller/northbound/bundlescanner/internal/BundleScannerTest.java b/opendaylight/adsal/northbound/bundlescanner/implementation/src/test/java/org/opendaylight/controller/northbound/bundlescanner/internal/BundleScannerTest.java similarity index 100% rename from opendaylight/northbound/bundlescanner/implementation/src/test/java/org/opendaylight/controller/northbound/bundlescanner/internal/BundleScannerTest.java rename to opendaylight/adsal/northbound/bundlescanner/implementation/src/test/java/org/opendaylight/controller/northbound/bundlescanner/internal/BundleScannerTest.java diff --git a/opendaylight/northbound/commons/pom.xml b/opendaylight/adsal/northbound/commons/pom.xml similarity index 98% rename from opendaylight/northbound/commons/pom.xml rename to opendaylight/adsal/northbound/commons/pom.xml index 9d229e4e70..8290bcdf38 100644 --- a/opendaylight/northbound/commons/pom.xml +++ b/opendaylight/adsal/northbound/commons/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight commons.northbound diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/JacksonJsonProcessingExceptionMapper.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/JacksonJsonProcessingExceptionMapper.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/JacksonJsonProcessingExceptionMapper.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/JacksonJsonProcessingExceptionMapper.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/NorthboundApplication.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/NorthboundApplication.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/NorthboundApplication.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/NorthboundApplication.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/RestMessages.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/RestMessages.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/RestMessages.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/RestMessages.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/BadRequestException.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/BadRequestException.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/BadRequestException.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/BadRequestException.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/GenericExceptionMapper.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/GenericExceptionMapper.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/GenericExceptionMapper.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/GenericExceptionMapper.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/InternalServerErrorException.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/InternalServerErrorException.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/InternalServerErrorException.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/InternalServerErrorException.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/MethodNotAllowed.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/MethodNotAllowed.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/MethodNotAllowed.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/MethodNotAllowed.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/MethodNotAllowedException.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/MethodNotAllowedException.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/MethodNotAllowedException.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/MethodNotAllowedException.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/NotAcceptableException.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/NotAcceptableException.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/NotAcceptableException.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/NotAcceptableException.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/NotImplemented.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/NotImplemented.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/NotImplemented.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/NotImplemented.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/NotImplementedException.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/NotImplementedException.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/NotImplementedException.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/NotImplementedException.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/ResourceConflictException.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/ResourceConflictException.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/ResourceConflictException.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/ResourceConflictException.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/ResourceForbiddenException.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/ResourceForbiddenException.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/ResourceForbiddenException.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/ResourceForbiddenException.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/ResourceGoneException.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/ResourceGoneException.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/ResourceGoneException.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/ResourceGoneException.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/ResourceNotFoundException.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/ResourceNotFoundException.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/ResourceNotFoundException.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/ResourceNotFoundException.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/ServiceUnavailableException.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/ServiceUnavailableException.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/ServiceUnavailableException.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/ServiceUnavailableException.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/UnauthorizedException.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/UnauthorizedException.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/UnauthorizedException.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/UnauthorizedException.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/UnsupportedMediaTypeException.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/UnsupportedMediaTypeException.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/UnsupportedMediaTypeException.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/UnsupportedMediaTypeException.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/package-info.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/package-info.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/package-info.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/package-info.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/Accessor.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/Accessor.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/Accessor.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/Accessor.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/CompareExpression.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/CompareExpression.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/CompareExpression.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/CompareExpression.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/Expression.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/Expression.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/Expression.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/Expression.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/ExpressionBuilder.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/ExpressionBuilder.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/ExpressionBuilder.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/ExpressionBuilder.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/IteratableTypeInfo.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/IteratableTypeInfo.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/IteratableTypeInfo.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/IteratableTypeInfo.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/LogicalExpression.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/LogicalExpression.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/LogicalExpression.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/LogicalExpression.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/Query.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/Query.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/Query.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/Query.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryContext.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryContext.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryContext.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryContext.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryContextImpl.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryContextImpl.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryContextImpl.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryContextImpl.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryContextProvider.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryContextProvider.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryContextProvider.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryContextProvider.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryException.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryException.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryException.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryException.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryImpl.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryImpl.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryImpl.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/QueryImpl.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/TypeInfo.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/TypeInfo.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/TypeInfo.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/TypeInfo.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/Visitor.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/Visitor.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/Visitor.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/Visitor.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/WrapperTypeInfo.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/WrapperTypeInfo.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/WrapperTypeInfo.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/query/WrapperTypeInfo.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/types/StringList.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/types/StringList.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/types/StringList.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/types/StringList.java diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/utils/NorthboundUtils.java b/opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/utils/NorthboundUtils.java similarity index 100% rename from opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/utils/NorthboundUtils.java rename to opendaylight/adsal/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/utils/NorthboundUtils.java diff --git a/opendaylight/northbound/commons/src/main/javacc/fiql.jj b/opendaylight/adsal/northbound/commons/src/main/javacc/fiql.jj similarity index 100% rename from opendaylight/northbound/commons/src/main/javacc/fiql.jj rename to opendaylight/adsal/northbound/commons/src/main/javacc/fiql.jj diff --git a/opendaylight/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/CommonsNorthboundTest.java b/opendaylight/adsal/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/CommonsNorthboundTest.java similarity index 100% rename from opendaylight/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/CommonsNorthboundTest.java rename to opendaylight/adsal/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/CommonsNorthboundTest.java diff --git a/opendaylight/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/exception/CommonsNorthboundExceptionTest.java b/opendaylight/adsal/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/exception/CommonsNorthboundExceptionTest.java similarity index 100% rename from opendaylight/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/exception/CommonsNorthboundExceptionTest.java rename to opendaylight/adsal/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/exception/CommonsNorthboundExceptionTest.java diff --git a/opendaylight/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/BookBean.java b/opendaylight/adsal/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/BookBean.java similarity index 100% rename from opendaylight/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/BookBean.java rename to opendaylight/adsal/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/BookBean.java diff --git a/opendaylight/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/ExpresssionTest.java b/opendaylight/adsal/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/ExpresssionTest.java similarity index 100% rename from opendaylight/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/ExpresssionTest.java rename to opendaylight/adsal/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/ExpresssionTest.java diff --git a/opendaylight/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/Library.java b/opendaylight/adsal/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/Library.java similarity index 100% rename from opendaylight/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/Library.java rename to opendaylight/adsal/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/Library.java diff --git a/opendaylight/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/PersonBean.java b/opendaylight/adsal/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/PersonBean.java similarity index 100% rename from opendaylight/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/PersonBean.java rename to opendaylight/adsal/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/PersonBean.java diff --git a/opendaylight/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/QueryContextTest.java b/opendaylight/adsal/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/QueryContextTest.java similarity index 100% rename from opendaylight/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/QueryContextTest.java rename to opendaylight/adsal/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/QueryContextTest.java diff --git a/opendaylight/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/ReviewBean.java b/opendaylight/adsal/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/ReviewBean.java similarity index 100% rename from opendaylight/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/ReviewBean.java rename to opendaylight/adsal/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/ReviewBean.java diff --git a/opendaylight/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/XMLAccessorTypeTest.java b/opendaylight/adsal/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/XMLAccessorTypeTest.java similarity index 100% rename from opendaylight/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/XMLAccessorTypeTest.java rename to opendaylight/adsal/northbound/commons/src/test/java/org/opendaylight/controller/northbound/commons/query/XMLAccessorTypeTest.java diff --git a/opendaylight/northbound/commons/src/test/resources/logback.xml b/opendaylight/adsal/northbound/commons/src/test/resources/logback.xml similarity index 100% rename from opendaylight/northbound/commons/src/test/resources/logback.xml rename to opendaylight/adsal/northbound/commons/src/test/resources/logback.xml diff --git a/opendaylight/northbound/connectionmanager/enunciate.xml b/opendaylight/adsal/northbound/connectionmanager/enunciate.xml similarity index 100% rename from opendaylight/northbound/connectionmanager/enunciate.xml rename to opendaylight/adsal/northbound/connectionmanager/enunciate.xml diff --git a/opendaylight/northbound/connectionmanager/pom.xml b/opendaylight/adsal/northbound/connectionmanager/pom.xml similarity index 98% rename from opendaylight/northbound/connectionmanager/pom.xml rename to opendaylight/adsal/northbound/connectionmanager/pom.xml index 893dcd14f3..b68bc25545 100644 --- a/opendaylight/northbound/connectionmanager/pom.xml +++ b/opendaylight/adsal/northbound/connectionmanager/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight connectionmanager.northbound diff --git a/opendaylight/northbound/connectionmanager/src/main/java/org/opendaylight/controller/connectionmanager/northbound/ConnectionManagerNorthbound.java b/opendaylight/adsal/northbound/connectionmanager/src/main/java/org/opendaylight/controller/connectionmanager/northbound/ConnectionManagerNorthbound.java similarity index 100% rename from opendaylight/northbound/connectionmanager/src/main/java/org/opendaylight/controller/connectionmanager/northbound/ConnectionManagerNorthbound.java rename to opendaylight/adsal/northbound/connectionmanager/src/main/java/org/opendaylight/controller/connectionmanager/northbound/ConnectionManagerNorthbound.java diff --git a/opendaylight/northbound/connectionmanager/src/main/java/org/opendaylight/controller/connectionmanager/northbound/Nodes.java b/opendaylight/adsal/northbound/connectionmanager/src/main/java/org/opendaylight/controller/connectionmanager/northbound/Nodes.java similarity index 100% rename from opendaylight/northbound/connectionmanager/src/main/java/org/opendaylight/controller/connectionmanager/northbound/Nodes.java rename to opendaylight/adsal/northbound/connectionmanager/src/main/java/org/opendaylight/controller/connectionmanager/northbound/Nodes.java diff --git a/opendaylight/northbound/connectionmanager/src/main/resources/WEB-INF/web.xml b/opendaylight/adsal/northbound/connectionmanager/src/main/resources/WEB-INF/web.xml similarity index 100% rename from opendaylight/northbound/connectionmanager/src/main/resources/WEB-INF/web.xml rename to opendaylight/adsal/northbound/connectionmanager/src/main/resources/WEB-INF/web.xml diff --git a/opendaylight/northbound/containermanager/enunciate.xml b/opendaylight/adsal/northbound/containermanager/enunciate.xml similarity index 100% rename from opendaylight/northbound/containermanager/enunciate.xml rename to opendaylight/adsal/northbound/containermanager/enunciate.xml diff --git a/opendaylight/northbound/containermanager/pom.xml b/opendaylight/adsal/northbound/containermanager/pom.xml similarity index 98% rename from opendaylight/northbound/containermanager/pom.xml rename to opendaylight/adsal/northbound/containermanager/pom.xml index 74fd115dee..8898a06f64 100644 --- a/opendaylight/northbound/containermanager/pom.xml +++ b/opendaylight/adsal/northbound/containermanager/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight containermanager.northbound diff --git a/opendaylight/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/ContainerConfigs.java b/opendaylight/adsal/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/ContainerConfigs.java similarity index 100% rename from opendaylight/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/ContainerConfigs.java rename to opendaylight/adsal/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/ContainerConfigs.java diff --git a/opendaylight/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/ContainerManagerNorthbound.java b/opendaylight/adsal/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/ContainerManagerNorthbound.java similarity index 100% rename from opendaylight/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/ContainerManagerNorthbound.java rename to opendaylight/adsal/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/ContainerManagerNorthbound.java diff --git a/opendaylight/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/ContainerManagerNorthboundRSApplication.java b/opendaylight/adsal/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/ContainerManagerNorthboundRSApplication.java similarity index 100% rename from opendaylight/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/ContainerManagerNorthboundRSApplication.java rename to opendaylight/adsal/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/ContainerManagerNorthboundRSApplication.java diff --git a/opendaylight/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/FlowSpecConfigs.java b/opendaylight/adsal/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/FlowSpecConfigs.java similarity index 100% rename from opendaylight/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/FlowSpecConfigs.java rename to opendaylight/adsal/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/FlowSpecConfigs.java diff --git a/opendaylight/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/StringList.java b/opendaylight/adsal/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/StringList.java similarity index 100% rename from opendaylight/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/StringList.java rename to opendaylight/adsal/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/StringList.java diff --git a/opendaylight/northbound/containermanager/src/main/resources/META-INF/spring.factories b/opendaylight/adsal/northbound/containermanager/src/main/resources/META-INF/spring.factories similarity index 100% rename from opendaylight/northbound/containermanager/src/main/resources/META-INF/spring.factories rename to opendaylight/adsal/northbound/containermanager/src/main/resources/META-INF/spring.factories diff --git a/opendaylight/northbound/containermanager/src/main/resources/META-INF/spring.handlers b/opendaylight/adsal/northbound/containermanager/src/main/resources/META-INF/spring.handlers similarity index 100% rename from opendaylight/northbound/containermanager/src/main/resources/META-INF/spring.handlers rename to opendaylight/adsal/northbound/containermanager/src/main/resources/META-INF/spring.handlers diff --git a/opendaylight/northbound/containermanager/src/main/resources/META-INF/spring.schemas b/opendaylight/adsal/northbound/containermanager/src/main/resources/META-INF/spring.schemas similarity index 100% rename from opendaylight/northbound/containermanager/src/main/resources/META-INF/spring.schemas rename to opendaylight/adsal/northbound/containermanager/src/main/resources/META-INF/spring.schemas diff --git a/opendaylight/northbound/containermanager/src/main/resources/META-INF/spring.tooling b/opendaylight/adsal/northbound/containermanager/src/main/resources/META-INF/spring.tooling similarity index 100% rename from opendaylight/northbound/containermanager/src/main/resources/META-INF/spring.tooling rename to opendaylight/adsal/northbound/containermanager/src/main/resources/META-INF/spring.tooling diff --git a/opendaylight/northbound/containermanager/src/main/resources/WEB-INF/web.xml b/opendaylight/adsal/northbound/containermanager/src/main/resources/WEB-INF/web.xml similarity index 100% rename from opendaylight/northbound/containermanager/src/main/resources/WEB-INF/web.xml rename to opendaylight/adsal/northbound/containermanager/src/main/resources/WEB-INF/web.xml diff --git a/opendaylight/northbound/controllermanager/enunciate.xml b/opendaylight/adsal/northbound/controllermanager/enunciate.xml similarity index 100% rename from opendaylight/northbound/controllermanager/enunciate.xml rename to opendaylight/adsal/northbound/controllermanager/enunciate.xml diff --git a/opendaylight/northbound/controllermanager/pom.xml b/opendaylight/adsal/northbound/controllermanager/pom.xml similarity index 98% rename from opendaylight/northbound/controllermanager/pom.xml rename to opendaylight/adsal/northbound/controllermanager/pom.xml index 33f9a06246..395dd2dc29 100644 --- a/opendaylight/northbound/controllermanager/pom.xml +++ b/opendaylight/adsal/northbound/controllermanager/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight controllermanager.northbound 0.1.0-SNAPSHOT diff --git a/opendaylight/northbound/controllermanager/src/main/java/org/opendaylight/controller/controllermanager/northbound/ControllerManagerNorthbound.java b/opendaylight/adsal/northbound/controllermanager/src/main/java/org/opendaylight/controller/controllermanager/northbound/ControllerManagerNorthbound.java similarity index 100% rename from opendaylight/northbound/controllermanager/src/main/java/org/opendaylight/controller/controllermanager/northbound/ControllerManagerNorthbound.java rename to opendaylight/adsal/northbound/controllermanager/src/main/java/org/opendaylight/controller/controllermanager/northbound/ControllerManagerNorthbound.java diff --git a/opendaylight/northbound/controllermanager/src/main/java/org/opendaylight/controller/controllermanager/northbound/ControllerProperties.java b/opendaylight/adsal/northbound/controllermanager/src/main/java/org/opendaylight/controller/controllermanager/northbound/ControllerProperties.java similarity index 100% rename from opendaylight/northbound/controllermanager/src/main/java/org/opendaylight/controller/controllermanager/northbound/ControllerProperties.java rename to opendaylight/adsal/northbound/controllermanager/src/main/java/org/opendaylight/controller/controllermanager/northbound/ControllerProperties.java diff --git a/opendaylight/northbound/controllermanager/src/main/resources/WEB-INF/web.xml b/opendaylight/adsal/northbound/controllermanager/src/main/resources/WEB-INF/web.xml similarity index 100% rename from opendaylight/northbound/controllermanager/src/main/resources/WEB-INF/web.xml rename to opendaylight/adsal/northbound/controllermanager/src/main/resources/WEB-INF/web.xml diff --git a/opendaylight/northbound/controllermanager/src/test/java/org/opendaylight/controller/controllermanager/northbound/ControllerManagerNorthboundTest.java b/opendaylight/adsal/northbound/controllermanager/src/test/java/org/opendaylight/controller/controllermanager/northbound/ControllerManagerNorthboundTest.java similarity index 100% rename from opendaylight/northbound/controllermanager/src/test/java/org/opendaylight/controller/controllermanager/northbound/ControllerManagerNorthboundTest.java rename to opendaylight/adsal/northbound/controllermanager/src/test/java/org/opendaylight/controller/controllermanager/northbound/ControllerManagerNorthboundTest.java diff --git a/opendaylight/northbound/flowprogrammer/enunciate.xml b/opendaylight/adsal/northbound/flowprogrammer/enunciate.xml similarity index 100% rename from opendaylight/northbound/flowprogrammer/enunciate.xml rename to opendaylight/adsal/northbound/flowprogrammer/enunciate.xml diff --git a/opendaylight/northbound/flowprogrammer/pom.xml b/opendaylight/adsal/northbound/flowprogrammer/pom.xml similarity index 98% rename from opendaylight/northbound/flowprogrammer/pom.xml rename to opendaylight/adsal/northbound/flowprogrammer/pom.xml index 083a7a2cb8..fdc7340a35 100644 --- a/opendaylight/northbound/flowprogrammer/pom.xml +++ b/opendaylight/adsal/northbound/flowprogrammer/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight flowprogrammer.northbound diff --git a/opendaylight/northbound/flowprogrammer/src/main/java/org/opendaylight/controller/flowprogrammer/northbound/FlowConfigs.java b/opendaylight/adsal/northbound/flowprogrammer/src/main/java/org/opendaylight/controller/flowprogrammer/northbound/FlowConfigs.java similarity index 100% rename from opendaylight/northbound/flowprogrammer/src/main/java/org/opendaylight/controller/flowprogrammer/northbound/FlowConfigs.java rename to opendaylight/adsal/northbound/flowprogrammer/src/main/java/org/opendaylight/controller/flowprogrammer/northbound/FlowConfigs.java diff --git a/opendaylight/northbound/flowprogrammer/src/main/java/org/opendaylight/controller/flowprogrammer/northbound/FlowProgrammerNorthbound.java b/opendaylight/adsal/northbound/flowprogrammer/src/main/java/org/opendaylight/controller/flowprogrammer/northbound/FlowProgrammerNorthbound.java similarity index 100% rename from opendaylight/northbound/flowprogrammer/src/main/java/org/opendaylight/controller/flowprogrammer/northbound/FlowProgrammerNorthbound.java rename to opendaylight/adsal/northbound/flowprogrammer/src/main/java/org/opendaylight/controller/flowprogrammer/northbound/FlowProgrammerNorthbound.java diff --git a/opendaylight/northbound/flowprogrammer/src/main/resources/META-INF/spring.factories b/opendaylight/adsal/northbound/flowprogrammer/src/main/resources/META-INF/spring.factories similarity index 100% rename from opendaylight/northbound/flowprogrammer/src/main/resources/META-INF/spring.factories rename to opendaylight/adsal/northbound/flowprogrammer/src/main/resources/META-INF/spring.factories diff --git a/opendaylight/northbound/flowprogrammer/src/main/resources/META-INF/spring.handlers b/opendaylight/adsal/northbound/flowprogrammer/src/main/resources/META-INF/spring.handlers similarity index 100% rename from opendaylight/northbound/flowprogrammer/src/main/resources/META-INF/spring.handlers rename to opendaylight/adsal/northbound/flowprogrammer/src/main/resources/META-INF/spring.handlers diff --git a/opendaylight/northbound/flowprogrammer/src/main/resources/META-INF/spring.schemas b/opendaylight/adsal/northbound/flowprogrammer/src/main/resources/META-INF/spring.schemas similarity index 100% rename from opendaylight/northbound/flowprogrammer/src/main/resources/META-INF/spring.schemas rename to opendaylight/adsal/northbound/flowprogrammer/src/main/resources/META-INF/spring.schemas diff --git a/opendaylight/northbound/flowprogrammer/src/main/resources/META-INF/spring.tooling b/opendaylight/adsal/northbound/flowprogrammer/src/main/resources/META-INF/spring.tooling similarity index 100% rename from opendaylight/northbound/flowprogrammer/src/main/resources/META-INF/spring.tooling rename to opendaylight/adsal/northbound/flowprogrammer/src/main/resources/META-INF/spring.tooling diff --git a/opendaylight/northbound/flowprogrammer/src/main/resources/WEB-INF/web.xml b/opendaylight/adsal/northbound/flowprogrammer/src/main/resources/WEB-INF/web.xml similarity index 100% rename from opendaylight/northbound/flowprogrammer/src/main/resources/WEB-INF/web.xml rename to opendaylight/adsal/northbound/flowprogrammer/src/main/resources/WEB-INF/web.xml diff --git a/opendaylight/northbound/flowprogrammer/src/test/java/org/opendaylight/controller/flowprogrammer/northbound/FlowProgrammerNorthboundTest.java b/opendaylight/adsal/northbound/flowprogrammer/src/test/java/org/opendaylight/controller/flowprogrammer/northbound/FlowProgrammerNorthboundTest.java similarity index 100% rename from opendaylight/northbound/flowprogrammer/src/test/java/org/opendaylight/controller/flowprogrammer/northbound/FlowProgrammerNorthboundTest.java rename to opendaylight/adsal/northbound/flowprogrammer/src/test/java/org/opendaylight/controller/flowprogrammer/northbound/FlowProgrammerNorthboundTest.java diff --git a/opendaylight/northbound/hosttracker/enunciate.xml b/opendaylight/adsal/northbound/hosttracker/enunciate.xml similarity index 100% rename from opendaylight/northbound/hosttracker/enunciate.xml rename to opendaylight/adsal/northbound/hosttracker/enunciate.xml diff --git a/opendaylight/northbound/hosttracker/pom.xml b/opendaylight/adsal/northbound/hosttracker/pom.xml similarity index 98% rename from opendaylight/northbound/hosttracker/pom.xml rename to opendaylight/adsal/northbound/hosttracker/pom.xml index 3cd3f36be0..778125af28 100644 --- a/opendaylight/northbound/hosttracker/pom.xml +++ b/opendaylight/adsal/northbound/hosttracker/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight hosttracker.northbound 0.5.0-SNAPSHOT diff --git a/opendaylight/northbound/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/northbound/HostConfig.java b/opendaylight/adsal/northbound/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/northbound/HostConfig.java similarity index 100% rename from opendaylight/northbound/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/northbound/HostConfig.java rename to opendaylight/adsal/northbound/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/northbound/HostConfig.java diff --git a/opendaylight/northbound/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/northbound/HostTrackerNorthbound.java b/opendaylight/adsal/northbound/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/northbound/HostTrackerNorthbound.java similarity index 100% rename from opendaylight/northbound/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/northbound/HostTrackerNorthbound.java rename to opendaylight/adsal/northbound/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/northbound/HostTrackerNorthbound.java diff --git a/opendaylight/northbound/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/northbound/Hosts.java b/opendaylight/adsal/northbound/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/northbound/Hosts.java similarity index 100% rename from opendaylight/northbound/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/northbound/Hosts.java rename to opendaylight/adsal/northbound/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/northbound/Hosts.java diff --git a/opendaylight/northbound/hosttracker/src/main/resources/META-INF/spring.factories b/opendaylight/adsal/northbound/hosttracker/src/main/resources/META-INF/spring.factories similarity index 100% rename from opendaylight/northbound/hosttracker/src/main/resources/META-INF/spring.factories rename to opendaylight/adsal/northbound/hosttracker/src/main/resources/META-INF/spring.factories diff --git a/opendaylight/northbound/hosttracker/src/main/resources/META-INF/spring.handlers b/opendaylight/adsal/northbound/hosttracker/src/main/resources/META-INF/spring.handlers similarity index 100% rename from opendaylight/northbound/hosttracker/src/main/resources/META-INF/spring.handlers rename to opendaylight/adsal/northbound/hosttracker/src/main/resources/META-INF/spring.handlers diff --git a/opendaylight/northbound/hosttracker/src/main/resources/META-INF/spring.schemas b/opendaylight/adsal/northbound/hosttracker/src/main/resources/META-INF/spring.schemas similarity index 100% rename from opendaylight/northbound/hosttracker/src/main/resources/META-INF/spring.schemas rename to opendaylight/adsal/northbound/hosttracker/src/main/resources/META-INF/spring.schemas diff --git a/opendaylight/northbound/hosttracker/src/main/resources/META-INF/spring.tooling b/opendaylight/adsal/northbound/hosttracker/src/main/resources/META-INF/spring.tooling similarity index 100% rename from opendaylight/northbound/hosttracker/src/main/resources/META-INF/spring.tooling rename to opendaylight/adsal/northbound/hosttracker/src/main/resources/META-INF/spring.tooling diff --git a/opendaylight/northbound/hosttracker/src/main/resources/WEB-INF/web.xml b/opendaylight/adsal/northbound/hosttracker/src/main/resources/WEB-INF/web.xml similarity index 100% rename from opendaylight/northbound/hosttracker/src/main/resources/WEB-INF/web.xml rename to opendaylight/adsal/northbound/hosttracker/src/main/resources/WEB-INF/web.xml diff --git a/opendaylight/northbound/hosttracker/src/test/java/org/opendaylight/controller/hosttracker/northbound/HostTrackerNorthboundTest.java b/opendaylight/adsal/northbound/hosttracker/src/test/java/org/opendaylight/controller/hosttracker/northbound/HostTrackerNorthboundTest.java similarity index 100% rename from opendaylight/northbound/hosttracker/src/test/java/org/opendaylight/controller/hosttracker/northbound/HostTrackerNorthboundTest.java rename to opendaylight/adsal/northbound/hosttracker/src/test/java/org/opendaylight/controller/hosttracker/northbound/HostTrackerNorthboundTest.java diff --git a/opendaylight/northbound/httpservice-bridge/pom.xml b/opendaylight/adsal/northbound/httpservice-bridge/pom.xml similarity index 95% rename from opendaylight/northbound/httpservice-bridge/pom.xml rename to opendaylight/adsal/northbound/httpservice-bridge/pom.xml index deeabd9d00..12ee95c983 100644 --- a/opendaylight/northbound/httpservice-bridge/pom.xml +++ b/opendaylight/adsal/northbound/httpservice-bridge/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight httpservice-bridge diff --git a/opendaylight/northbound/httpservice-bridge/src/main/resources/WEB-INF/web.xml b/opendaylight/adsal/northbound/httpservice-bridge/src/main/resources/WEB-INF/web.xml similarity index 100% rename from opendaylight/northbound/httpservice-bridge/src/main/resources/WEB-INF/web.xml rename to opendaylight/adsal/northbound/httpservice-bridge/src/main/resources/WEB-INF/web.xml diff --git a/opendaylight/northbound/integrationtest/pom.xml b/opendaylight/adsal/northbound/integrationtest/pom.xml similarity index 100% rename from opendaylight/northbound/integrationtest/pom.xml rename to opendaylight/adsal/northbound/integrationtest/pom.xml diff --git a/opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java b/opendaylight/adsal/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java similarity index 100% rename from opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java rename to opendaylight/adsal/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java diff --git a/opendaylight/northbound/integrationtest/src/test/resources/exam.properties b/opendaylight/adsal/northbound/integrationtest/src/test/resources/exam.properties similarity index 100% rename from opendaylight/northbound/integrationtest/src/test/resources/exam.properties rename to opendaylight/adsal/northbound/integrationtest/src/test/resources/exam.properties diff --git a/opendaylight/northbound/integrationtest/src/test/resources/logback.xml b/opendaylight/adsal/northbound/integrationtest/src/test/resources/logback.xml similarity index 100% rename from opendaylight/northbound/integrationtest/src/test/resources/logback.xml rename to opendaylight/adsal/northbound/integrationtest/src/test/resources/logback.xml diff --git a/opendaylight/northbound/integrationtest/src/test/resources/tomcat-server.xml b/opendaylight/adsal/northbound/integrationtest/src/test/resources/tomcat-server.xml similarity index 100% rename from opendaylight/northbound/integrationtest/src/test/resources/tomcat-server.xml rename to opendaylight/adsal/northbound/integrationtest/src/test/resources/tomcat-server.xml diff --git a/opendaylight/northbound/java-client/enunciate.xml b/opendaylight/adsal/northbound/java-client/enunciate.xml similarity index 100% rename from opendaylight/northbound/java-client/enunciate.xml rename to opendaylight/adsal/northbound/java-client/enunciate.xml diff --git a/opendaylight/northbound/java-client/pom.xml b/opendaylight/adsal/northbound/java-client/pom.xml similarity index 99% rename from opendaylight/northbound/java-client/pom.xml rename to opendaylight/adsal/northbound/java-client/pom.xml index a4bcde461e..5a4c18e88c 100644 --- a/opendaylight/northbound/java-client/pom.xml +++ b/opendaylight/adsal/northbound/java-client/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight northbound.client diff --git a/opendaylight/northbound/jolokia/pom.xml b/opendaylight/adsal/northbound/jolokia/pom.xml similarity index 95% rename from opendaylight/northbound/jolokia/pom.xml rename to opendaylight/adsal/northbound/jolokia/pom.xml index 07e3a7d36b..b078e486a8 100644 --- a/opendaylight/northbound/jolokia/pom.xml +++ b/opendaylight/adsal/northbound/jolokia/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight jolokia-bridge diff --git a/opendaylight/northbound/jolokia/src/main/resources/WEB-INF/web.xml b/opendaylight/adsal/northbound/jolokia/src/main/resources/WEB-INF/web.xml similarity index 100% rename from opendaylight/northbound/jolokia/src/main/resources/WEB-INF/web.xml rename to opendaylight/adsal/northbound/jolokia/src/main/resources/WEB-INF/web.xml diff --git a/opendaylight/northbound/networkconfiguration/bridgedomain/enunciate.xml b/opendaylight/adsal/northbound/networkconfiguration/bridgedomain/enunciate.xml similarity index 100% rename from opendaylight/northbound/networkconfiguration/bridgedomain/enunciate.xml rename to opendaylight/adsal/northbound/networkconfiguration/bridgedomain/enunciate.xml diff --git a/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml b/opendaylight/adsal/northbound/networkconfiguration/bridgedomain/pom.xml similarity index 98% rename from opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml rename to opendaylight/adsal/northbound/networkconfiguration/bridgedomain/pom.xml index 8b552ba25a..f78ff96608 100644 --- a/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml +++ b/opendaylight/adsal/northbound/networkconfiguration/bridgedomain/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../../commons/opendaylight + ../../../../commons/opendaylight networkconfig.bridgedomain.northbound diff --git a/opendaylight/northbound/networkconfiguration/bridgedomain/src/main/java/org/opendaylight/controller/networkconfig/bridgedomain/northbound/BridgeDomainNorthbound.java b/opendaylight/adsal/northbound/networkconfiguration/bridgedomain/src/main/java/org/opendaylight/controller/networkconfig/bridgedomain/northbound/BridgeDomainNorthbound.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/bridgedomain/src/main/java/org/opendaylight/controller/networkconfig/bridgedomain/northbound/BridgeDomainNorthbound.java rename to opendaylight/adsal/northbound/networkconfiguration/bridgedomain/src/main/java/org/opendaylight/controller/networkconfig/bridgedomain/northbound/BridgeDomainNorthbound.java diff --git a/opendaylight/northbound/networkconfiguration/bridgedomain/src/main/resources/WEB-INF/web.xml b/opendaylight/adsal/northbound/networkconfiguration/bridgedomain/src/main/resources/WEB-INF/web.xml similarity index 100% rename from opendaylight/northbound/networkconfiguration/bridgedomain/src/main/resources/WEB-INF/web.xml rename to opendaylight/adsal/northbound/networkconfiguration/bridgedomain/src/main/resources/WEB-INF/web.xml diff --git a/opendaylight/northbound/staticrouting/enunciate.xml b/opendaylight/adsal/northbound/staticrouting/enunciate.xml similarity index 100% rename from opendaylight/northbound/staticrouting/enunciate.xml rename to opendaylight/adsal/northbound/staticrouting/enunciate.xml diff --git a/opendaylight/northbound/staticrouting/pom.xml b/opendaylight/adsal/northbound/staticrouting/pom.xml similarity index 98% rename from opendaylight/northbound/staticrouting/pom.xml rename to opendaylight/adsal/northbound/staticrouting/pom.xml index 761f1f08e9..3a89369b18 100644 --- a/opendaylight/northbound/staticrouting/pom.xml +++ b/opendaylight/adsal/northbound/staticrouting/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight forwarding.staticrouting.northbound diff --git a/opendaylight/northbound/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/northbound/StaticRoute.java b/opendaylight/adsal/northbound/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/northbound/StaticRoute.java similarity index 100% rename from opendaylight/northbound/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/northbound/StaticRoute.java rename to opendaylight/adsal/northbound/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/northbound/StaticRoute.java diff --git a/opendaylight/northbound/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/northbound/StaticRoutes.java b/opendaylight/adsal/northbound/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/northbound/StaticRoutes.java similarity index 100% rename from opendaylight/northbound/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/northbound/StaticRoutes.java rename to opendaylight/adsal/northbound/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/northbound/StaticRoutes.java diff --git a/opendaylight/northbound/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/northbound/StaticRoutingNorthbound.java b/opendaylight/adsal/northbound/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/northbound/StaticRoutingNorthbound.java similarity index 100% rename from opendaylight/northbound/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/northbound/StaticRoutingNorthbound.java rename to opendaylight/adsal/northbound/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/northbound/StaticRoutingNorthbound.java diff --git a/opendaylight/northbound/staticrouting/src/main/resources/META-INF/spring.factories b/opendaylight/adsal/northbound/staticrouting/src/main/resources/META-INF/spring.factories similarity index 100% rename from opendaylight/northbound/staticrouting/src/main/resources/META-INF/spring.factories rename to opendaylight/adsal/northbound/staticrouting/src/main/resources/META-INF/spring.factories diff --git a/opendaylight/northbound/staticrouting/src/main/resources/META-INF/spring.handlers b/opendaylight/adsal/northbound/staticrouting/src/main/resources/META-INF/spring.handlers similarity index 100% rename from opendaylight/northbound/staticrouting/src/main/resources/META-INF/spring.handlers rename to opendaylight/adsal/northbound/staticrouting/src/main/resources/META-INF/spring.handlers diff --git a/opendaylight/northbound/staticrouting/src/main/resources/META-INF/spring.schemas b/opendaylight/adsal/northbound/staticrouting/src/main/resources/META-INF/spring.schemas similarity index 100% rename from opendaylight/northbound/staticrouting/src/main/resources/META-INF/spring.schemas rename to opendaylight/adsal/northbound/staticrouting/src/main/resources/META-INF/spring.schemas diff --git a/opendaylight/northbound/staticrouting/src/main/resources/META-INF/spring.tooling b/opendaylight/adsal/northbound/staticrouting/src/main/resources/META-INF/spring.tooling similarity index 100% rename from opendaylight/northbound/staticrouting/src/main/resources/META-INF/spring.tooling rename to opendaylight/adsal/northbound/staticrouting/src/main/resources/META-INF/spring.tooling diff --git a/opendaylight/northbound/staticrouting/src/main/resources/WEB-INF/web.xml b/opendaylight/adsal/northbound/staticrouting/src/main/resources/WEB-INF/web.xml similarity index 100% rename from opendaylight/northbound/staticrouting/src/main/resources/WEB-INF/web.xml rename to opendaylight/adsal/northbound/staticrouting/src/main/resources/WEB-INF/web.xml diff --git a/opendaylight/northbound/staticrouting/src/test/java/org/opendaylight/controller/forwarding/staticrouting/northbound/StaticRoutingNorthboundTest.java b/opendaylight/adsal/northbound/staticrouting/src/test/java/org/opendaylight/controller/forwarding/staticrouting/northbound/StaticRoutingNorthboundTest.java similarity index 100% rename from opendaylight/northbound/staticrouting/src/test/java/org/opendaylight/controller/forwarding/staticrouting/northbound/StaticRoutingNorthboundTest.java rename to opendaylight/adsal/northbound/staticrouting/src/test/java/org/opendaylight/controller/forwarding/staticrouting/northbound/StaticRoutingNorthboundTest.java diff --git a/opendaylight/northbound/statistics/enunciate.xml b/opendaylight/adsal/northbound/statistics/enunciate.xml similarity index 100% rename from opendaylight/northbound/statistics/enunciate.xml rename to opendaylight/adsal/northbound/statistics/enunciate.xml diff --git a/opendaylight/northbound/statistics/pom.xml b/opendaylight/adsal/northbound/statistics/pom.xml similarity index 98% rename from opendaylight/northbound/statistics/pom.xml rename to opendaylight/adsal/northbound/statistics/pom.xml index 4ae3d8746c..0d42ffbb80 100644 --- a/opendaylight/northbound/statistics/pom.xml +++ b/opendaylight/adsal/northbound/statistics/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight statistics.northbound diff --git a/opendaylight/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/AllFlowStatistics.java b/opendaylight/adsal/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/AllFlowStatistics.java similarity index 100% rename from opendaylight/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/AllFlowStatistics.java rename to opendaylight/adsal/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/AllFlowStatistics.java diff --git a/opendaylight/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/AllPortStatistics.java b/opendaylight/adsal/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/AllPortStatistics.java similarity index 100% rename from opendaylight/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/AllPortStatistics.java rename to opendaylight/adsal/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/AllPortStatistics.java diff --git a/opendaylight/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/AllTableStatistics.java b/opendaylight/adsal/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/AllTableStatistics.java similarity index 100% rename from opendaylight/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/AllTableStatistics.java rename to opendaylight/adsal/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/AllTableStatistics.java diff --git a/opendaylight/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/FlowStatistics.java b/opendaylight/adsal/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/FlowStatistics.java similarity index 100% rename from opendaylight/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/FlowStatistics.java rename to opendaylight/adsal/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/FlowStatistics.java diff --git a/opendaylight/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/PortStatistics.java b/opendaylight/adsal/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/PortStatistics.java similarity index 100% rename from opendaylight/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/PortStatistics.java rename to opendaylight/adsal/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/PortStatistics.java diff --git a/opendaylight/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/StatisticsNorthbound.java b/opendaylight/adsal/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/StatisticsNorthbound.java similarity index 100% rename from opendaylight/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/StatisticsNorthbound.java rename to opendaylight/adsal/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/StatisticsNorthbound.java diff --git a/opendaylight/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/TableStatistics.java b/opendaylight/adsal/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/TableStatistics.java similarity index 100% rename from opendaylight/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/TableStatistics.java rename to opendaylight/adsal/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/TableStatistics.java diff --git a/opendaylight/northbound/statistics/src/main/resources/META-INF/spring.factories b/opendaylight/adsal/northbound/statistics/src/main/resources/META-INF/spring.factories similarity index 100% rename from opendaylight/northbound/statistics/src/main/resources/META-INF/spring.factories rename to opendaylight/adsal/northbound/statistics/src/main/resources/META-INF/spring.factories diff --git a/opendaylight/northbound/statistics/src/main/resources/META-INF/spring.handlers b/opendaylight/adsal/northbound/statistics/src/main/resources/META-INF/spring.handlers similarity index 100% rename from opendaylight/northbound/statistics/src/main/resources/META-INF/spring.handlers rename to opendaylight/adsal/northbound/statistics/src/main/resources/META-INF/spring.handlers diff --git a/opendaylight/northbound/statistics/src/main/resources/META-INF/spring.schemas b/opendaylight/adsal/northbound/statistics/src/main/resources/META-INF/spring.schemas similarity index 100% rename from opendaylight/northbound/statistics/src/main/resources/META-INF/spring.schemas rename to opendaylight/adsal/northbound/statistics/src/main/resources/META-INF/spring.schemas diff --git a/opendaylight/northbound/statistics/src/main/resources/META-INF/spring.tooling b/opendaylight/adsal/northbound/statistics/src/main/resources/META-INF/spring.tooling similarity index 100% rename from opendaylight/northbound/statistics/src/main/resources/META-INF/spring.tooling rename to opendaylight/adsal/northbound/statistics/src/main/resources/META-INF/spring.tooling diff --git a/opendaylight/northbound/statistics/src/main/resources/WEB-INF/web.xml b/opendaylight/adsal/northbound/statistics/src/main/resources/WEB-INF/web.xml similarity index 100% rename from opendaylight/northbound/statistics/src/main/resources/WEB-INF/web.xml rename to opendaylight/adsal/northbound/statistics/src/main/resources/WEB-INF/web.xml diff --git a/opendaylight/northbound/statistics/src/test/java/org/opendaylight/controller/statistics/northbound/StatisticsNorthboundTest.java b/opendaylight/adsal/northbound/statistics/src/test/java/org/opendaylight/controller/statistics/northbound/StatisticsNorthboundTest.java similarity index 100% rename from opendaylight/northbound/statistics/src/test/java/org/opendaylight/controller/statistics/northbound/StatisticsNorthboundTest.java rename to opendaylight/adsal/northbound/statistics/src/test/java/org/opendaylight/controller/statistics/northbound/StatisticsNorthboundTest.java diff --git a/opendaylight/northbound/subnets/enunciate.xml b/opendaylight/adsal/northbound/subnets/enunciate.xml similarity index 100% rename from opendaylight/northbound/subnets/enunciate.xml rename to opendaylight/adsal/northbound/subnets/enunciate.xml diff --git a/opendaylight/northbound/subnets/pom.xml b/opendaylight/adsal/northbound/subnets/pom.xml similarity index 98% rename from opendaylight/northbound/subnets/pom.xml rename to opendaylight/adsal/northbound/subnets/pom.xml index 1efb974b51..1eaa45dddd 100644 --- a/opendaylight/northbound/subnets/pom.xml +++ b/opendaylight/adsal/northbound/subnets/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight subnets.northbound diff --git a/opendaylight/northbound/subnets/src/main/java/org/opendaylight/controller/subnets/northbound/SubnetConfigs.java b/opendaylight/adsal/northbound/subnets/src/main/java/org/opendaylight/controller/subnets/northbound/SubnetConfigs.java similarity index 100% rename from opendaylight/northbound/subnets/src/main/java/org/opendaylight/controller/subnets/northbound/SubnetConfigs.java rename to opendaylight/adsal/northbound/subnets/src/main/java/org/opendaylight/controller/subnets/northbound/SubnetConfigs.java diff --git a/opendaylight/northbound/subnets/src/main/java/org/opendaylight/controller/subnets/northbound/SubnetsNorthbound.java b/opendaylight/adsal/northbound/subnets/src/main/java/org/opendaylight/controller/subnets/northbound/SubnetsNorthbound.java similarity index 100% rename from opendaylight/northbound/subnets/src/main/java/org/opendaylight/controller/subnets/northbound/SubnetsNorthbound.java rename to opendaylight/adsal/northbound/subnets/src/main/java/org/opendaylight/controller/subnets/northbound/SubnetsNorthbound.java diff --git a/opendaylight/northbound/subnets/src/main/resources/META-INF/spring.factories b/opendaylight/adsal/northbound/subnets/src/main/resources/META-INF/spring.factories similarity index 100% rename from opendaylight/northbound/subnets/src/main/resources/META-INF/spring.factories rename to opendaylight/adsal/northbound/subnets/src/main/resources/META-INF/spring.factories diff --git a/opendaylight/northbound/subnets/src/main/resources/META-INF/spring.handlers b/opendaylight/adsal/northbound/subnets/src/main/resources/META-INF/spring.handlers similarity index 100% rename from opendaylight/northbound/subnets/src/main/resources/META-INF/spring.handlers rename to opendaylight/adsal/northbound/subnets/src/main/resources/META-INF/spring.handlers diff --git a/opendaylight/northbound/subnets/src/main/resources/META-INF/spring.schemas b/opendaylight/adsal/northbound/subnets/src/main/resources/META-INF/spring.schemas similarity index 100% rename from opendaylight/northbound/subnets/src/main/resources/META-INF/spring.schemas rename to opendaylight/adsal/northbound/subnets/src/main/resources/META-INF/spring.schemas diff --git a/opendaylight/northbound/subnets/src/main/resources/META-INF/spring.tooling b/opendaylight/adsal/northbound/subnets/src/main/resources/META-INF/spring.tooling similarity index 100% rename from opendaylight/northbound/subnets/src/main/resources/META-INF/spring.tooling rename to opendaylight/adsal/northbound/subnets/src/main/resources/META-INF/spring.tooling diff --git a/opendaylight/northbound/subnets/src/main/resources/WEB-INF/web.xml b/opendaylight/adsal/northbound/subnets/src/main/resources/WEB-INF/web.xml similarity index 100% rename from opendaylight/northbound/subnets/src/main/resources/WEB-INF/web.xml rename to opendaylight/adsal/northbound/subnets/src/main/resources/WEB-INF/web.xml diff --git a/opendaylight/northbound/subnets/src/test/java/org/opendaylight/controller/subnets/northbound/SubnetsNorthboundTest.java b/opendaylight/adsal/northbound/subnets/src/test/java/org/opendaylight/controller/subnets/northbound/SubnetsNorthboundTest.java similarity index 100% rename from opendaylight/northbound/subnets/src/test/java/org/opendaylight/controller/subnets/northbound/SubnetsNorthboundTest.java rename to opendaylight/adsal/northbound/subnets/src/test/java/org/opendaylight/controller/subnets/northbound/SubnetsNorthboundTest.java diff --git a/opendaylight/northbound/swagger-ui/pom.xml b/opendaylight/adsal/northbound/swagger-ui/pom.xml similarity index 96% rename from opendaylight/northbound/swagger-ui/pom.xml rename to opendaylight/adsal/northbound/swagger-ui/pom.xml index bbb80a7811..ba1e5c0bc4 100644 --- a/opendaylight/northbound/swagger-ui/pom.xml +++ b/opendaylight/adsal/northbound/swagger-ui/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight swagger-ui @@ -71,6 +71,10 @@ org.opendaylight.controller usermanager.northbound + + org.opendaylight.controller + networkconfig.neutron.northbound + org.slf4j slf4j-api @@ -157,6 +161,7 @@ + diff --git a/opendaylight/northbound/swagger-ui/src/main/java/org/opendaylight/controller/swaggerui/BasePathModifierServlet.java b/opendaylight/adsal/northbound/swagger-ui/src/main/java/org/opendaylight/controller/swaggerui/BasePathModifierServlet.java similarity index 100% rename from opendaylight/northbound/swagger-ui/src/main/java/org/opendaylight/controller/swaggerui/BasePathModifierServlet.java rename to opendaylight/adsal/northbound/swagger-ui/src/main/java/org/opendaylight/controller/swaggerui/BasePathModifierServlet.java diff --git a/opendaylight/northbound/swagger-ui/src/main/resources/WEB-INF/web.xml b/opendaylight/adsal/northbound/swagger-ui/src/main/resources/WEB-INF/web.xml similarity index 100% rename from opendaylight/northbound/swagger-ui/src/main/resources/WEB-INF/web.xml rename to opendaylight/adsal/northbound/swagger-ui/src/main/resources/WEB-INF/web.xml diff --git a/opendaylight/northbound/swagger-ui/src/main/resources/css/custom.css b/opendaylight/adsal/northbound/swagger-ui/src/main/resources/css/custom.css similarity index 100% rename from opendaylight/northbound/swagger-ui/src/main/resources/css/custom.css rename to opendaylight/adsal/northbound/swagger-ui/src/main/resources/css/custom.css diff --git a/opendaylight/northbound/swagger-ui/src/main/resources/images/logo.png b/opendaylight/adsal/northbound/swagger-ui/src/main/resources/images/logo.png similarity index 100% rename from opendaylight/northbound/swagger-ui/src/main/resources/images/logo.png rename to opendaylight/adsal/northbound/swagger-ui/src/main/resources/images/logo.png diff --git a/opendaylight/northbound/swagger-ui/src/main/resources/index.html b/opendaylight/adsal/northbound/swagger-ui/src/main/resources/index.html similarity index 100% rename from opendaylight/northbound/swagger-ui/src/main/resources/index.html rename to opendaylight/adsal/northbound/swagger-ui/src/main/resources/index.html diff --git a/opendaylight/northbound/switchmanager/enunciate.xml b/opendaylight/adsal/northbound/switchmanager/enunciate.xml similarity index 100% rename from opendaylight/northbound/switchmanager/enunciate.xml rename to opendaylight/adsal/northbound/switchmanager/enunciate.xml diff --git a/opendaylight/northbound/switchmanager/pom.xml b/opendaylight/adsal/northbound/switchmanager/pom.xml similarity index 98% rename from opendaylight/northbound/switchmanager/pom.xml rename to opendaylight/adsal/northbound/switchmanager/pom.xml index 1b876f4420..b7aaae58d0 100644 --- a/opendaylight/northbound/switchmanager/pom.xml +++ b/opendaylight/adsal/northbound/switchmanager/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight switchmanager.northbound 0.5.0-SNAPSHOT diff --git a/opendaylight/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/NodeConnectorProperties.java b/opendaylight/adsal/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/NodeConnectorProperties.java similarity index 100% rename from opendaylight/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/NodeConnectorProperties.java rename to opendaylight/adsal/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/NodeConnectorProperties.java diff --git a/opendaylight/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/NodeConnectors.java b/opendaylight/adsal/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/NodeConnectors.java similarity index 100% rename from opendaylight/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/NodeConnectors.java rename to opendaylight/adsal/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/NodeConnectors.java diff --git a/opendaylight/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/NodeProperties.java b/opendaylight/adsal/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/NodeProperties.java similarity index 100% rename from opendaylight/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/NodeProperties.java rename to opendaylight/adsal/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/NodeProperties.java diff --git a/opendaylight/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/Nodes.java b/opendaylight/adsal/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/Nodes.java similarity index 100% rename from opendaylight/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/Nodes.java rename to opendaylight/adsal/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/Nodes.java diff --git a/opendaylight/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/SwitchNorthbound.java b/opendaylight/adsal/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/SwitchNorthbound.java similarity index 100% rename from opendaylight/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/SwitchNorthbound.java rename to opendaylight/adsal/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/SwitchNorthbound.java diff --git a/opendaylight/northbound/switchmanager/src/main/resources/META-INF/spring.factories b/opendaylight/adsal/northbound/switchmanager/src/main/resources/META-INF/spring.factories similarity index 100% rename from opendaylight/northbound/switchmanager/src/main/resources/META-INF/spring.factories rename to opendaylight/adsal/northbound/switchmanager/src/main/resources/META-INF/spring.factories diff --git a/opendaylight/northbound/switchmanager/src/main/resources/META-INF/spring.handlers b/opendaylight/adsal/northbound/switchmanager/src/main/resources/META-INF/spring.handlers similarity index 100% rename from opendaylight/northbound/switchmanager/src/main/resources/META-INF/spring.handlers rename to opendaylight/adsal/northbound/switchmanager/src/main/resources/META-INF/spring.handlers diff --git a/opendaylight/northbound/switchmanager/src/main/resources/META-INF/spring.schemas b/opendaylight/adsal/northbound/switchmanager/src/main/resources/META-INF/spring.schemas similarity index 100% rename from opendaylight/northbound/switchmanager/src/main/resources/META-INF/spring.schemas rename to opendaylight/adsal/northbound/switchmanager/src/main/resources/META-INF/spring.schemas diff --git a/opendaylight/northbound/switchmanager/src/main/resources/META-INF/spring.tooling b/opendaylight/adsal/northbound/switchmanager/src/main/resources/META-INF/spring.tooling similarity index 100% rename from opendaylight/northbound/switchmanager/src/main/resources/META-INF/spring.tooling rename to opendaylight/adsal/northbound/switchmanager/src/main/resources/META-INF/spring.tooling diff --git a/opendaylight/northbound/switchmanager/src/main/resources/WEB-INF/web.xml b/opendaylight/adsal/northbound/switchmanager/src/main/resources/WEB-INF/web.xml similarity index 100% rename from opendaylight/northbound/switchmanager/src/main/resources/WEB-INF/web.xml rename to opendaylight/adsal/northbound/switchmanager/src/main/resources/WEB-INF/web.xml diff --git a/opendaylight/northbound/switchmanager/src/test/java/org/opendaylight/controller/switchmanager/northbound/SwitchManagerNorthboundTest.java b/opendaylight/adsal/northbound/switchmanager/src/test/java/org/opendaylight/controller/switchmanager/northbound/SwitchManagerNorthboundTest.java similarity index 100% rename from opendaylight/northbound/switchmanager/src/test/java/org/opendaylight/controller/switchmanager/northbound/SwitchManagerNorthboundTest.java rename to opendaylight/adsal/northbound/switchmanager/src/test/java/org/opendaylight/controller/switchmanager/northbound/SwitchManagerNorthboundTest.java diff --git a/opendaylight/northbound/topology/enunciate.xml b/opendaylight/adsal/northbound/topology/enunciate.xml similarity index 100% rename from opendaylight/northbound/topology/enunciate.xml rename to opendaylight/adsal/northbound/topology/enunciate.xml diff --git a/opendaylight/northbound/topology/pom.xml b/opendaylight/adsal/northbound/topology/pom.xml similarity index 98% rename from opendaylight/northbound/topology/pom.xml rename to opendaylight/adsal/northbound/topology/pom.xml index 270148420c..60a12700aa 100644 --- a/opendaylight/northbound/topology/pom.xml +++ b/opendaylight/adsal/northbound/topology/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight topology.northbound diff --git a/opendaylight/northbound/topology/src/main/java/org/opendaylight/controller/topology/northbound/EdgeProperties.java b/opendaylight/adsal/northbound/topology/src/main/java/org/opendaylight/controller/topology/northbound/EdgeProperties.java similarity index 100% rename from opendaylight/northbound/topology/src/main/java/org/opendaylight/controller/topology/northbound/EdgeProperties.java rename to opendaylight/adsal/northbound/topology/src/main/java/org/opendaylight/controller/topology/northbound/EdgeProperties.java diff --git a/opendaylight/northbound/topology/src/main/java/org/opendaylight/controller/topology/northbound/Topology.java b/opendaylight/adsal/northbound/topology/src/main/java/org/opendaylight/controller/topology/northbound/Topology.java similarity index 100% rename from opendaylight/northbound/topology/src/main/java/org/opendaylight/controller/topology/northbound/Topology.java rename to opendaylight/adsal/northbound/topology/src/main/java/org/opendaylight/controller/topology/northbound/Topology.java diff --git a/opendaylight/northbound/topology/src/main/java/org/opendaylight/controller/topology/northbound/TopologyNorthboundJAXRS.java b/opendaylight/adsal/northbound/topology/src/main/java/org/opendaylight/controller/topology/northbound/TopologyNorthboundJAXRS.java similarity index 100% rename from opendaylight/northbound/topology/src/main/java/org/opendaylight/controller/topology/northbound/TopologyNorthboundJAXRS.java rename to opendaylight/adsal/northbound/topology/src/main/java/org/opendaylight/controller/topology/northbound/TopologyNorthboundJAXRS.java diff --git a/opendaylight/northbound/topology/src/main/java/org/opendaylight/controller/topology/northbound/TopologyUserLinks.java b/opendaylight/adsal/northbound/topology/src/main/java/org/opendaylight/controller/topology/northbound/TopologyUserLinks.java similarity index 100% rename from opendaylight/northbound/topology/src/main/java/org/opendaylight/controller/topology/northbound/TopologyUserLinks.java rename to opendaylight/adsal/northbound/topology/src/main/java/org/opendaylight/controller/topology/northbound/TopologyUserLinks.java diff --git a/opendaylight/northbound/topology/src/main/resources/META-INF/spring.factories b/opendaylight/adsal/northbound/topology/src/main/resources/META-INF/spring.factories similarity index 100% rename from opendaylight/northbound/topology/src/main/resources/META-INF/spring.factories rename to opendaylight/adsal/northbound/topology/src/main/resources/META-INF/spring.factories diff --git a/opendaylight/northbound/topology/src/main/resources/META-INF/spring.handlers b/opendaylight/adsal/northbound/topology/src/main/resources/META-INF/spring.handlers similarity index 100% rename from opendaylight/northbound/topology/src/main/resources/META-INF/spring.handlers rename to opendaylight/adsal/northbound/topology/src/main/resources/META-INF/spring.handlers diff --git a/opendaylight/northbound/topology/src/main/resources/META-INF/spring.schemas b/opendaylight/adsal/northbound/topology/src/main/resources/META-INF/spring.schemas similarity index 100% rename from opendaylight/northbound/topology/src/main/resources/META-INF/spring.schemas rename to opendaylight/adsal/northbound/topology/src/main/resources/META-INF/spring.schemas diff --git a/opendaylight/northbound/topology/src/main/resources/META-INF/spring.tooling b/opendaylight/adsal/northbound/topology/src/main/resources/META-INF/spring.tooling similarity index 100% rename from opendaylight/northbound/topology/src/main/resources/META-INF/spring.tooling rename to opendaylight/adsal/northbound/topology/src/main/resources/META-INF/spring.tooling diff --git a/opendaylight/northbound/topology/src/main/resources/WEB-INF/web.xml b/opendaylight/adsal/northbound/topology/src/main/resources/WEB-INF/web.xml similarity index 100% rename from opendaylight/northbound/topology/src/main/resources/WEB-INF/web.xml rename to opendaylight/adsal/northbound/topology/src/main/resources/WEB-INF/web.xml diff --git a/opendaylight/northbound/topology/src/test/java/org/opendaylight/controller/topology/northbound/TopologyTest.java b/opendaylight/adsal/northbound/topology/src/test/java/org/opendaylight/controller/topology/northbound/TopologyTest.java similarity index 100% rename from opendaylight/northbound/topology/src/test/java/org/opendaylight/controller/topology/northbound/TopologyTest.java rename to opendaylight/adsal/northbound/topology/src/test/java/org/opendaylight/controller/topology/northbound/TopologyTest.java diff --git a/opendaylight/northbound/usermanager/enunciate.xml b/opendaylight/adsal/northbound/usermanager/enunciate.xml similarity index 100% rename from opendaylight/northbound/usermanager/enunciate.xml rename to opendaylight/adsal/northbound/usermanager/enunciate.xml diff --git a/opendaylight/northbound/usermanager/pom.xml b/opendaylight/adsal/northbound/usermanager/pom.xml similarity index 98% rename from opendaylight/northbound/usermanager/pom.xml rename to opendaylight/adsal/northbound/usermanager/pom.xml index fe32bcf5d3..e51ef2faa9 100644 --- a/opendaylight/northbound/usermanager/pom.xml +++ b/opendaylight/adsal/northbound/usermanager/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight usermanager.northbound diff --git a/opendaylight/northbound/usermanager/src/main/java/org/opendaylight/controller/usermanager/northbound/UserManagerNorthbound.java b/opendaylight/adsal/northbound/usermanager/src/main/java/org/opendaylight/controller/usermanager/northbound/UserManagerNorthbound.java similarity index 100% rename from opendaylight/northbound/usermanager/src/main/java/org/opendaylight/controller/usermanager/northbound/UserManagerNorthbound.java rename to opendaylight/adsal/northbound/usermanager/src/main/java/org/opendaylight/controller/usermanager/northbound/UserManagerNorthbound.java diff --git a/opendaylight/northbound/usermanager/src/main/resources/WEB-INF/web.xml b/opendaylight/adsal/northbound/usermanager/src/main/resources/WEB-INF/web.xml similarity index 100% rename from opendaylight/northbound/usermanager/src/main/resources/WEB-INF/web.xml rename to opendaylight/adsal/northbound/usermanager/src/main/resources/WEB-INF/web.xml diff --git a/opendaylight/northbound/usermanager/src/test/java/org/opendaylight/controller/subnets/northbound/UserManagerNorthboundTest.java b/opendaylight/adsal/northbound/usermanager/src/test/java/org/opendaylight/controller/subnets/northbound/UserManagerNorthboundTest.java similarity index 100% rename from opendaylight/northbound/usermanager/src/test/java/org/opendaylight/controller/subnets/northbound/UserManagerNorthboundTest.java rename to opendaylight/adsal/northbound/usermanager/src/test/java/org/opendaylight/controller/subnets/northbound/UserManagerNorthboundTest.java diff --git a/opendaylight/northboundtest/unit_test_suite/pom.xml b/opendaylight/adsal/northboundtest/unit_test_suite/pom.xml similarity index 97% rename from opendaylight/northboundtest/unit_test_suite/pom.xml rename to opendaylight/adsal/northboundtest/unit_test_suite/pom.xml index 11c885db30..9f33a4db5d 100644 --- a/opendaylight/northboundtest/unit_test_suite/pom.xml +++ b/opendaylight/adsal/northboundtest/unit_test_suite/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../../opendaylight/commons/opendaylight + ../../../../opendaylight/commons/opendaylight scm:git:ssh://git.opendaylight.org:29418/controller.git diff --git a/opendaylight/northboundtest/unit_test_suite/src/main/java/org/opendaylight/controller/northboundtest/unittestsuite/internal/API3UnitTest.java b/opendaylight/adsal/northboundtest/unit_test_suite/src/main/java/org/opendaylight/controller/northboundtest/unittestsuite/internal/API3UnitTest.java similarity index 100% rename from opendaylight/northboundtest/unit_test_suite/src/main/java/org/opendaylight/controller/northboundtest/unittestsuite/internal/API3UnitTest.java rename to opendaylight/adsal/northboundtest/unit_test_suite/src/main/java/org/opendaylight/controller/northboundtest/unittestsuite/internal/API3UnitTest.java diff --git a/opendaylight/northboundtest/unit_test_suite/src/main/java/org/opendaylight/controller/northboundtest/unittestsuite/internal/Activator.java b/opendaylight/adsal/northboundtest/unit_test_suite/src/main/java/org/opendaylight/controller/northboundtest/unittestsuite/internal/Activator.java similarity index 100% rename from opendaylight/northboundtest/unit_test_suite/src/main/java/org/opendaylight/controller/northboundtest/unittestsuite/internal/Activator.java rename to opendaylight/adsal/northboundtest/unit_test_suite/src/main/java/org/opendaylight/controller/northboundtest/unittestsuite/internal/Activator.java diff --git a/opendaylight/adsal/pom.xml b/opendaylight/adsal/pom.xml new file mode 100644 index 0000000000..23db4d56a6 --- /dev/null +++ b/opendaylight/adsal/pom.xml @@ -0,0 +1,140 @@ + + + 4.0.0 + + + org.opendaylight.controller + commons.parent + 1.1.0-SNAPSHOT + ../commons/parent + + + adsal-parent + pom + + forwarding/staticrouting + clustering/services + clustering/services_implementation + clustering/stub + clustering/test + configuration/api + configuration/implementation + routing/dijkstra_implementation + arphandler + forwardingrulesmanager/api + forwardingrulesmanager/implementation + hosttracker/api + hosttracker/implementation + hosttracker/shell + hosttracker_new/api + hosttracker_new/implementation + containermanager/api + containermanager/implementation + containermanager/shell + appauth + switchmanager/api + switchmanager/implementation + statisticsmanager/api + statisticsmanager/implementation + topologymanager/implementation + topologymanager/shell + usermanager/api + usermanager/implementation + connectionmanager/api + connectionmanager/implementation + security + karaf-tomcat-security + + + sal/api + sal/implementation + + + sal/connection/api + sal/connection/implementation + sal/networkconfiguration/api + sal/networkconfiguration/implementation + + + web/root + web/flows + web/devices + web/troubleshoot + web/topology + web/osgi-brandfragment + + + northbound/commons + northbound/bundlescanner/api + northbound/bundlescanner/implementation + northbound/topology + northbound/staticrouting + northbound/statistics + northbound/flowprogrammer + northbound/hosttracker + northbound/subnets + northbound/switchmanager + northbound/containermanager + northbound/networkconfiguration/bridgedomain + northbound/httpservice-bridge + northbound/jolokia + northbound/connectionmanager + northbound/usermanager + northbound/controllermanager + + + logging/bridge + + + protocol_plugins/openflow + protocol_plugins/stub + + + samples/simpleforwarding + samples/loadbalancer + samples/northbound/loadbalancer + + dummy-console + + + features/base + features/controller + features/adsal + features/nsf + features/extras + features/adsal-compatibility + + + + integrationtests + + false + + + clustering/integrationtest + configuration/integrationtest + forwardingrulesmanager/integrationtest + hosttracker/integrationtest + switchmanager/integrationtest + topologymanager/integrationtest + + northbound/integrationtest + statisticsmanager/integrationtest + containermanager/it.implementation + commons/integrationtest + + commons/httpclient + + + + docs + + false + + + northbound/java-client + northbound/swagger-ui + + + + diff --git a/opendaylight/protocol_plugins/openflow/pom.xml b/opendaylight/adsal/protocol_plugins/openflow/pom.xml similarity index 98% rename from opendaylight/protocol_plugins/openflow/pom.xml rename to opendaylight/adsal/protocol_plugins/openflow/pom.xml index 16fadee1cc..7cb7602d4f 100644 --- a/opendaylight/protocol_plugins/openflow/pom.xml +++ b/opendaylight/adsal/protocol_plugins/openflow/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight protocol_plugins.openflow diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IDataPacketListen.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IDataPacketListen.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IDataPacketListen.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IDataPacketListen.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IDataPacketMux.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IDataPacketMux.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IDataPacketMux.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IDataPacketMux.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IDiscoveryListener.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IDiscoveryListener.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IDiscoveryListener.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IDiscoveryListener.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IFlowProgrammerNotifier.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IFlowProgrammerNotifier.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IFlowProgrammerNotifier.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IFlowProgrammerNotifier.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IInventoryProvider.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IInventoryProvider.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IInventoryProvider.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IInventoryProvider.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IInventoryShimExternalListener.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IInventoryShimExternalListener.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IInventoryShimExternalListener.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IInventoryShimExternalListener.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IInventoryShimInternalListener.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IInventoryShimInternalListener.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IInventoryShimInternalListener.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IInventoryShimInternalListener.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IOFStatisticsListener.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IOFStatisticsListener.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IOFStatisticsListener.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IOFStatisticsListener.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IOFStatisticsManager.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IOFStatisticsManager.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IOFStatisticsManager.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IOFStatisticsManager.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IReadFilterInternalListener.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IReadFilterInternalListener.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IReadFilterInternalListener.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IReadFilterInternalListener.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IReadServiceFilter.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IReadServiceFilter.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IReadServiceFilter.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IReadServiceFilter.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IRefreshInternalProvider.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IRefreshInternalProvider.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IRefreshInternalProvider.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IRefreshInternalProvider.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/ITopologyServiceShimListener.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/ITopologyServiceShimListener.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/ITopologyServiceShimListener.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/ITopologyServiceShimListener.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/IController.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/IController.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/IController.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/IController.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/IMessageListener.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/IMessageListener.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/IMessageListener.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/IMessageListener.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/IMessageReadWrite.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/IMessageReadWrite.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/IMessageReadWrite.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/IMessageReadWrite.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/ISwitch.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/ISwitch.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/ISwitch.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/ISwitch.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/ISwitchStateListener.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/ISwitchStateListener.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/ISwitchStateListener.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/ISwitchStateListener.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/Controller.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/Controller.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/Controller.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/Controller.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/ControllerIO.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/ControllerIO.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/ControllerIO.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/ControllerIO.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/MessageReadWriteService.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/MessageReadWriteService.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/MessageReadWriteService.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/MessageReadWriteService.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/PriorityMessage.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/PriorityMessage.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/PriorityMessage.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/PriorityMessage.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SecureMessageReadWriteService.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SecureMessageReadWriteService.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SecureMessageReadWriteService.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SecureMessageReadWriteService.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/StatisticsCollector.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/StatisticsCollector.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/StatisticsCollector.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/StatisticsCollector.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SwitchEvent.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SwitchEvent.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SwitchEvent.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SwitchEvent.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SwitchHandler.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SwitchHandler.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SwitchHandler.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SwitchHandler.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SynchronousMessage.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SynchronousMessage.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SynchronousMessage.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SynchronousMessage.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/Activator.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/Activator.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/Activator.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/Activator.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DataPacketMuxDemux.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DataPacketMuxDemux.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DataPacketMuxDemux.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DataPacketMuxDemux.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DataPacketServices.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DataPacketServices.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DataPacketServices.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DataPacketServices.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DescStatisticsConverter.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DescStatisticsConverter.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DescStatisticsConverter.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DescStatisticsConverter.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowConverter.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowConverter.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowConverter.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowConverter.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowProgrammerNotifier.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowProgrammerNotifier.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowProgrammerNotifier.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowProgrammerNotifier.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowProgrammerService.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowProgrammerService.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowProgrammerService.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowProgrammerService.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowStatisticsConverter.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowStatisticsConverter.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowStatisticsConverter.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowStatisticsConverter.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/InventoryService.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/InventoryService.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/InventoryService.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/InventoryService.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/InventoryServiceHelper.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/InventoryServiceHelper.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/InventoryServiceHelper.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/InventoryServiceHelper.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/InventoryServiceShim.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/InventoryServiceShim.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/InventoryServiceShim.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/InventoryServiceShim.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/OFStatisticsManager.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/OFStatisticsManager.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/OFStatisticsManager.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/OFStatisticsManager.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/PortConverter.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/PortConverter.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/PortConverter.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/PortConverter.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/PortStatisticsConverter.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/PortStatisticsConverter.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/PortStatisticsConverter.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/PortStatisticsConverter.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/ReadService.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/ReadService.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/ReadService.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/ReadService.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/ReadServiceFilter.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/ReadServiceFilter.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/ReadServiceFilter.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/ReadServiceFilter.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TableConverter.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TableConverter.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TableConverter.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TableConverter.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TableStatisticsConverter.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TableStatisticsConverter.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TableStatisticsConverter.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TableStatisticsConverter.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServiceShim.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServiceShim.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServiceShim.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServiceShim.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServices.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServices.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServices.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServices.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/Utils.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/Utils.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/Utils.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/Utils.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6Error.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6Error.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6Error.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6Error.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6FlowMod.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6FlowMod.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6FlowMod.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6FlowMod.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6Match.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6Match.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6Match.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6Match.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsReply.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsReply.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsReply.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsReply.java diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsRequest.java b/opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsRequest.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsRequest.java rename to opendaylight/adsal/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsRequest.java diff --git a/opendaylight/protocol_plugins/openflow/src/test/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowProgrammerServiceTest.java b/opendaylight/adsal/protocol_plugins/openflow/src/test/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowProgrammerServiceTest.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/test/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowProgrammerServiceTest.java rename to opendaylight/adsal/protocol_plugins/openflow/src/test/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowProgrammerServiceTest.java diff --git a/opendaylight/protocol_plugins/openflow/src/test/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6ExtensionTest.java b/opendaylight/adsal/protocol_plugins/openflow/src/test/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6ExtensionTest.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/test/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6ExtensionTest.java rename to opendaylight/adsal/protocol_plugins/openflow/src/test/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6ExtensionTest.java diff --git a/opendaylight/protocol_plugins/openflow/src/test/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6MatchTest.java b/opendaylight/adsal/protocol_plugins/openflow/src/test/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6MatchTest.java similarity index 100% rename from opendaylight/protocol_plugins/openflow/src/test/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6MatchTest.java rename to opendaylight/adsal/protocol_plugins/openflow/src/test/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6MatchTest.java diff --git a/opendaylight/protocol_plugins/stub/pom.xml b/opendaylight/adsal/protocol_plugins/stub/pom.xml similarity index 97% rename from opendaylight/protocol_plugins/stub/pom.xml rename to opendaylight/adsal/protocol_plugins/stub/pom.xml index 4c7b8965fb..1fb84a51ed 100644 --- a/opendaylight/protocol_plugins/stub/pom.xml +++ b/opendaylight/adsal/protocol_plugins/stub/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight protocol_plugins.stub diff --git a/opendaylight/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/Activator.java b/opendaylight/adsal/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/Activator.java similarity index 100% rename from opendaylight/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/Activator.java rename to opendaylight/adsal/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/Activator.java diff --git a/opendaylight/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/FlowProgrammerService.java b/opendaylight/adsal/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/FlowProgrammerService.java similarity index 100% rename from opendaylight/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/FlowProgrammerService.java rename to opendaylight/adsal/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/FlowProgrammerService.java diff --git a/opendaylight/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/InventoryService.java b/opendaylight/adsal/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/InventoryService.java similarity index 100% rename from opendaylight/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/InventoryService.java rename to opendaylight/adsal/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/InventoryService.java diff --git a/opendaylight/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/ReadService.java b/opendaylight/adsal/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/ReadService.java similarity index 100% rename from opendaylight/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/ReadService.java rename to opendaylight/adsal/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/ReadService.java diff --git a/opendaylight/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/StubNodeConnectorFactory.java b/opendaylight/adsal/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/StubNodeConnectorFactory.java similarity index 100% rename from opendaylight/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/StubNodeConnectorFactory.java rename to opendaylight/adsal/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/StubNodeConnectorFactory.java diff --git a/opendaylight/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/StubNodeFactory.java b/opendaylight/adsal/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/StubNodeFactory.java similarity index 100% rename from opendaylight/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/StubNodeFactory.java rename to opendaylight/adsal/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/StubNodeFactory.java diff --git a/opendaylight/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/TopologyServices.java b/opendaylight/adsal/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/TopologyServices.java similarity index 100% rename from opendaylight/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/TopologyServices.java rename to opendaylight/adsal/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/TopologyServices.java diff --git a/opendaylight/routing/dijkstra_implementation/pom.xml b/opendaylight/adsal/routing/dijkstra_implementation/pom.xml similarity index 98% rename from opendaylight/routing/dijkstra_implementation/pom.xml rename to opendaylight/adsal/routing/dijkstra_implementation/pom.xml index b1b68b8cb7..7f429ff967 100644 --- a/opendaylight/routing/dijkstra_implementation/pom.xml +++ b/opendaylight/adsal/routing/dijkstra_implementation/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight routing.dijkstra_implementation diff --git a/opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/Activator.java b/opendaylight/adsal/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/Activator.java similarity index 100% rename from opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/Activator.java rename to opendaylight/adsal/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/Activator.java diff --git a/opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/DijkstraImplementation.java b/opendaylight/adsal/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/DijkstraImplementation.java similarity index 100% rename from opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/DijkstraImplementation.java rename to opendaylight/adsal/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/DijkstraImplementation.java diff --git a/opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/DijkstraImplementationCLI.java b/opendaylight/adsal/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/DijkstraImplementationCLI.java similarity index 100% rename from opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/DijkstraImplementationCLI.java rename to opendaylight/adsal/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/DijkstraImplementationCLI.java diff --git a/opendaylight/routing/dijkstra_implementation/src/test/java/org/opendaylight/controller/routing/dijkstra_implementation/DijkstraTest.java b/opendaylight/adsal/routing/dijkstra_implementation/src/test/java/org/opendaylight/controller/routing/dijkstra_implementation/DijkstraTest.java similarity index 100% rename from opendaylight/routing/dijkstra_implementation/src/test/java/org/opendaylight/controller/routing/dijkstra_implementation/DijkstraTest.java rename to opendaylight/adsal/routing/dijkstra_implementation/src/test/java/org/opendaylight/controller/routing/dijkstra_implementation/DijkstraTest.java diff --git a/opendaylight/routing/dijkstra_implementation/src/test/java/org/opendaylight/controller/routing/dijkstra_implementation/MaxThruputTest.java b/opendaylight/adsal/routing/dijkstra_implementation/src/test/java/org/opendaylight/controller/routing/dijkstra_implementation/MaxThruputTest.java similarity index 100% rename from opendaylight/routing/dijkstra_implementation/src/test/java/org/opendaylight/controller/routing/dijkstra_implementation/MaxThruputTest.java rename to opendaylight/adsal/routing/dijkstra_implementation/src/test/java/org/opendaylight/controller/routing/dijkstra_implementation/MaxThruputTest.java diff --git a/opendaylight/sal/api/pom.xml b/opendaylight/adsal/sal/api/pom.xml similarity index 97% rename from opendaylight/sal/api/pom.xml rename to opendaylight/adsal/sal/api/pom.xml index 50ac61fccb..d5d6256bc9 100644 --- a/opendaylight/sal/api/pom.xml +++ b/opendaylight/adsal/sal/api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight sal diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/Action.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/Action.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/Action.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/Action.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/ActionType.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/ActionType.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/ActionType.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/ActionType.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/Controller.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/Controller.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/Controller.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/Controller.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/Drop.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/Drop.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/Drop.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/Drop.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/Enqueue.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/Enqueue.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/Enqueue.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/Enqueue.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/Flood.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/Flood.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/Flood.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/Flood.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/FloodAll.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/FloodAll.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/FloodAll.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/FloodAll.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/HwPath.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/HwPath.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/HwPath.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/HwPath.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/Loopback.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/Loopback.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/Loopback.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/Loopback.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/Output.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/Output.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/Output.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/Output.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/PopVlan.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/PopVlan.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/PopVlan.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/PopVlan.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/PushVlan.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/PushVlan.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/PushVlan.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/PushVlan.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetDlDst.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetDlDst.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetDlDst.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetDlDst.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetDlSrc.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetDlSrc.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetDlSrc.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetDlSrc.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetDlType.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetDlType.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetDlType.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetDlType.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetNextHop.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetNextHop.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetNextHop.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetNextHop.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetNwDst.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetNwDst.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetNwDst.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetNwDst.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetNwSrc.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetNwSrc.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetNwSrc.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetNwSrc.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetNwTos.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetNwTos.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetNwTos.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetNwTos.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetTpDst.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetTpDst.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetTpDst.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetTpDst.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetTpSrc.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetTpSrc.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetTpSrc.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetTpSrc.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetVlanCfi.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetVlanCfi.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetVlanCfi.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetVlanCfi.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetVlanId.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetVlanId.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetVlanId.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetVlanId.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetVlanPcp.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetVlanPcp.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetVlanPcp.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetVlanPcp.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SupportedFlowActions.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SupportedFlowActions.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SupportedFlowActions.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SupportedFlowActions.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SwPath.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SwPath.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SwPath.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/action/SwPath.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/AppRole.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/AppRole.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/AppRole.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/AppRole.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/AppRoleLevel.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/AppRoleLevel.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/AppRoleLevel.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/AppRoleLevel.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/AuthResultEnum.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/AuthResultEnum.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/AuthResultEnum.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/AuthResultEnum.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/IResourceAuthorization.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/IResourceAuthorization.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/IResourceAuthorization.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/IResourceAuthorization.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/Privilege.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/Privilege.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/Privilege.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/Privilege.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/Resource.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/Resource.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/Resource.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/Resource.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/ResourceGroup.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/ResourceGroup.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/ResourceGroup.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/ResourceGroup.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/UserLevel.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/UserLevel.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/UserLevel.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/authorization/UserLevel.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Actions.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Actions.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Actions.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Actions.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/AdvertisedBandwidth.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/AdvertisedBandwidth.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/AdvertisedBandwidth.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/AdvertisedBandwidth.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Bandwidth.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Bandwidth.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Bandwidth.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Bandwidth.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Buffers.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Buffers.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Buffers.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Buffers.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Capabilities.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Capabilities.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Capabilities.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Capabilities.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/ComponentActivatorAbstractBase.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/ComponentActivatorAbstractBase.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/ComponentActivatorAbstractBase.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/ComponentActivatorAbstractBase.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Config.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Config.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Config.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Config.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/ConstructionException.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/ConstructionException.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/ConstructionException.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/ConstructionException.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/ContainerFlow.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/ContainerFlow.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/ContainerFlow.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/ContainerFlow.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/ContainerServiceDependency.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/ContainerServiceDependency.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/ContainerServiceDependency.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/ContainerServiceDependency.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Description.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Description.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Description.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Description.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Edge.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Edge.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Edge.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Edge.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/ForwardingMode.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/ForwardingMode.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/ForwardingMode.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/ForwardingMode.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Host.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Host.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Host.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Host.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/IContainer.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/IContainer.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/IContainer.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/IContainer.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/IContainerAware.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/IContainerAware.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/IContainerAware.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/IContainerAware.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/IContainerListener.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/IContainerListener.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/IContainerListener.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/IContainerListener.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/IContainerLocalListener.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/IContainerLocalListener.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/IContainerLocalListener.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/IContainerLocalListener.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Latency.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Latency.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Latency.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Latency.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/MacAddress.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/MacAddress.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/MacAddress.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/MacAddress.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Name.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Name.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Name.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Name.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Node.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Node.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Node.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Node.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/NodeConnector.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/NodeConnector.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/NodeConnector.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/NodeConnector.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/NodeTable.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/NodeTable.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/NodeTable.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/NodeTable.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Path.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Path.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Path.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Path.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/PeerBandwidth.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/PeerBandwidth.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/PeerBandwidth.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/PeerBandwidth.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Property.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Property.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Property.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Property.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/State.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/State.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/State.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/State.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/SupportedBandwidth.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/SupportedBandwidth.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/SupportedBandwidth.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/SupportedBandwidth.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Tables.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Tables.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Tables.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Tables.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Tier.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Tier.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Tier.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/Tier.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/TimeStamp.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/TimeStamp.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/TimeStamp.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/TimeStamp.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/UpdateType.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/UpdateType.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/UpdateType.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/core/UpdateType.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/discovery/IDiscoveryService.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/discovery/IDiscoveryService.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/discovery/IDiscoveryService.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/discovery/IDiscoveryService.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/flowprogrammer/Flow.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/flowprogrammer/Flow.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/flowprogrammer/Flow.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/flowprogrammer/Flow.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/flowprogrammer/IFlowProgrammerListener.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/flowprogrammer/IFlowProgrammerListener.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/flowprogrammer/IFlowProgrammerListener.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/flowprogrammer/IFlowProgrammerListener.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/flowprogrammer/IFlowProgrammerService.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/flowprogrammer/IFlowProgrammerService.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/flowprogrammer/IFlowProgrammerService.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/flowprogrammer/IFlowProgrammerService.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/flowprogrammer/IPluginInFlowProgrammerService.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/flowprogrammer/IPluginInFlowProgrammerService.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/flowprogrammer/IPluginInFlowProgrammerService.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/flowprogrammer/IPluginInFlowProgrammerService.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/flowprogrammer/IPluginOutFlowProgrammerService.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/flowprogrammer/IPluginOutFlowProgrammerService.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/flowprogrammer/IPluginOutFlowProgrammerService.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/flowprogrammer/IPluginOutFlowProgrammerService.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/inventory/IInventoryService.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/inventory/IInventoryService.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/inventory/IInventoryService.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/inventory/IInventoryService.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/inventory/IListenInventoryUpdates.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/inventory/IListenInventoryUpdates.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/inventory/IListenInventoryUpdates.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/inventory/IListenInventoryUpdates.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/inventory/IPluginInInventoryService.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/inventory/IPluginInInventoryService.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/inventory/IPluginInInventoryService.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/inventory/IPluginInInventoryService.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/inventory/IPluginOutInventoryService.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/inventory/IPluginOutInventoryService.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/inventory/IPluginOutInventoryService.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/inventory/IPluginOutInventoryService.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/Match.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/Match.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/Match.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/Match.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/MatchField.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/MatchField.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/MatchField.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/MatchField.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/MatchType.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/MatchType.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/MatchType.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/MatchType.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/DlDst.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/DlDst.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/DlDst.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/DlDst.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/DlSrc.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/DlSrc.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/DlSrc.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/DlSrc.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/DlType.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/DlType.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/DlType.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/DlType.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/DlVlan.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/DlVlan.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/DlVlan.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/DlVlan.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/DlVlanPriority.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/DlVlanPriority.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/DlVlanPriority.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/DlVlanPriority.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/InPort.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/InPort.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/InPort.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/InPort.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/Match.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/Match.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/Match.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/Match.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/MatchField.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/MatchField.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/MatchField.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/MatchField.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/NwDst.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/NwDst.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/NwDst.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/NwDst.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/NwProtocol.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/NwProtocol.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/NwProtocol.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/NwProtocol.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/NwSrc.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/NwSrc.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/NwSrc.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/NwSrc.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/NwTos.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/NwTos.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/NwTos.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/NwTos.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/TpDst.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/TpDst.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/TpDst.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/TpDst.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/TpSrc.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/TpSrc.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/TpSrc.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/match/extensible/TpSrc.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/ARP.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/ARP.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/ARP.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/ARP.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/BitBufferHelper.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/BitBufferHelper.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/BitBufferHelper.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/BitBufferHelper.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/BufferException.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/BufferException.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/BufferException.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/BufferException.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/Ethernet.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/Ethernet.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/Ethernet.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/Ethernet.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/ICMP.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/ICMP.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/ICMP.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/ICMP.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IDataPacketService.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IDataPacketService.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IDataPacketService.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IDataPacketService.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IEEE8021Q.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IEEE8021Q.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IEEE8021Q.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IEEE8021Q.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IListenDataPacket.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IListenDataPacket.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IListenDataPacket.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IListenDataPacket.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IPluginInDataPacketService.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IPluginInDataPacketService.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IPluginInDataPacketService.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IPluginInDataPacketService.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IPluginOutDataPacketService.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IPluginOutDataPacketService.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IPluginOutDataPacketService.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IPluginOutDataPacketService.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IPv4.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IPv4.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IPv4.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IPv4.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/LLDP.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/LLDP.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/LLDP.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/LLDP.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/LLDPTLV.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/LLDPTLV.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/LLDPTLV.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/LLDPTLV.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/LinkEncap.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/LinkEncap.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/LinkEncap.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/LinkEncap.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/Packet.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/Packet.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/Packet.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/Packet.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/PacketException.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/PacketException.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/PacketException.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/PacketException.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/PacketResult.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/PacketResult.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/PacketResult.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/PacketResult.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/RawPacket.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/RawPacket.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/RawPacket.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/RawPacket.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/TCP.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/TCP.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/TCP.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/TCP.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/UDP.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/UDP.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/UDP.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/UDP.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/address/DataLinkAddress.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/address/DataLinkAddress.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/address/DataLinkAddress.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/address/DataLinkAddress.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/address/EthernetAddress.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/address/EthernetAddress.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/address/EthernetAddress.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/packet/address/EthernetAddress.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/reader/FlowOnNode.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/reader/FlowOnNode.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/reader/FlowOnNode.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/reader/FlowOnNode.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/reader/IPluginInReadService.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/reader/IPluginInReadService.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/reader/IPluginInReadService.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/reader/IPluginInReadService.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/reader/IPluginOutReadService.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/reader/IPluginOutReadService.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/reader/IPluginOutReadService.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/reader/IPluginOutReadService.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/reader/IReadService.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/reader/IReadService.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/reader/IReadService.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/reader/IReadService.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/reader/IReadServiceListener.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/reader/IReadServiceListener.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/reader/IReadServiceListener.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/reader/IReadServiceListener.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/reader/NodeConnectorStatistics.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/reader/NodeConnectorStatistics.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/reader/NodeConnectorStatistics.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/reader/NodeConnectorStatistics.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/reader/NodeDescription.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/reader/NodeDescription.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/reader/NodeDescription.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/reader/NodeDescription.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/reader/NodeTableStatistics.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/reader/NodeTableStatistics.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/reader/NodeTableStatistics.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/reader/NodeTableStatistics.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/routing/IListenRoutingUpdates.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/routing/IListenRoutingUpdates.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/routing/IListenRoutingUpdates.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/routing/IListenRoutingUpdates.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/routing/IRouting.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/routing/IRouting.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/routing/IRouting.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/routing/IRouting.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/topology/IListenTopoUpdates.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/topology/IListenTopoUpdates.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/topology/IListenTopoUpdates.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/topology/IListenTopoUpdates.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/topology/IPluginInTopologyService.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/topology/IPluginInTopologyService.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/topology/IPluginInTopologyService.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/topology/IPluginInTopologyService.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/topology/IPluginOutTopologyService.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/topology/IPluginOutTopologyService.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/topology/IPluginOutTopologyService.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/topology/IPluginOutTopologyService.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/topology/ITopologyService.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/topology/ITopologyService.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/topology/ITopologyService.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/topology/ITopologyService.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/topology/TopoEdgeUpdate.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/topology/TopoEdgeUpdate.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/topology/TopoEdgeUpdate.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/topology/TopoEdgeUpdate.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ConfigurationObject.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ConfigurationObject.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ConfigurationObject.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ConfigurationObject.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/Direction.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/Direction.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/Direction.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/Direction.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/EtherTypes.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/EtherTypes.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/EtherTypes.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/EtherTypes.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/FilterIterator.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/FilterIterator.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/FilterIterator.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/FilterIterator.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/GUIField.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/GUIField.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/GUIField.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/GUIField.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/GlobalConstants.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/GlobalConstants.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/GlobalConstants.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/GlobalConstants.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/HexEncode.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/HexEncode.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/HexEncode.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/HexEncode.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/IListener.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/IListener.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/IListener.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/IListener.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/INodeConnectorFactory.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/INodeConnectorFactory.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/INodeConnectorFactory.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/INodeConnectorFactory.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/INodeFactory.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/INodeFactory.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/INodeFactory.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/INodeFactory.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/IObjectReader.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/IObjectReader.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/IObjectReader.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/IObjectReader.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/IPProtocols.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/IPProtocols.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/IPProtocols.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/IPProtocols.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/IterableIterator.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/IterableIterator.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/IterableIterator.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/IterableIterator.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ListenerDispatcher.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ListenerDispatcher.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ListenerDispatcher.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ListenerDispatcher.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/MultiIterator.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/MultiIterator.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/MultiIterator.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/MultiIterator.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/NetUtils.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/NetUtils.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/NetUtils.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/NetUtils.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/NodeConnectorCreator.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/NodeConnectorCreator.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/NodeConnectorCreator.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/NodeConnectorCreator.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/NodeCreator.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/NodeCreator.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/NodeCreator.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/NodeCreator.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/NodeTableCreator.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/NodeTableCreator.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/NodeTableCreator.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/NodeTableCreator.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ObjectReader.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ObjectReader.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ObjectReader.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ObjectReader.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ObjectWriter.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ObjectWriter.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ObjectWriter.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ObjectWriter.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ReadFromFile.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ReadFromFile.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ReadFromFile.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ReadFromFile.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ServiceHelper.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ServiceHelper.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ServiceHelper.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ServiceHelper.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/SingletonTask.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/SingletonTask.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/SingletonTask.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/SingletonTask.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/Status.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/Status.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/Status.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/Status.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/StatusCode.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/StatusCode.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/StatusCode.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/StatusCode.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/TierHelper.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/TierHelper.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/TierHelper.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/TierHelper.java diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/WriteToFile.java b/opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/WriteToFile.java similarity index 100% rename from opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/WriteToFile.java rename to opendaylight/adsal/sal/api/src/main/java/org/opendaylight/controller/sal/utils/WriteToFile.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/action/ActionTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/action/ActionTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/action/ActionTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/action/ActionTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/authorization/AuthorizationTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/authorization/AuthorizationTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/authorization/AuthorizationTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/authorization/AuthorizationTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/core/EdgeTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/core/EdgeTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/core/EdgeTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/core/EdgeTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/core/NodeConnectorTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/core/NodeConnectorTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/core/NodeConnectorTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/core/NodeConnectorTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/core/NodeTableTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/core/NodeTableTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/core/NodeTableTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/core/NodeTableTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/core/NodeTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/core/NodeTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/core/NodeTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/core/NodeTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/core/PathTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/core/PathTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/core/PathTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/core/PathTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/core/PropertyTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/core/PropertyTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/core/PropertyTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/core/PropertyTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/flowprogrammer/FlowTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/flowprogrammer/FlowTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/flowprogrammer/FlowTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/flowprogrammer/FlowTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/match/MatchExtensibleTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/match/MatchExtensibleTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/match/MatchExtensibleTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/match/MatchExtensibleTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/match/MatchTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/match/MatchTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/match/MatchTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/match/MatchTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/packet/ARPTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/ARPTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/packet/ARPTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/ARPTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/packet/BitBufferHelperTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/BitBufferHelperTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/packet/BitBufferHelperTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/BitBufferHelperTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/packet/EthernetTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/EthernetTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/packet/EthernetTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/EthernetTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/packet/ICMPTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/ICMPTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/packet/ICMPTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/ICMPTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/packet/IEEE8021QTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/IEEE8021QTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/packet/IEEE8021QTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/IEEE8021QTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/packet/IPv4Test.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/IPv4Test.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/packet/IPv4Test.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/IPv4Test.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/packet/PacketTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/PacketTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/packet/PacketTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/PacketTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/packet/TCPTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/TCPTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/packet/TCPTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/TCPTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/packet/UDPTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/UDPTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/packet/UDPTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/UDPTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/packet/address/EthernetAddressTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/address/EthernetAddressTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/packet/address/EthernetAddressTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/address/EthernetAddressTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/reader/FlowOnNodeTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/reader/FlowOnNodeTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/reader/FlowOnNodeTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/reader/FlowOnNodeTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/reader/NodeConnectorStatisticsTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/reader/NodeConnectorStatisticsTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/reader/NodeConnectorStatisticsTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/reader/NodeConnectorStatisticsTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/reader/NodeDescriptionTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/reader/NodeDescriptionTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/reader/NodeDescriptionTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/reader/NodeDescriptionTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/reader/NodeTableStatisticsTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/reader/NodeTableStatisticsTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/reader/NodeTableStatisticsTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/reader/NodeTableStatisticsTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/utils/EtherTypesTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/utils/EtherTypesTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/utils/EtherTypesTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/utils/EtherTypesTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/utils/HexEncodeTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/utils/HexEncodeTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/utils/HexEncodeTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/utils/HexEncodeTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/utils/IPProtocolsTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/utils/IPProtocolsTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/utils/IPProtocolsTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/utils/IPProtocolsTest.java diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/utils/NetUtilsTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/utils/NetUtilsTest.java similarity index 100% rename from opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/utils/NetUtilsTest.java rename to opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/utils/NetUtilsTest.java diff --git a/opendaylight/sal/connection/api/pom.xml b/opendaylight/adsal/sal/connection/api/pom.xml similarity index 96% rename from opendaylight/sal/connection/api/pom.xml rename to opendaylight/adsal/sal/connection/api/pom.xml index 780631791d..fe07526960 100644 --- a/opendaylight/sal/connection/api/pom.xml +++ b/opendaylight/adsal/sal/connection/api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../../commons/opendaylight + ../../../../commons/opendaylight sal.connection diff --git a/opendaylight/sal/connection/api/src/main/java/org/opendaylight/controller/sal/connection/ConnectionConstants.java b/opendaylight/adsal/sal/connection/api/src/main/java/org/opendaylight/controller/sal/connection/ConnectionConstants.java similarity index 100% rename from opendaylight/sal/connection/api/src/main/java/org/opendaylight/controller/sal/connection/ConnectionConstants.java rename to opendaylight/adsal/sal/connection/api/src/main/java/org/opendaylight/controller/sal/connection/ConnectionConstants.java diff --git a/opendaylight/sal/connection/api/src/main/java/org/opendaylight/controller/sal/connection/ConnectionLocality.java b/opendaylight/adsal/sal/connection/api/src/main/java/org/opendaylight/controller/sal/connection/ConnectionLocality.java similarity index 100% rename from opendaylight/sal/connection/api/src/main/java/org/opendaylight/controller/sal/connection/ConnectionLocality.java rename to opendaylight/adsal/sal/connection/api/src/main/java/org/opendaylight/controller/sal/connection/ConnectionLocality.java diff --git a/opendaylight/sal/connection/api/src/main/java/org/opendaylight/controller/sal/connection/IConnectionListener.java b/opendaylight/adsal/sal/connection/api/src/main/java/org/opendaylight/controller/sal/connection/IConnectionListener.java similarity index 100% rename from opendaylight/sal/connection/api/src/main/java/org/opendaylight/controller/sal/connection/IConnectionListener.java rename to opendaylight/adsal/sal/connection/api/src/main/java/org/opendaylight/controller/sal/connection/IConnectionListener.java diff --git a/opendaylight/sal/connection/api/src/main/java/org/opendaylight/controller/sal/connection/IConnectionService.java b/opendaylight/adsal/sal/connection/api/src/main/java/org/opendaylight/controller/sal/connection/IConnectionService.java similarity index 100% rename from opendaylight/sal/connection/api/src/main/java/org/opendaylight/controller/sal/connection/IConnectionService.java rename to opendaylight/adsal/sal/connection/api/src/main/java/org/opendaylight/controller/sal/connection/IConnectionService.java diff --git a/opendaylight/sal/connection/api/src/main/java/org/opendaylight/controller/sal/connection/IPluginInConnectionService.java b/opendaylight/adsal/sal/connection/api/src/main/java/org/opendaylight/controller/sal/connection/IPluginInConnectionService.java similarity index 100% rename from opendaylight/sal/connection/api/src/main/java/org/opendaylight/controller/sal/connection/IPluginInConnectionService.java rename to opendaylight/adsal/sal/connection/api/src/main/java/org/opendaylight/controller/sal/connection/IPluginInConnectionService.java diff --git a/opendaylight/sal/connection/api/src/main/java/org/opendaylight/controller/sal/connection/IPluginOutConnectionService.java b/opendaylight/adsal/sal/connection/api/src/main/java/org/opendaylight/controller/sal/connection/IPluginOutConnectionService.java similarity index 100% rename from opendaylight/sal/connection/api/src/main/java/org/opendaylight/controller/sal/connection/IPluginOutConnectionService.java rename to opendaylight/adsal/sal/connection/api/src/main/java/org/opendaylight/controller/sal/connection/IPluginOutConnectionService.java diff --git a/opendaylight/sal/connection/implementation/pom.xml b/opendaylight/adsal/sal/connection/implementation/pom.xml similarity index 97% rename from opendaylight/sal/connection/implementation/pom.xml rename to opendaylight/adsal/sal/connection/implementation/pom.xml index a7d5dfafb9..b3c99daee3 100644 --- a/opendaylight/sal/connection/implementation/pom.xml +++ b/opendaylight/adsal/sal/connection/implementation/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../../commons/opendaylight + ../../../../commons/opendaylight sal.connection.implementation diff --git a/opendaylight/sal/connection/implementation/src/main/java/org/opendaylight/controller/sal/connection/implementation/internal/Activator.java b/opendaylight/adsal/sal/connection/implementation/src/main/java/org/opendaylight/controller/sal/connection/implementation/internal/Activator.java similarity index 100% rename from opendaylight/sal/connection/implementation/src/main/java/org/opendaylight/controller/sal/connection/implementation/internal/Activator.java rename to opendaylight/adsal/sal/connection/implementation/src/main/java/org/opendaylight/controller/sal/connection/implementation/internal/Activator.java diff --git a/opendaylight/sal/connection/implementation/src/main/java/org/opendaylight/controller/sal/connection/implementation/internal/ConnectionService.java b/opendaylight/adsal/sal/connection/implementation/src/main/java/org/opendaylight/controller/sal/connection/implementation/internal/ConnectionService.java similarity index 100% rename from opendaylight/sal/connection/implementation/src/main/java/org/opendaylight/controller/sal/connection/implementation/internal/ConnectionService.java rename to opendaylight/adsal/sal/connection/implementation/src/main/java/org/opendaylight/controller/sal/connection/implementation/internal/ConnectionService.java diff --git a/opendaylight/sal/implementation/pom.xml b/opendaylight/adsal/sal/implementation/pom.xml similarity index 97% rename from opendaylight/sal/implementation/pom.xml rename to opendaylight/adsal/sal/implementation/pom.xml index 3f1aa86be8..bce6e3b547 100644 --- a/opendaylight/sal/implementation/pom.xml +++ b/opendaylight/adsal/sal/implementation/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight sal.implementation diff --git a/opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/Activator.java b/opendaylight/adsal/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/Activator.java similarity index 100% rename from opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/Activator.java rename to opendaylight/adsal/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/Activator.java diff --git a/opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/DataPacketService.java b/opendaylight/adsal/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/DataPacketService.java similarity index 100% rename from opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/DataPacketService.java rename to opendaylight/adsal/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/DataPacketService.java diff --git a/opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/FlowProgrammerService.java b/opendaylight/adsal/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/FlowProgrammerService.java similarity index 100% rename from opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/FlowProgrammerService.java rename to opendaylight/adsal/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/FlowProgrammerService.java diff --git a/opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/Inventory.java b/opendaylight/adsal/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/Inventory.java similarity index 100% rename from opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/Inventory.java rename to opendaylight/adsal/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/Inventory.java diff --git a/opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/ProtocolService.java b/opendaylight/adsal/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/ProtocolService.java similarity index 100% rename from opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/ProtocolService.java rename to opendaylight/adsal/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/ProtocolService.java diff --git a/opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/ReadService.java b/opendaylight/adsal/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/ReadService.java similarity index 100% rename from opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/ReadService.java rename to opendaylight/adsal/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/ReadService.java diff --git a/opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/Topology.java b/opendaylight/adsal/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/Topology.java similarity index 100% rename from opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/Topology.java rename to opendaylight/adsal/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/Topology.java diff --git a/opendaylight/sal/implementation/src/test/java/org/opendaylight/controller/sal/implementation/DataPacketServiceTest.java b/opendaylight/adsal/sal/implementation/src/test/java/org/opendaylight/controller/sal/implementation/DataPacketServiceTest.java similarity index 100% rename from opendaylight/sal/implementation/src/test/java/org/opendaylight/controller/sal/implementation/DataPacketServiceTest.java rename to opendaylight/adsal/sal/implementation/src/test/java/org/opendaylight/controller/sal/implementation/DataPacketServiceTest.java diff --git a/opendaylight/sal/implementation/src/test/java/org/opendaylight/controller/sal/implementation/ProtocolServiceTest.java b/opendaylight/adsal/sal/implementation/src/test/java/org/opendaylight/controller/sal/implementation/ProtocolServiceTest.java similarity index 100% rename from opendaylight/sal/implementation/src/test/java/org/opendaylight/controller/sal/implementation/ProtocolServiceTest.java rename to opendaylight/adsal/sal/implementation/src/test/java/org/opendaylight/controller/sal/implementation/ProtocolServiceTest.java diff --git a/opendaylight/sal/networkconfiguration/api/pom.xml b/opendaylight/adsal/sal/networkconfiguration/api/pom.xml similarity index 96% rename from opendaylight/sal/networkconfiguration/api/pom.xml rename to opendaylight/adsal/sal/networkconfiguration/api/pom.xml index 4b18349745..bbeb2969d6 100644 --- a/opendaylight/sal/networkconfiguration/api/pom.xml +++ b/opendaylight/adsal/sal/networkconfiguration/api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../../commons/opendaylight + ../../../../commons/opendaylight sal.networkconfiguration diff --git a/opendaylight/sal/networkconfiguration/api/src/main/java/org/opendaylight/controller/sal/networkconfig/bridgedomain/BridgeDomainConfigServiceException.java b/opendaylight/adsal/sal/networkconfiguration/api/src/main/java/org/opendaylight/controller/sal/networkconfig/bridgedomain/BridgeDomainConfigServiceException.java similarity index 100% rename from opendaylight/sal/networkconfiguration/api/src/main/java/org/opendaylight/controller/sal/networkconfig/bridgedomain/BridgeDomainConfigServiceException.java rename to opendaylight/adsal/sal/networkconfiguration/api/src/main/java/org/opendaylight/controller/sal/networkconfig/bridgedomain/BridgeDomainConfigServiceException.java diff --git a/opendaylight/sal/networkconfiguration/api/src/main/java/org/opendaylight/controller/sal/networkconfig/bridgedomain/ConfigConstants.java b/opendaylight/adsal/sal/networkconfiguration/api/src/main/java/org/opendaylight/controller/sal/networkconfig/bridgedomain/ConfigConstants.java similarity index 100% rename from opendaylight/sal/networkconfiguration/api/src/main/java/org/opendaylight/controller/sal/networkconfig/bridgedomain/ConfigConstants.java rename to opendaylight/adsal/sal/networkconfiguration/api/src/main/java/org/opendaylight/controller/sal/networkconfig/bridgedomain/ConfigConstants.java diff --git a/opendaylight/sal/networkconfiguration/api/src/main/java/org/opendaylight/controller/sal/networkconfig/bridgedomain/IBridgeDomainConfigService.java b/opendaylight/adsal/sal/networkconfiguration/api/src/main/java/org/opendaylight/controller/sal/networkconfig/bridgedomain/IBridgeDomainConfigService.java similarity index 100% rename from opendaylight/sal/networkconfiguration/api/src/main/java/org/opendaylight/controller/sal/networkconfig/bridgedomain/IBridgeDomainConfigService.java rename to opendaylight/adsal/sal/networkconfiguration/api/src/main/java/org/opendaylight/controller/sal/networkconfig/bridgedomain/IBridgeDomainConfigService.java diff --git a/opendaylight/sal/networkconfiguration/api/src/main/java/org/opendaylight/controller/sal/networkconfig/bridgedomain/IPluginInBridgeDomainConfigService.java b/opendaylight/adsal/sal/networkconfiguration/api/src/main/java/org/opendaylight/controller/sal/networkconfig/bridgedomain/IPluginInBridgeDomainConfigService.java similarity index 100% rename from opendaylight/sal/networkconfiguration/api/src/main/java/org/opendaylight/controller/sal/networkconfig/bridgedomain/IPluginInBridgeDomainConfigService.java rename to opendaylight/adsal/sal/networkconfiguration/api/src/main/java/org/opendaylight/controller/sal/networkconfig/bridgedomain/IPluginInBridgeDomainConfigService.java diff --git a/opendaylight/sal/networkconfiguration/implementation/pom.xml b/opendaylight/adsal/sal/networkconfiguration/implementation/pom.xml similarity index 96% rename from opendaylight/sal/networkconfiguration/implementation/pom.xml rename to opendaylight/adsal/sal/networkconfiguration/implementation/pom.xml index bf476a924a..df8c6d2169 100644 --- a/opendaylight/sal/networkconfiguration/implementation/pom.xml +++ b/opendaylight/adsal/sal/networkconfiguration/implementation/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../../commons/opendaylight + ../../../../commons/opendaylight sal.networkconfiguration.implementation diff --git a/opendaylight/sal/networkconfiguration/implementation/src/main/java/org/opendaylight/controller/sal/networkconfig/bridgedomain/internal/BridgeDomainConfigService.java b/opendaylight/adsal/sal/networkconfiguration/implementation/src/main/java/org/opendaylight/controller/sal/networkconfig/bridgedomain/internal/BridgeDomainConfigService.java similarity index 100% rename from opendaylight/sal/networkconfiguration/implementation/src/main/java/org/opendaylight/controller/sal/networkconfig/bridgedomain/internal/BridgeDomainConfigService.java rename to opendaylight/adsal/sal/networkconfiguration/implementation/src/main/java/org/opendaylight/controller/sal/networkconfig/bridgedomain/internal/BridgeDomainConfigService.java diff --git a/opendaylight/sal/networkconfiguration/implementation/src/main/java/org/opendaylight/controller/sal/networkconfig/internal/Activator.java b/opendaylight/adsal/sal/networkconfiguration/implementation/src/main/java/org/opendaylight/controller/sal/networkconfig/internal/Activator.java similarity index 100% rename from opendaylight/sal/networkconfiguration/implementation/src/main/java/org/opendaylight/controller/sal/networkconfig/internal/Activator.java rename to opendaylight/adsal/sal/networkconfiguration/implementation/src/main/java/org/opendaylight/controller/sal/networkconfig/internal/Activator.java diff --git a/opendaylight/samples/clustersession/pom.xml b/opendaylight/adsal/samples/clustersession/pom.xml similarity index 98% rename from opendaylight/samples/clustersession/pom.xml rename to opendaylight/adsal/samples/clustersession/pom.xml index 10ae20ca63..2a5e07af84 100644 --- a/opendaylight/samples/clustersession/pom.xml +++ b/opendaylight/adsal/samples/clustersession/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight org.opendaylight.controller clustersession diff --git a/opendaylight/samples/clustersession/src/main/java/org/opendaylight/controller/clustersession/ClusterSession.java b/opendaylight/adsal/samples/clustersession/src/main/java/org/opendaylight/controller/clustersession/ClusterSession.java similarity index 100% rename from opendaylight/samples/clustersession/src/main/java/org/opendaylight/controller/clustersession/ClusterSession.java rename to opendaylight/adsal/samples/clustersession/src/main/java/org/opendaylight/controller/clustersession/ClusterSession.java diff --git a/opendaylight/samples/clustersession/src/main/java/org/opendaylight/controller/clustersession/ClusterSessionData.java b/opendaylight/adsal/samples/clustersession/src/main/java/org/opendaylight/controller/clustersession/ClusterSessionData.java similarity index 100% rename from opendaylight/samples/clustersession/src/main/java/org/opendaylight/controller/clustersession/ClusterSessionData.java rename to opendaylight/adsal/samples/clustersession/src/main/java/org/opendaylight/controller/clustersession/ClusterSessionData.java diff --git a/opendaylight/samples/clustersession/src/main/java/org/opendaylight/controller/clustersession/ClusterSessionManager.java b/opendaylight/adsal/samples/clustersession/src/main/java/org/opendaylight/controller/clustersession/ClusterSessionManager.java similarity index 100% rename from opendaylight/samples/clustersession/src/main/java/org/opendaylight/controller/clustersession/ClusterSessionManager.java rename to opendaylight/adsal/samples/clustersession/src/main/java/org/opendaylight/controller/clustersession/ClusterSessionManager.java diff --git a/opendaylight/samples/clustersession/src/main/java/org/opendaylight/controller/clustersession/ClusterSessionUtil.java b/opendaylight/adsal/samples/clustersession/src/main/java/org/opendaylight/controller/clustersession/ClusterSessionUtil.java similarity index 100% rename from opendaylight/samples/clustersession/src/main/java/org/opendaylight/controller/clustersession/ClusterSessionUtil.java rename to opendaylight/adsal/samples/clustersession/src/main/java/org/opendaylight/controller/clustersession/ClusterSessionUtil.java diff --git a/opendaylight/samples/clustersession/src/main/java/org/opendaylight/controller/clustersession/impl/ClusterSessionServiceImpl.java b/opendaylight/adsal/samples/clustersession/src/main/java/org/opendaylight/controller/clustersession/impl/ClusterSessionServiceImpl.java similarity index 100% rename from opendaylight/samples/clustersession/src/main/java/org/opendaylight/controller/clustersession/impl/ClusterSessionServiceImpl.java rename to opendaylight/adsal/samples/clustersession/src/main/java/org/opendaylight/controller/clustersession/impl/ClusterSessionServiceImpl.java diff --git a/opendaylight/samples/clustersession/src/main/java/org/opendaylight/controller/clustersession/service/ClusterSessionService.java b/opendaylight/adsal/samples/clustersession/src/main/java/org/opendaylight/controller/clustersession/service/ClusterSessionService.java similarity index 100% rename from opendaylight/samples/clustersession/src/main/java/org/opendaylight/controller/clustersession/service/ClusterSessionService.java rename to opendaylight/adsal/samples/clustersession/src/main/java/org/opendaylight/controller/clustersession/service/ClusterSessionService.java diff --git a/opendaylight/samples/clustersession/src/test/java/org/opendaylight/controller/clustersession/ClusterSessionManagerTest.java b/opendaylight/adsal/samples/clustersession/src/test/java/org/opendaylight/controller/clustersession/ClusterSessionManagerTest.java similarity index 100% rename from opendaylight/samples/clustersession/src/test/java/org/opendaylight/controller/clustersession/ClusterSessionManagerTest.java rename to opendaylight/adsal/samples/clustersession/src/test/java/org/opendaylight/controller/clustersession/ClusterSessionManagerTest.java diff --git a/opendaylight/samples/clustersession/src/test/java/org/opendaylight/controller/clustersession/ClusterSessionServiceImplTest.java b/opendaylight/adsal/samples/clustersession/src/test/java/org/opendaylight/controller/clustersession/ClusterSessionServiceImplTest.java similarity index 100% rename from opendaylight/samples/clustersession/src/test/java/org/opendaylight/controller/clustersession/ClusterSessionServiceImplTest.java rename to opendaylight/adsal/samples/clustersession/src/test/java/org/opendaylight/controller/clustersession/ClusterSessionServiceImplTest.java diff --git a/opendaylight/samples/clustersession/src/test/java/org/opendaylight/controller/clustersession/ClusterSessionUtilTest.java b/opendaylight/adsal/samples/clustersession/src/test/java/org/opendaylight/controller/clustersession/ClusterSessionUtilTest.java similarity index 100% rename from opendaylight/samples/clustersession/src/test/java/org/opendaylight/controller/clustersession/ClusterSessionUtilTest.java rename to opendaylight/adsal/samples/clustersession/src/test/java/org/opendaylight/controller/clustersession/ClusterSessionUtilTest.java diff --git a/opendaylight/samples/loadbalancer/pom.xml b/opendaylight/adsal/samples/loadbalancer/pom.xml similarity index 98% rename from opendaylight/samples/loadbalancer/pom.xml rename to opendaylight/adsal/samples/loadbalancer/pom.xml index a7b41096d7..e1b480771b 100644 --- a/opendaylight/samples/loadbalancer/pom.xml +++ b/opendaylight/adsal/samples/loadbalancer/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight samples.loadbalancer diff --git a/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/ConfigManager.java b/opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/ConfigManager.java similarity index 100% rename from opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/ConfigManager.java rename to opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/ConfigManager.java diff --git a/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/IConfigManager.java b/opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/IConfigManager.java similarity index 100% rename from opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/IConfigManager.java rename to opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/IConfigManager.java diff --git a/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/LBConst.java b/opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/LBConst.java similarity index 100% rename from opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/LBConst.java rename to opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/LBConst.java diff --git a/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/LBUtil.java b/opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/LBUtil.java similarity index 100% rename from opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/LBUtil.java rename to opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/LBUtil.java diff --git a/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/entities/Client.java b/opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/entities/Client.java similarity index 100% rename from opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/entities/Client.java rename to opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/entities/Client.java diff --git a/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/entities/Pool.java b/opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/entities/Pool.java similarity index 100% rename from opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/entities/Pool.java rename to opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/entities/Pool.java diff --git a/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/entities/PoolMember.java b/opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/entities/PoolMember.java similarity index 100% rename from opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/entities/PoolMember.java rename to opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/entities/PoolMember.java diff --git a/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/entities/VIP.java b/opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/entities/VIP.java similarity index 100% rename from opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/entities/VIP.java rename to opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/entities/VIP.java diff --git a/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/internal/Activator.java b/opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/internal/Activator.java similarity index 100% rename from opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/internal/Activator.java rename to opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/internal/Activator.java diff --git a/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/internal/LoadBalancerService.java b/opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/internal/LoadBalancerService.java similarity index 100% rename from opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/internal/LoadBalancerService.java rename to opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/internal/LoadBalancerService.java diff --git a/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/policies/ILoadBalancingPolicy.java b/opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/policies/ILoadBalancingPolicy.java similarity index 100% rename from opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/policies/ILoadBalancingPolicy.java rename to opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/policies/ILoadBalancingPolicy.java diff --git a/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/policies/RandomLBPolicy.java b/opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/policies/RandomLBPolicy.java similarity index 100% rename from opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/policies/RandomLBPolicy.java rename to opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/policies/RandomLBPolicy.java diff --git a/opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/policies/RoundRobinLBPolicy.java b/opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/policies/RoundRobinLBPolicy.java similarity index 100% rename from opendaylight/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/policies/RoundRobinLBPolicy.java rename to opendaylight/adsal/samples/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/policies/RoundRobinLBPolicy.java diff --git a/opendaylight/samples/loadbalancer/src/test/java/org/opendaylight/controller/samples/loadbalancer/internal/LoadBalancerTest.java b/opendaylight/adsal/samples/loadbalancer/src/test/java/org/opendaylight/controller/samples/loadbalancer/internal/LoadBalancerTest.java similarity index 100% rename from opendaylight/samples/loadbalancer/src/test/java/org/opendaylight/controller/samples/loadbalancer/internal/LoadBalancerTest.java rename to opendaylight/adsal/samples/loadbalancer/src/test/java/org/opendaylight/controller/samples/loadbalancer/internal/LoadBalancerTest.java diff --git a/opendaylight/samples/northbound/loadbalancer/enunciate.xml b/opendaylight/adsal/samples/northbound/loadbalancer/enunciate.xml similarity index 100% rename from opendaylight/samples/northbound/loadbalancer/enunciate.xml rename to opendaylight/adsal/samples/northbound/loadbalancer/enunciate.xml diff --git a/opendaylight/samples/northbound/loadbalancer/pom.xml b/opendaylight/adsal/samples/northbound/loadbalancer/pom.xml similarity index 98% rename from opendaylight/samples/northbound/loadbalancer/pom.xml rename to opendaylight/adsal/samples/northbound/loadbalancer/pom.xml index 18aa4e1d62..e63e992b3f 100644 --- a/opendaylight/samples/northbound/loadbalancer/pom.xml +++ b/opendaylight/adsal/samples/northbound/loadbalancer/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../../commons/opendaylight + ../../../../commons/opendaylight samples.loadbalancer.northbound diff --git a/opendaylight/samples/northbound/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/northbound/LoadBalancerNorthbound.java b/opendaylight/adsal/samples/northbound/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/northbound/LoadBalancerNorthbound.java similarity index 100% rename from opendaylight/samples/northbound/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/northbound/LoadBalancerNorthbound.java rename to opendaylight/adsal/samples/northbound/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/northbound/LoadBalancerNorthbound.java diff --git a/opendaylight/samples/northbound/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/northbound/NBConst.java b/opendaylight/adsal/samples/northbound/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/northbound/NBConst.java similarity index 100% rename from opendaylight/samples/northbound/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/northbound/NBConst.java rename to opendaylight/adsal/samples/northbound/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/northbound/NBConst.java diff --git a/opendaylight/samples/northbound/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/northbound/Pools.java b/opendaylight/adsal/samples/northbound/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/northbound/Pools.java similarity index 100% rename from opendaylight/samples/northbound/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/northbound/Pools.java rename to opendaylight/adsal/samples/northbound/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/northbound/Pools.java diff --git a/opendaylight/samples/northbound/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/northbound/VIPs.java b/opendaylight/adsal/samples/northbound/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/northbound/VIPs.java similarity index 100% rename from opendaylight/samples/northbound/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/northbound/VIPs.java rename to opendaylight/adsal/samples/northbound/loadbalancer/src/main/java/org/opendaylight/controller/samples/loadbalancer/northbound/VIPs.java diff --git a/opendaylight/samples/northbound/loadbalancer/src/main/resources/META-INF/spring.factories b/opendaylight/adsal/samples/northbound/loadbalancer/src/main/resources/META-INF/spring.factories similarity index 100% rename from opendaylight/samples/northbound/loadbalancer/src/main/resources/META-INF/spring.factories rename to opendaylight/adsal/samples/northbound/loadbalancer/src/main/resources/META-INF/spring.factories diff --git a/opendaylight/samples/northbound/loadbalancer/src/main/resources/META-INF/spring.handlers b/opendaylight/adsal/samples/northbound/loadbalancer/src/main/resources/META-INF/spring.handlers similarity index 100% rename from opendaylight/samples/northbound/loadbalancer/src/main/resources/META-INF/spring.handlers rename to opendaylight/adsal/samples/northbound/loadbalancer/src/main/resources/META-INF/spring.handlers diff --git a/opendaylight/samples/northbound/loadbalancer/src/main/resources/META-INF/spring.schemas b/opendaylight/adsal/samples/northbound/loadbalancer/src/main/resources/META-INF/spring.schemas similarity index 100% rename from opendaylight/samples/northbound/loadbalancer/src/main/resources/META-INF/spring.schemas rename to opendaylight/adsal/samples/northbound/loadbalancer/src/main/resources/META-INF/spring.schemas diff --git a/opendaylight/samples/northbound/loadbalancer/src/main/resources/META-INF/spring.tooling b/opendaylight/adsal/samples/northbound/loadbalancer/src/main/resources/META-INF/spring.tooling similarity index 100% rename from opendaylight/samples/northbound/loadbalancer/src/main/resources/META-INF/spring.tooling rename to opendaylight/adsal/samples/northbound/loadbalancer/src/main/resources/META-INF/spring.tooling diff --git a/opendaylight/samples/northbound/loadbalancer/src/main/resources/WEB-INF/web.xml b/opendaylight/adsal/samples/northbound/loadbalancer/src/main/resources/WEB-INF/web.xml similarity index 100% rename from opendaylight/samples/northbound/loadbalancer/src/main/resources/WEB-INF/web.xml rename to opendaylight/adsal/samples/northbound/loadbalancer/src/main/resources/WEB-INF/web.xml diff --git a/opendaylight/samples/simpleforwarding/pom.xml b/opendaylight/adsal/samples/simpleforwarding/pom.xml similarity index 98% rename from opendaylight/samples/simpleforwarding/pom.xml rename to opendaylight/adsal/samples/simpleforwarding/pom.xml index 50410f85af..4d7af2b8fd 100644 --- a/opendaylight/samples/simpleforwarding/pom.xml +++ b/opendaylight/adsal/samples/simpleforwarding/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight samples.simpleforwarding diff --git a/opendaylight/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/HostNodePair.java b/opendaylight/adsal/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/HostNodePair.java similarity index 100% rename from opendaylight/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/HostNodePair.java rename to opendaylight/adsal/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/HostNodePair.java diff --git a/opendaylight/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/IBroadcastHandler.java b/opendaylight/adsal/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/IBroadcastHandler.java similarity index 100% rename from opendaylight/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/IBroadcastHandler.java rename to opendaylight/adsal/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/IBroadcastHandler.java diff --git a/opendaylight/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/IBroadcastPortSelector.java b/opendaylight/adsal/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/IBroadcastPortSelector.java similarity index 100% rename from opendaylight/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/IBroadcastPortSelector.java rename to opendaylight/adsal/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/IBroadcastPortSelector.java diff --git a/opendaylight/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/internal/Activator.java b/opendaylight/adsal/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/internal/Activator.java similarity index 100% rename from opendaylight/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/internal/Activator.java rename to opendaylight/adsal/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/internal/Activator.java diff --git a/opendaylight/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/internal/SimpleBroadcastHandlerImpl.java b/opendaylight/adsal/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/internal/SimpleBroadcastHandlerImpl.java similarity index 100% rename from opendaylight/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/internal/SimpleBroadcastHandlerImpl.java rename to opendaylight/adsal/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/internal/SimpleBroadcastHandlerImpl.java diff --git a/opendaylight/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/internal/SimpleForwardingImpl.java b/opendaylight/adsal/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/internal/SimpleForwardingImpl.java similarity index 100% rename from opendaylight/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/internal/SimpleForwardingImpl.java rename to opendaylight/adsal/samples/simpleforwarding/src/main/java/org/opendaylight/controller/samples/simpleforwarding/internal/SimpleForwardingImpl.java diff --git a/opendaylight/samples/simpleforwarding/src/test/java/org/opendaylight/controller/samples/simpleforwarding/internal/HostSwitchTest.java b/opendaylight/adsal/samples/simpleforwarding/src/test/java/org/opendaylight/controller/samples/simpleforwarding/internal/HostSwitchTest.java similarity index 100% rename from opendaylight/samples/simpleforwarding/src/test/java/org/opendaylight/controller/samples/simpleforwarding/internal/HostSwitchTest.java rename to opendaylight/adsal/samples/simpleforwarding/src/test/java/org/opendaylight/controller/samples/simpleforwarding/internal/HostSwitchTest.java diff --git a/opendaylight/security/pom.xml b/opendaylight/adsal/security/pom.xml similarity index 97% rename from opendaylight/security/pom.xml rename to opendaylight/adsal/security/pom.xml index 49889de7f1..436fda24da 100644 --- a/opendaylight/security/pom.xml +++ b/opendaylight/adsal/security/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../commons/opendaylight + ../../commons/opendaylight security diff --git a/opendaylight/security/src/main/java/org/opendaylight/controller/security/ControllerCustomRealm.java b/opendaylight/adsal/security/src/main/java/org/opendaylight/controller/security/ControllerCustomRealm.java similarity index 100% rename from opendaylight/security/src/main/java/org/opendaylight/controller/security/ControllerCustomRealm.java rename to opendaylight/adsal/security/src/main/java/org/opendaylight/controller/security/ControllerCustomRealm.java diff --git a/opendaylight/statisticsmanager/api/pom.xml b/opendaylight/adsal/statisticsmanager/api/pom.xml similarity index 96% rename from opendaylight/statisticsmanager/api/pom.xml rename to opendaylight/adsal/statisticsmanager/api/pom.xml index 23edfa3991..00e23e0f5a 100644 --- a/opendaylight/statisticsmanager/api/pom.xml +++ b/opendaylight/adsal/statisticsmanager/api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight statisticsmanager diff --git a/opendaylight/statisticsmanager/api/src/main/java/org/opendaylight/controller/statisticsmanager/IStatisticsManager.java b/opendaylight/adsal/statisticsmanager/api/src/main/java/org/opendaylight/controller/statisticsmanager/IStatisticsManager.java similarity index 100% rename from opendaylight/statisticsmanager/api/src/main/java/org/opendaylight/controller/statisticsmanager/IStatisticsManager.java rename to opendaylight/adsal/statisticsmanager/api/src/main/java/org/opendaylight/controller/statisticsmanager/IStatisticsManager.java diff --git a/opendaylight/statisticsmanager/implementation/pom.xml b/opendaylight/adsal/statisticsmanager/implementation/pom.xml similarity index 98% rename from opendaylight/statisticsmanager/implementation/pom.xml rename to opendaylight/adsal/statisticsmanager/implementation/pom.xml index 08db43a0f0..aa009fbf23 100644 --- a/opendaylight/statisticsmanager/implementation/pom.xml +++ b/opendaylight/adsal/statisticsmanager/implementation/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight statisticsmanager.implementation diff --git a/opendaylight/statisticsmanager/implementation/src/main/java/org/opendaylight/controller/statisticsmanager/internal/Activator.java b/opendaylight/adsal/statisticsmanager/implementation/src/main/java/org/opendaylight/controller/statisticsmanager/internal/Activator.java similarity index 100% rename from opendaylight/statisticsmanager/implementation/src/main/java/org/opendaylight/controller/statisticsmanager/internal/Activator.java rename to opendaylight/adsal/statisticsmanager/implementation/src/main/java/org/opendaylight/controller/statisticsmanager/internal/Activator.java diff --git a/opendaylight/statisticsmanager/implementation/src/main/java/org/opendaylight/controller/statisticsmanager/internal/StatisticsManager.java b/opendaylight/adsal/statisticsmanager/implementation/src/main/java/org/opendaylight/controller/statisticsmanager/internal/StatisticsManager.java similarity index 100% rename from opendaylight/statisticsmanager/implementation/src/main/java/org/opendaylight/controller/statisticsmanager/internal/StatisticsManager.java rename to opendaylight/adsal/statisticsmanager/implementation/src/main/java/org/opendaylight/controller/statisticsmanager/internal/StatisticsManager.java diff --git a/opendaylight/statisticsmanager/implementation/src/test/java/org/opendaylight/controller/statisticsmanager/internal/StatisticsManagerTest.java b/opendaylight/adsal/statisticsmanager/implementation/src/test/java/org/opendaylight/controller/statisticsmanager/internal/StatisticsManagerTest.java similarity index 100% rename from opendaylight/statisticsmanager/implementation/src/test/java/org/opendaylight/controller/statisticsmanager/internal/StatisticsManagerTest.java rename to opendaylight/adsal/statisticsmanager/implementation/src/test/java/org/opendaylight/controller/statisticsmanager/internal/StatisticsManagerTest.java diff --git a/opendaylight/statisticsmanager/integrationtest/pom.xml b/opendaylight/adsal/statisticsmanager/integrationtest/pom.xml similarity index 95% rename from opendaylight/statisticsmanager/integrationtest/pom.xml rename to opendaylight/adsal/statisticsmanager/integrationtest/pom.xml index 22696b71e6..857921f14b 100644 --- a/opendaylight/statisticsmanager/integrationtest/pom.xml +++ b/opendaylight/adsal/statisticsmanager/integrationtest/pom.xml @@ -11,9 +11,9 @@ statisticsmanager.integrationtest 0.5.0-SNAPSHOT - ../implementation/target/jacoco-it.exec + ../../implementation/target/jacoco-it.exec - ../implementation/target/jacoco.exec + ../../implementation/target/jacoco.exec @@ -141,7 +141,7 @@ org.jacoco jacoco-maven-plugin - ../implementation/target/jacoco-it.exec + ../../implementation/target/jacoco-it.exec org.opendaylight.controller.* diff --git a/opendaylight/statisticsmanager/integrationtest/src/test/java/org/opendaylight/controller/statisticsmanager/internal/StatisticsManagerIT.java b/opendaylight/adsal/statisticsmanager/integrationtest/src/test/java/org/opendaylight/controller/statisticsmanager/internal/StatisticsManagerIT.java similarity index 100% rename from opendaylight/statisticsmanager/integrationtest/src/test/java/org/opendaylight/controller/statisticsmanager/internal/StatisticsManagerIT.java rename to opendaylight/adsal/statisticsmanager/integrationtest/src/test/java/org/opendaylight/controller/statisticsmanager/internal/StatisticsManagerIT.java diff --git a/opendaylight/statisticsmanager/integrationtest/src/test/resources/logback.xml b/opendaylight/adsal/statisticsmanager/integrationtest/src/test/resources/logback.xml similarity index 100% rename from opendaylight/statisticsmanager/integrationtest/src/test/resources/logback.xml rename to opendaylight/adsal/statisticsmanager/integrationtest/src/test/resources/logback.xml diff --git a/opendaylight/switchmanager/api/pom.xml b/opendaylight/adsal/switchmanager/api/pom.xml similarity index 98% rename from opendaylight/switchmanager/api/pom.xml rename to opendaylight/adsal/switchmanager/api/pom.xml index a29341ee6f..3c23e29131 100644 --- a/opendaylight/switchmanager/api/pom.xml +++ b/opendaylight/adsal/switchmanager/api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight switchmanager diff --git a/opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/IInventoryListener.java b/opendaylight/adsal/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/IInventoryListener.java similarity index 100% rename from opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/IInventoryListener.java rename to opendaylight/adsal/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/IInventoryListener.java diff --git a/opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/ISpanAware.java b/opendaylight/adsal/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/ISpanAware.java similarity index 100% rename from opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/ISpanAware.java rename to opendaylight/adsal/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/ISpanAware.java diff --git a/opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/ISwitchManager.java b/opendaylight/adsal/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/ISwitchManager.java similarity index 100% rename from opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/ISwitchManager.java rename to opendaylight/adsal/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/ISwitchManager.java diff --git a/opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/ISwitchManagerAware.java b/opendaylight/adsal/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/ISwitchManagerAware.java similarity index 100% rename from opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/ISwitchManagerAware.java rename to opendaylight/adsal/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/ISwitchManagerAware.java diff --git a/opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/SpanConfig.java b/opendaylight/adsal/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/SpanConfig.java similarity index 100% rename from opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/SpanConfig.java rename to opendaylight/adsal/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/SpanConfig.java diff --git a/opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/Subnet.java b/opendaylight/adsal/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/Subnet.java similarity index 100% rename from opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/Subnet.java rename to opendaylight/adsal/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/Subnet.java diff --git a/opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/SubnetConfig.java b/opendaylight/adsal/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/SubnetConfig.java similarity index 100% rename from opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/SubnetConfig.java rename to opendaylight/adsal/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/SubnetConfig.java diff --git a/opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/Switch.java b/opendaylight/adsal/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/Switch.java similarity index 100% rename from opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/Switch.java rename to opendaylight/adsal/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/Switch.java diff --git a/opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/SwitchConfig.java b/opendaylight/adsal/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/SwitchConfig.java similarity index 100% rename from opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/SwitchConfig.java rename to opendaylight/adsal/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/SwitchConfig.java diff --git a/opendaylight/switchmanager/api/src/test/java/org/opendaylight/controller/switchmanager/SubnetConfigTest.java b/opendaylight/adsal/switchmanager/api/src/test/java/org/opendaylight/controller/switchmanager/SubnetConfigTest.java similarity index 100% rename from opendaylight/switchmanager/api/src/test/java/org/opendaylight/controller/switchmanager/SubnetConfigTest.java rename to opendaylight/adsal/switchmanager/api/src/test/java/org/opendaylight/controller/switchmanager/SubnetConfigTest.java diff --git a/opendaylight/switchmanager/api/src/test/java/org/opendaylight/controller/switchmanager/SubnetTest.java b/opendaylight/adsal/switchmanager/api/src/test/java/org/opendaylight/controller/switchmanager/SubnetTest.java similarity index 100% rename from opendaylight/switchmanager/api/src/test/java/org/opendaylight/controller/switchmanager/SubnetTest.java rename to opendaylight/adsal/switchmanager/api/src/test/java/org/opendaylight/controller/switchmanager/SubnetTest.java diff --git a/opendaylight/switchmanager/api/src/test/java/org/opendaylight/controller/switchmanager/SwitchTest.java b/opendaylight/adsal/switchmanager/api/src/test/java/org/opendaylight/controller/switchmanager/SwitchTest.java similarity index 100% rename from opendaylight/switchmanager/api/src/test/java/org/opendaylight/controller/switchmanager/SwitchTest.java rename to opendaylight/adsal/switchmanager/api/src/test/java/org/opendaylight/controller/switchmanager/SwitchTest.java diff --git a/opendaylight/switchmanager/implementation/pom.xml b/opendaylight/adsal/switchmanager/implementation/pom.xml similarity index 98% rename from opendaylight/switchmanager/implementation/pom.xml rename to opendaylight/adsal/switchmanager/implementation/pom.xml index fe7a0c0bcb..911d5dd71f 100644 --- a/opendaylight/switchmanager/implementation/pom.xml +++ b/opendaylight/adsal/switchmanager/implementation/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight switchmanager.implementation diff --git a/opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/Activator.java b/opendaylight/adsal/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/Activator.java similarity index 100% rename from opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/Activator.java rename to opendaylight/adsal/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/Activator.java diff --git a/opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/ControllerProperties.java b/opendaylight/adsal/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/ControllerProperties.java similarity index 100% rename from opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/ControllerProperties.java rename to opendaylight/adsal/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/ControllerProperties.java diff --git a/opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/IControllerProperties.java b/opendaylight/adsal/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/IControllerProperties.java similarity index 100% rename from opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/IControllerProperties.java rename to opendaylight/adsal/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/IControllerProperties.java diff --git a/opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManager.java b/opendaylight/adsal/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManager.java similarity index 100% rename from opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManager.java rename to opendaylight/adsal/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManager.java diff --git a/opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManagerCLI.java b/opendaylight/adsal/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManagerCLI.java similarity index 100% rename from opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManagerCLI.java rename to opendaylight/adsal/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManagerCLI.java diff --git a/opendaylight/switchmanager/implementation/src/test/java/org/opendaylight/controller/switchmanager/internal/SwitchManagerTest.java b/opendaylight/adsal/switchmanager/implementation/src/test/java/org/opendaylight/controller/switchmanager/internal/SwitchManagerTest.java similarity index 100% rename from opendaylight/switchmanager/implementation/src/test/java/org/opendaylight/controller/switchmanager/internal/SwitchManagerTest.java rename to opendaylight/adsal/switchmanager/implementation/src/test/java/org/opendaylight/controller/switchmanager/internal/SwitchManagerTest.java diff --git a/opendaylight/switchmanager/integrationtest/pom.xml b/opendaylight/adsal/switchmanager/integrationtest/pom.xml similarity index 94% rename from opendaylight/switchmanager/integrationtest/pom.xml rename to opendaylight/adsal/switchmanager/integrationtest/pom.xml index 708ac32763..158cd2ca82 100644 --- a/opendaylight/switchmanager/integrationtest/pom.xml +++ b/opendaylight/adsal/switchmanager/integrationtest/pom.xml @@ -11,9 +11,9 @@ switchmanager.integrationtest 0.5.0-SNAPSHOT - ../implementation/target/jacoco-it.exec + ../../implementation/target/jacoco-it.exec - ../implementation/target/jacoco.exec + ../../implementation/target/jacoco.exec @@ -118,7 +118,7 @@ org.jacoco jacoco-maven-plugin - ../implementation/target/jacoco-it.exec + ../../implementation/target/jacoco-it.exec org.opendaylight.controller.* diff --git a/opendaylight/switchmanager/integrationtest/src/test/java/org/opendaylight/controller/switchmanager/internal/SwitchManagerIT.java b/opendaylight/adsal/switchmanager/integrationtest/src/test/java/org/opendaylight/controller/switchmanager/internal/SwitchManagerIT.java similarity index 100% rename from opendaylight/switchmanager/integrationtest/src/test/java/org/opendaylight/controller/switchmanager/internal/SwitchManagerIT.java rename to opendaylight/adsal/switchmanager/integrationtest/src/test/java/org/opendaylight/controller/switchmanager/internal/SwitchManagerIT.java diff --git a/opendaylight/switchmanager/integrationtest/src/test/resources/logback.xml b/opendaylight/adsal/switchmanager/integrationtest/src/test/resources/logback.xml similarity index 100% rename from opendaylight/switchmanager/integrationtest/src/test/resources/logback.xml rename to opendaylight/adsal/switchmanager/integrationtest/src/test/resources/logback.xml diff --git a/opendaylight/topologymanager/implementation/pom.xml b/opendaylight/adsal/topologymanager/implementation/pom.xml similarity index 97% rename from opendaylight/topologymanager/implementation/pom.xml rename to opendaylight/adsal/topologymanager/implementation/pom.xml index e5616be222..c7a6444e1e 100644 --- a/opendaylight/topologymanager/implementation/pom.xml +++ b/opendaylight/adsal/topologymanager/implementation/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight topologymanager diff --git a/opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/ITopologyManager.java b/opendaylight/adsal/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/ITopologyManager.java similarity index 100% rename from opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/ITopologyManager.java rename to opendaylight/adsal/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/ITopologyManager.java diff --git a/opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/ITopologyManagerAware.java b/opendaylight/adsal/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/ITopologyManagerAware.java similarity index 100% rename from opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/ITopologyManagerAware.java rename to opendaylight/adsal/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/ITopologyManagerAware.java diff --git a/opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/ITopologyManagerClusterWideAware.java b/opendaylight/adsal/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/ITopologyManagerClusterWideAware.java similarity index 100% rename from opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/ITopologyManagerClusterWideAware.java rename to opendaylight/adsal/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/ITopologyManagerClusterWideAware.java diff --git a/opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/ITopologyManagerShell.java b/opendaylight/adsal/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/ITopologyManagerShell.java similarity index 100% rename from opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/ITopologyManagerShell.java rename to opendaylight/adsal/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/ITopologyManagerShell.java diff --git a/opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/TopologyUserLinkConfig.java b/opendaylight/adsal/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/TopologyUserLinkConfig.java similarity index 100% rename from opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/TopologyUserLinkConfig.java rename to opendaylight/adsal/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/TopologyUserLinkConfig.java diff --git a/opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/internal/Activator.java b/opendaylight/adsal/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/internal/Activator.java similarity index 100% rename from opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/internal/Activator.java rename to opendaylight/adsal/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/internal/Activator.java diff --git a/opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/internal/TopologyManagerImpl.java b/opendaylight/adsal/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/internal/TopologyManagerImpl.java similarity index 100% rename from opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/internal/TopologyManagerImpl.java rename to opendaylight/adsal/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/internal/TopologyManagerImpl.java diff --git a/opendaylight/topologymanager/implementation/src/test/java/org/opendaylight/controller/topologymanager/internal/TopologyManagerImplTest.java b/opendaylight/adsal/topologymanager/implementation/src/test/java/org/opendaylight/controller/topologymanager/internal/TopologyManagerImplTest.java similarity index 100% rename from opendaylight/topologymanager/implementation/src/test/java/org/opendaylight/controller/topologymanager/internal/TopologyManagerImplTest.java rename to opendaylight/adsal/topologymanager/implementation/src/test/java/org/opendaylight/controller/topologymanager/internal/TopologyManagerImplTest.java diff --git a/opendaylight/topologymanager/integrationtest/pom.xml b/opendaylight/adsal/topologymanager/integrationtest/pom.xml similarity index 93% rename from opendaylight/topologymanager/integrationtest/pom.xml rename to opendaylight/adsal/topologymanager/integrationtest/pom.xml index ce6422c8c1..028e775ee0 100644 --- a/opendaylight/topologymanager/integrationtest/pom.xml +++ b/opendaylight/adsal/topologymanager/integrationtest/pom.xml @@ -11,9 +11,9 @@ topologymanager.integrationtest 0.5.0-SNAPSHOT - ../implementaiton/target/jacoco-it.exec + ../../implementaiton/target/jacoco-it.exec - ../implementation/target/jacoco.exec + ../../implementation/target/jacoco.exec @@ -92,7 +92,7 @@ org.jacoco jacoco-maven-plugin - ../implementation/target/jacoco-it.exec + ../../implementation/target/jacoco-it.exec org.opendaylight.controller.* diff --git a/opendaylight/topologymanager/integrationtest/src/test/java/org/opendaylight/controller/topologymanager/TopologyManagerIT.java b/opendaylight/adsal/topologymanager/integrationtest/src/test/java/org/opendaylight/controller/topologymanager/TopologyManagerIT.java similarity index 100% rename from opendaylight/topologymanager/integrationtest/src/test/java/org/opendaylight/controller/topologymanager/TopologyManagerIT.java rename to opendaylight/adsal/topologymanager/integrationtest/src/test/java/org/opendaylight/controller/topologymanager/TopologyManagerIT.java diff --git a/opendaylight/topologymanager/integrationtest/src/test/resources/logback.xml b/opendaylight/adsal/topologymanager/integrationtest/src/test/resources/logback.xml similarity index 100% rename from opendaylight/topologymanager/integrationtest/src/test/resources/logback.xml rename to opendaylight/adsal/topologymanager/integrationtest/src/test/resources/logback.xml diff --git a/opendaylight/topologymanager/shell/pom.xml b/opendaylight/adsal/topologymanager/shell/pom.xml similarity index 96% rename from opendaylight/topologymanager/shell/pom.xml rename to opendaylight/adsal/topologymanager/shell/pom.xml index 4aa3e2791f..a5b21f6224 100644 --- a/opendaylight/topologymanager/shell/pom.xml +++ b/opendaylight/adsal/topologymanager/shell/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight topologymanager.shell ${topologymanager.shell.version} diff --git a/opendaylight/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/AddUserLink.java b/opendaylight/adsal/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/AddUserLink.java similarity index 100% rename from opendaylight/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/AddUserLink.java rename to opendaylight/adsal/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/AddUserLink.java diff --git a/opendaylight/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/DeleteUserLink.java b/opendaylight/adsal/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/DeleteUserLink.java similarity index 100% rename from opendaylight/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/DeleteUserLink.java rename to opendaylight/adsal/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/DeleteUserLink.java diff --git a/opendaylight/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/PrintNodeEdges.java b/opendaylight/adsal/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/PrintNodeEdges.java similarity index 100% rename from opendaylight/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/PrintNodeEdges.java rename to opendaylight/adsal/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/PrintNodeEdges.java diff --git a/opendaylight/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/PrintUserLink.java b/opendaylight/adsal/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/PrintUserLink.java similarity index 100% rename from opendaylight/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/PrintUserLink.java rename to opendaylight/adsal/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/PrintUserLink.java diff --git a/opendaylight/topologymanager/shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/opendaylight/adsal/topologymanager/shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml similarity index 100% rename from opendaylight/topologymanager/shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml rename to opendaylight/adsal/topologymanager/shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml diff --git a/opendaylight/usermanager/api/pom.xml b/opendaylight/adsal/usermanager/api/pom.xml similarity index 98% rename from opendaylight/usermanager/api/pom.xml rename to opendaylight/adsal/usermanager/api/pom.xml index e21337242a..76f293b197 100644 --- a/opendaylight/usermanager/api/pom.xml +++ b/opendaylight/adsal/usermanager/api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight usermanager diff --git a/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/AuthResponse.java b/opendaylight/adsal/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/AuthResponse.java similarity index 100% rename from opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/AuthResponse.java rename to opendaylight/adsal/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/AuthResponse.java diff --git a/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/AuthenticatedUser.java b/opendaylight/adsal/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/AuthenticatedUser.java similarity index 100% rename from opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/AuthenticatedUser.java rename to opendaylight/adsal/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/AuthenticatedUser.java diff --git a/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/AuthorizationConfig.java b/opendaylight/adsal/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/AuthorizationConfig.java similarity index 100% rename from opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/AuthorizationConfig.java rename to opendaylight/adsal/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/AuthorizationConfig.java diff --git a/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/IAAAProvider.java b/opendaylight/adsal/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/IAAAProvider.java similarity index 100% rename from opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/IAAAProvider.java rename to opendaylight/adsal/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/IAAAProvider.java diff --git a/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/ISessionManager.java b/opendaylight/adsal/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/ISessionManager.java similarity index 100% rename from opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/ISessionManager.java rename to opendaylight/adsal/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/ISessionManager.java diff --git a/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/IUserManager.java b/opendaylight/adsal/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/IUserManager.java similarity index 100% rename from opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/IUserManager.java rename to opendaylight/adsal/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/IUserManager.java diff --git a/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/ODLUserLevel.java b/opendaylight/adsal/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/ODLUserLevel.java similarity index 100% rename from opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/ODLUserLevel.java rename to opendaylight/adsal/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/ODLUserLevel.java diff --git a/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/ServerConfig.java b/opendaylight/adsal/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/ServerConfig.java similarity index 100% rename from opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/ServerConfig.java rename to opendaylight/adsal/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/ServerConfig.java diff --git a/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/UserConfig.java b/opendaylight/adsal/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/UserConfig.java similarity index 100% rename from opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/UserConfig.java rename to opendaylight/adsal/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/UserConfig.java diff --git a/opendaylight/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/AuthResponseTest.java b/opendaylight/adsal/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/AuthResponseTest.java similarity index 100% rename from opendaylight/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/AuthResponseTest.java rename to opendaylight/adsal/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/AuthResponseTest.java diff --git a/opendaylight/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/AuthenticatedUserTest.java b/opendaylight/adsal/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/AuthenticatedUserTest.java similarity index 100% rename from opendaylight/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/AuthenticatedUserTest.java rename to opendaylight/adsal/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/AuthenticatedUserTest.java diff --git a/opendaylight/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/AuthorizationUserConfigTest.java b/opendaylight/adsal/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/AuthorizationUserConfigTest.java similarity index 100% rename from opendaylight/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/AuthorizationUserConfigTest.java rename to opendaylight/adsal/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/AuthorizationUserConfigTest.java diff --git a/opendaylight/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/ServerConfigTest.java b/opendaylight/adsal/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/ServerConfigTest.java similarity index 100% rename from opendaylight/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/ServerConfigTest.java rename to opendaylight/adsal/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/ServerConfigTest.java diff --git a/opendaylight/usermanager/implementation/pom.xml b/opendaylight/adsal/usermanager/implementation/pom.xml similarity index 98% rename from opendaylight/usermanager/implementation/pom.xml rename to opendaylight/adsal/usermanager/implementation/pom.xml index d973f670b2..fd8a397837 100644 --- a/opendaylight/usermanager/implementation/pom.xml +++ b/opendaylight/adsal/usermanager/implementation/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight usermanager.implementation diff --git a/opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/Activator.java b/opendaylight/adsal/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/Activator.java similarity index 100% rename from opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/Activator.java rename to opendaylight/adsal/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/Activator.java diff --git a/opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/UserManager.java b/opendaylight/adsal/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/UserManager.java similarity index 100% rename from opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/UserManager.java rename to opendaylight/adsal/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/UserManager.java diff --git a/opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/security/SessionManager.java b/opendaylight/adsal/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/security/SessionManager.java similarity index 100% rename from opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/security/SessionManager.java rename to opendaylight/adsal/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/security/SessionManager.java diff --git a/opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/security/UserSecurityContextRepository.java b/opendaylight/adsal/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/security/UserSecurityContextRepository.java similarity index 100% rename from opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/security/UserSecurityContextRepository.java rename to opendaylight/adsal/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/security/UserSecurityContextRepository.java diff --git a/opendaylight/usermanager/implementation/src/test/java/org/opendaylight/controller/usermanager/internal/UserManagerImplTest.java b/opendaylight/adsal/usermanager/implementation/src/test/java/org/opendaylight/controller/usermanager/internal/UserManagerImplTest.java similarity index 100% rename from opendaylight/usermanager/implementation/src/test/java/org/opendaylight/controller/usermanager/internal/UserManagerImplTest.java rename to opendaylight/adsal/usermanager/implementation/src/test/java/org/opendaylight/controller/usermanager/internal/UserManagerImplTest.java diff --git a/opendaylight/web/brandfragment/pom.xml b/opendaylight/adsal/web/brandfragment/pom.xml similarity index 95% rename from opendaylight/web/brandfragment/pom.xml rename to opendaylight/adsal/web/brandfragment/pom.xml index 25f62f059e..0c76146c50 100644 --- a/opendaylight/web/brandfragment/pom.xml +++ b/opendaylight/adsal/web/brandfragment/pom.xml @@ -7,7 +7,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight scm:git:ssh://git.opendaylight.org:29418/controller.git diff --git a/opendaylight/web/brandfragment/src/main/resources/WEB-INF/jsp/customerror.jsp b/opendaylight/adsal/web/brandfragment/src/main/resources/WEB-INF/jsp/customerror.jsp similarity index 100% rename from opendaylight/web/brandfragment/src/main/resources/WEB-INF/jsp/customerror.jsp rename to opendaylight/adsal/web/brandfragment/src/main/resources/WEB-INF/jsp/customerror.jsp diff --git a/opendaylight/web/brandfragment/src/main/resources/WEB-INF/jsp/customlogin.jsp b/opendaylight/adsal/web/brandfragment/src/main/resources/WEB-INF/jsp/customlogin.jsp similarity index 100% rename from opendaylight/web/brandfragment/src/main/resources/WEB-INF/jsp/customlogin.jsp rename to opendaylight/adsal/web/brandfragment/src/main/resources/WEB-INF/jsp/customlogin.jsp diff --git a/opendaylight/web/brandfragment/src/main/resources/WEB-INF/jsp/custommain.jsp b/opendaylight/adsal/web/brandfragment/src/main/resources/WEB-INF/jsp/custommain.jsp similarity index 100% rename from opendaylight/web/brandfragment/src/main/resources/WEB-INF/jsp/custommain.jsp rename to opendaylight/adsal/web/brandfragment/src/main/resources/WEB-INF/jsp/custommain.jsp diff --git a/opendaylight/web/brandfragment/src/main/resources/css/customlogin.less b/opendaylight/adsal/web/brandfragment/src/main/resources/css/customlogin.less similarity index 100% rename from opendaylight/web/brandfragment/src/main/resources/css/customlogin.less rename to opendaylight/adsal/web/brandfragment/src/main/resources/css/customlogin.less diff --git a/opendaylight/web/brandfragment/src/main/resources/css/custommain.less b/opendaylight/adsal/web/brandfragment/src/main/resources/css/custommain.less similarity index 100% rename from opendaylight/web/brandfragment/src/main/resources/css/custommain.less rename to opendaylight/adsal/web/brandfragment/src/main/resources/css/custommain.less diff --git a/opendaylight/web/brandfragment/src/main/resources/img/logo.png b/opendaylight/adsal/web/brandfragment/src/main/resources/img/logo.png similarity index 100% rename from opendaylight/web/brandfragment/src/main/resources/img/logo.png rename to opendaylight/adsal/web/brandfragment/src/main/resources/img/logo.png diff --git a/opendaylight/web/devices/pom.xml b/opendaylight/adsal/web/devices/pom.xml similarity index 98% rename from opendaylight/web/devices/pom.xml rename to opendaylight/adsal/web/devices/pom.xml index 8e7c9248dd..062812b867 100644 --- a/opendaylight/web/devices/pom.xml +++ b/opendaylight/adsal/web/devices/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight devices.web diff --git a/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/Devices.java b/opendaylight/adsal/web/devices/src/main/java/org/opendaylight/controller/devices/web/Devices.java similarity index 100% rename from opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/Devices.java rename to opendaylight/adsal/web/devices/src/main/java/org/opendaylight/controller/devices/web/Devices.java diff --git a/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/DevicesJsonBean.java b/opendaylight/adsal/web/devices/src/main/java/org/opendaylight/controller/devices/web/DevicesJsonBean.java similarity index 100% rename from opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/DevicesJsonBean.java rename to opendaylight/adsal/web/devices/src/main/java/org/opendaylight/controller/devices/web/DevicesJsonBean.java diff --git a/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/NodeJsonBean.java b/opendaylight/adsal/web/devices/src/main/java/org/opendaylight/controller/devices/web/NodeJsonBean.java similarity index 100% rename from opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/NodeJsonBean.java rename to opendaylight/adsal/web/devices/src/main/java/org/opendaylight/controller/devices/web/NodeJsonBean.java diff --git a/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/PortJsonBean.java b/opendaylight/adsal/web/devices/src/main/java/org/opendaylight/controller/devices/web/PortJsonBean.java similarity index 100% rename from opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/PortJsonBean.java rename to opendaylight/adsal/web/devices/src/main/java/org/opendaylight/controller/devices/web/PortJsonBean.java diff --git a/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/SpanPortJsonBean.java b/opendaylight/adsal/web/devices/src/main/java/org/opendaylight/controller/devices/web/SpanPortJsonBean.java similarity index 100% rename from opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/SpanPortJsonBean.java rename to opendaylight/adsal/web/devices/src/main/java/org/opendaylight/controller/devices/web/SpanPortJsonBean.java diff --git a/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/StatusJsonBean.java b/opendaylight/adsal/web/devices/src/main/java/org/opendaylight/controller/devices/web/StatusJsonBean.java similarity index 100% rename from opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/StatusJsonBean.java rename to opendaylight/adsal/web/devices/src/main/java/org/opendaylight/controller/devices/web/StatusJsonBean.java diff --git a/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/SubnetGatewayPortBean.java b/opendaylight/adsal/web/devices/src/main/java/org/opendaylight/controller/devices/web/SubnetGatewayPortBean.java similarity index 100% rename from opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/SubnetGatewayPortBean.java rename to opendaylight/adsal/web/devices/src/main/java/org/opendaylight/controller/devices/web/SubnetGatewayPortBean.java diff --git a/opendaylight/web/devices/src/main/resources/META-INF/spring.factories b/opendaylight/adsal/web/devices/src/main/resources/META-INF/spring.factories similarity index 100% rename from opendaylight/web/devices/src/main/resources/META-INF/spring.factories rename to opendaylight/adsal/web/devices/src/main/resources/META-INF/spring.factories diff --git a/opendaylight/web/devices/src/main/resources/META-INF/spring.handlers b/opendaylight/adsal/web/devices/src/main/resources/META-INF/spring.handlers similarity index 100% rename from opendaylight/web/devices/src/main/resources/META-INF/spring.handlers rename to opendaylight/adsal/web/devices/src/main/resources/META-INF/spring.handlers diff --git a/opendaylight/web/devices/src/main/resources/META-INF/spring.schemas b/opendaylight/adsal/web/devices/src/main/resources/META-INF/spring.schemas similarity index 100% rename from opendaylight/web/devices/src/main/resources/META-INF/spring.schemas rename to opendaylight/adsal/web/devices/src/main/resources/META-INF/spring.schemas diff --git a/opendaylight/web/devices/src/main/resources/META-INF/spring.tooling b/opendaylight/adsal/web/devices/src/main/resources/META-INF/spring.tooling similarity index 100% rename from opendaylight/web/devices/src/main/resources/META-INF/spring.tooling rename to opendaylight/adsal/web/devices/src/main/resources/META-INF/spring.tooling diff --git a/opendaylight/web/devices/src/main/resources/WEB-INF/Devices-servlet.xml b/opendaylight/adsal/web/devices/src/main/resources/WEB-INF/Devices-servlet.xml similarity index 100% rename from opendaylight/web/devices/src/main/resources/WEB-INF/Devices-servlet.xml rename to opendaylight/adsal/web/devices/src/main/resources/WEB-INF/Devices-servlet.xml diff --git a/opendaylight/web/devices/src/main/resources/WEB-INF/jsp/autherror.jsp b/opendaylight/adsal/web/devices/src/main/resources/WEB-INF/jsp/autherror.jsp similarity index 100% rename from opendaylight/web/devices/src/main/resources/WEB-INF/jsp/autherror.jsp rename to opendaylight/adsal/web/devices/src/main/resources/WEB-INF/jsp/autherror.jsp diff --git a/opendaylight/web/devices/src/main/resources/WEB-INF/jsp/error.jsp b/opendaylight/adsal/web/devices/src/main/resources/WEB-INF/jsp/error.jsp similarity index 100% rename from opendaylight/web/devices/src/main/resources/WEB-INF/jsp/error.jsp rename to opendaylight/adsal/web/devices/src/main/resources/WEB-INF/jsp/error.jsp diff --git a/opendaylight/web/devices/src/main/resources/WEB-INF/jsp/login.jsp b/opendaylight/adsal/web/devices/src/main/resources/WEB-INF/jsp/login.jsp similarity index 100% rename from opendaylight/web/devices/src/main/resources/WEB-INF/jsp/login.jsp rename to opendaylight/adsal/web/devices/src/main/resources/WEB-INF/jsp/login.jsp diff --git a/opendaylight/web/devices/src/main/resources/WEB-INF/web.xml b/opendaylight/adsal/web/devices/src/main/resources/WEB-INF/web.xml similarity index 100% rename from opendaylight/web/devices/src/main/resources/WEB-INF/web.xml rename to opendaylight/adsal/web/devices/src/main/resources/WEB-INF/web.xml diff --git a/opendaylight/web/devices/src/main/resources/js/page.js b/opendaylight/adsal/web/devices/src/main/resources/js/page.js similarity index 100% rename from opendaylight/web/devices/src/main/resources/js/page.js rename to opendaylight/adsal/web/devices/src/main/resources/js/page.js diff --git a/opendaylight/web/flows/pom.xml b/opendaylight/adsal/web/flows/pom.xml similarity index 98% rename from opendaylight/web/flows/pom.xml rename to opendaylight/adsal/web/flows/pom.xml index 99238c6aad..4b1d54781a 100644 --- a/opendaylight/web/flows/pom.xml +++ b/opendaylight/adsal/web/flows/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight flows.web diff --git a/opendaylight/web/flows/src/main/java/org/opendaylight/controller/flows/web/Flows.java b/opendaylight/adsal/web/flows/src/main/java/org/opendaylight/controller/flows/web/Flows.java similarity index 100% rename from opendaylight/web/flows/src/main/java/org/opendaylight/controller/flows/web/Flows.java rename to opendaylight/adsal/web/flows/src/main/java/org/opendaylight/controller/flows/web/Flows.java diff --git a/opendaylight/web/flows/src/main/resources/META-INF/spring.factories b/opendaylight/adsal/web/flows/src/main/resources/META-INF/spring.factories similarity index 100% rename from opendaylight/web/flows/src/main/resources/META-INF/spring.factories rename to opendaylight/adsal/web/flows/src/main/resources/META-INF/spring.factories diff --git a/opendaylight/web/flows/src/main/resources/META-INF/spring.handlers b/opendaylight/adsal/web/flows/src/main/resources/META-INF/spring.handlers similarity index 100% rename from opendaylight/web/flows/src/main/resources/META-INF/spring.handlers rename to opendaylight/adsal/web/flows/src/main/resources/META-INF/spring.handlers diff --git a/opendaylight/web/flows/src/main/resources/META-INF/spring.schemas b/opendaylight/adsal/web/flows/src/main/resources/META-INF/spring.schemas similarity index 100% rename from opendaylight/web/flows/src/main/resources/META-INF/spring.schemas rename to opendaylight/adsal/web/flows/src/main/resources/META-INF/spring.schemas diff --git a/opendaylight/web/flows/src/main/resources/META-INF/spring.tooling b/opendaylight/adsal/web/flows/src/main/resources/META-INF/spring.tooling similarity index 100% rename from opendaylight/web/flows/src/main/resources/META-INF/spring.tooling rename to opendaylight/adsal/web/flows/src/main/resources/META-INF/spring.tooling diff --git a/opendaylight/web/flows/src/main/resources/WEB-INF/Flows-servlet.xml b/opendaylight/adsal/web/flows/src/main/resources/WEB-INF/Flows-servlet.xml similarity index 100% rename from opendaylight/web/flows/src/main/resources/WEB-INF/Flows-servlet.xml rename to opendaylight/adsal/web/flows/src/main/resources/WEB-INF/Flows-servlet.xml diff --git a/opendaylight/web/flows/src/main/resources/WEB-INF/jsp/autherror.jsp b/opendaylight/adsal/web/flows/src/main/resources/WEB-INF/jsp/autherror.jsp similarity index 100% rename from opendaylight/web/flows/src/main/resources/WEB-INF/jsp/autherror.jsp rename to opendaylight/adsal/web/flows/src/main/resources/WEB-INF/jsp/autherror.jsp diff --git a/opendaylight/web/flows/src/main/resources/WEB-INF/jsp/error.jsp b/opendaylight/adsal/web/flows/src/main/resources/WEB-INF/jsp/error.jsp similarity index 100% rename from opendaylight/web/flows/src/main/resources/WEB-INF/jsp/error.jsp rename to opendaylight/adsal/web/flows/src/main/resources/WEB-INF/jsp/error.jsp diff --git a/opendaylight/web/flows/src/main/resources/WEB-INF/jsp/login.jsp b/opendaylight/adsal/web/flows/src/main/resources/WEB-INF/jsp/login.jsp similarity index 100% rename from opendaylight/web/flows/src/main/resources/WEB-INF/jsp/login.jsp rename to opendaylight/adsal/web/flows/src/main/resources/WEB-INF/jsp/login.jsp diff --git a/opendaylight/web/flows/src/main/resources/WEB-INF/web.xml b/opendaylight/adsal/web/flows/src/main/resources/WEB-INF/web.xml similarity index 100% rename from opendaylight/web/flows/src/main/resources/WEB-INF/web.xml rename to opendaylight/adsal/web/flows/src/main/resources/WEB-INF/web.xml diff --git a/opendaylight/web/flows/src/main/resources/js/page.js b/opendaylight/adsal/web/flows/src/main/resources/js/page.js similarity index 100% rename from opendaylight/web/flows/src/main/resources/js/page.js rename to opendaylight/adsal/web/flows/src/main/resources/js/page.js diff --git a/opendaylight/web/osgi-brandfragment/pom.xml b/opendaylight/adsal/web/osgi-brandfragment/pom.xml similarity index 94% rename from opendaylight/web/osgi-brandfragment/pom.xml rename to opendaylight/adsal/web/osgi-brandfragment/pom.xml index adea8ace62..78ad3f24c7 100644 --- a/opendaylight/web/osgi-brandfragment/pom.xml +++ b/opendaylight/adsal/web/osgi-brandfragment/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight osgi-brandfragment.web diff --git a/opendaylight/web/osgi-brandfragment/src/main/resources/META-INF/webconsole.properties b/opendaylight/adsal/web/osgi-brandfragment/src/main/resources/META-INF/webconsole.properties similarity index 100% rename from opendaylight/web/osgi-brandfragment/src/main/resources/META-INF/webconsole.properties rename to opendaylight/adsal/web/osgi-brandfragment/src/main/resources/META-INF/webconsole.properties diff --git a/opendaylight/web/osgi-brandfragment/src/main/resources/res/imgs/odl/favicon.ico b/opendaylight/adsal/web/osgi-brandfragment/src/main/resources/res/imgs/odl/favicon.ico similarity index 100% rename from opendaylight/web/osgi-brandfragment/src/main/resources/res/imgs/odl/favicon.ico rename to opendaylight/adsal/web/osgi-brandfragment/src/main/resources/res/imgs/odl/favicon.ico diff --git a/opendaylight/web/osgi-brandfragment/src/main/resources/res/imgs/odl/logo.png b/opendaylight/adsal/web/osgi-brandfragment/src/main/resources/res/imgs/odl/logo.png similarity index 100% rename from opendaylight/web/osgi-brandfragment/src/main/resources/res/imgs/odl/logo.png rename to opendaylight/adsal/web/osgi-brandfragment/src/main/resources/res/imgs/odl/logo.png diff --git a/opendaylight/web/root/pom.xml b/opendaylight/adsal/web/root/pom.xml similarity index 98% rename from opendaylight/web/root/pom.xml rename to opendaylight/adsal/web/root/pom.xml index cd82f8b07f..faede10e2d 100644 --- a/opendaylight/web/root/pom.xml +++ b/opendaylight/adsal/web/root/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight web diff --git a/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/ClusterNodeBean.java b/opendaylight/adsal/web/root/src/main/java/org/opendaylight/controller/web/ClusterNodeBean.java similarity index 100% rename from opendaylight/web/root/src/main/java/org/opendaylight/controller/web/ClusterNodeBean.java rename to opendaylight/adsal/web/root/src/main/java/org/opendaylight/controller/web/ClusterNodeBean.java diff --git a/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/ControllerUISessionManager.java b/opendaylight/adsal/web/root/src/main/java/org/opendaylight/controller/web/ControllerUISessionManager.java similarity index 100% rename from opendaylight/web/root/src/main/java/org/opendaylight/controller/web/ControllerUISessionManager.java rename to opendaylight/adsal/web/root/src/main/java/org/opendaylight/controller/web/ControllerUISessionManager.java diff --git a/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWeb.java b/opendaylight/adsal/web/root/src/main/java/org/opendaylight/controller/web/DaylightWeb.java similarity index 100% rename from opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWeb.java rename to opendaylight/adsal/web/root/src/main/java/org/opendaylight/controller/web/DaylightWeb.java diff --git a/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebAdmin.java b/opendaylight/adsal/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebAdmin.java similarity index 100% rename from opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebAdmin.java rename to opendaylight/adsal/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebAdmin.java diff --git a/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebUtil.java b/opendaylight/adsal/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebUtil.java similarity index 100% rename from opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebUtil.java rename to opendaylight/adsal/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebUtil.java diff --git a/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/IDaylightWeb.java b/opendaylight/adsal/web/root/src/main/java/org/opendaylight/controller/web/IDaylightWeb.java similarity index 100% rename from opendaylight/web/root/src/main/java/org/opendaylight/controller/web/IDaylightWeb.java rename to opendaylight/adsal/web/root/src/main/java/org/opendaylight/controller/web/IDaylightWeb.java diff --git a/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/NodeBean.java b/opendaylight/adsal/web/root/src/main/java/org/opendaylight/controller/web/NodeBean.java similarity index 100% rename from opendaylight/web/root/src/main/java/org/opendaylight/controller/web/NodeBean.java rename to opendaylight/adsal/web/root/src/main/java/org/opendaylight/controller/web/NodeBean.java diff --git a/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/UserBean.java b/opendaylight/adsal/web/root/src/main/java/org/opendaylight/controller/web/UserBean.java similarity index 100% rename from opendaylight/web/root/src/main/java/org/opendaylight/controller/web/UserBean.java rename to opendaylight/adsal/web/root/src/main/java/org/opendaylight/controller/web/UserBean.java diff --git a/opendaylight/web/root/src/main/resources/META-INF/spring.factories b/opendaylight/adsal/web/root/src/main/resources/META-INF/spring.factories similarity index 100% rename from opendaylight/web/root/src/main/resources/META-INF/spring.factories rename to opendaylight/adsal/web/root/src/main/resources/META-INF/spring.factories diff --git a/opendaylight/web/root/src/main/resources/META-INF/spring.handlers b/opendaylight/adsal/web/root/src/main/resources/META-INF/spring.handlers similarity index 100% rename from opendaylight/web/root/src/main/resources/META-INF/spring.handlers rename to opendaylight/adsal/web/root/src/main/resources/META-INF/spring.handlers diff --git a/opendaylight/web/root/src/main/resources/META-INF/spring.schemas b/opendaylight/adsal/web/root/src/main/resources/META-INF/spring.schemas similarity index 100% rename from opendaylight/web/root/src/main/resources/META-INF/spring.schemas rename to opendaylight/adsal/web/root/src/main/resources/META-INF/spring.schemas diff --git a/opendaylight/web/root/src/main/resources/META-INF/spring.tooling b/opendaylight/adsal/web/root/src/main/resources/META-INF/spring.tooling similarity index 100% rename from opendaylight/web/root/src/main/resources/META-INF/spring.tooling rename to opendaylight/adsal/web/root/src/main/resources/META-INF/spring.tooling diff --git a/opendaylight/web/root/src/main/resources/WEB-INF/RootGUI-servlet.xml b/opendaylight/adsal/web/root/src/main/resources/WEB-INF/RootGUI-servlet.xml similarity index 100% rename from opendaylight/web/root/src/main/resources/WEB-INF/RootGUI-servlet.xml rename to opendaylight/adsal/web/root/src/main/resources/WEB-INF/RootGUI-servlet.xml diff --git a/opendaylight/web/root/src/main/resources/WEB-INF/jsp/autherror.jsp b/opendaylight/adsal/web/root/src/main/resources/WEB-INF/jsp/autherror.jsp similarity index 100% rename from opendaylight/web/root/src/main/resources/WEB-INF/jsp/autherror.jsp rename to opendaylight/adsal/web/root/src/main/resources/WEB-INF/jsp/autherror.jsp diff --git a/opendaylight/web/root/src/main/resources/WEB-INF/jsp/error.jsp b/opendaylight/adsal/web/root/src/main/resources/WEB-INF/jsp/error.jsp similarity index 100% rename from opendaylight/web/root/src/main/resources/WEB-INF/jsp/error.jsp rename to opendaylight/adsal/web/root/src/main/resources/WEB-INF/jsp/error.jsp diff --git a/opendaylight/web/root/src/main/resources/WEB-INF/jsp/login.jsp b/opendaylight/adsal/web/root/src/main/resources/WEB-INF/jsp/login.jsp similarity index 100% rename from opendaylight/web/root/src/main/resources/WEB-INF/jsp/login.jsp rename to opendaylight/adsal/web/root/src/main/resources/WEB-INF/jsp/login.jsp diff --git a/opendaylight/web/root/src/main/resources/WEB-INF/jsp/main.jsp b/opendaylight/adsal/web/root/src/main/resources/WEB-INF/jsp/main.jsp similarity index 100% rename from opendaylight/web/root/src/main/resources/WEB-INF/jsp/main.jsp rename to opendaylight/adsal/web/root/src/main/resources/WEB-INF/jsp/main.jsp diff --git a/opendaylight/web/root/src/main/resources/WEB-INF/spring/servlet/security.xml b/opendaylight/adsal/web/root/src/main/resources/WEB-INF/spring/servlet/security.xml similarity index 100% rename from opendaylight/web/root/src/main/resources/WEB-INF/spring/servlet/security.xml rename to opendaylight/adsal/web/root/src/main/resources/WEB-INF/spring/servlet/security.xml diff --git a/opendaylight/web/root/src/main/resources/WEB-INF/web.xml b/opendaylight/adsal/web/root/src/main/resources/WEB-INF/web.xml similarity index 100% rename from opendaylight/web/root/src/main/resources/WEB-INF/web.xml rename to opendaylight/adsal/web/root/src/main/resources/WEB-INF/web.xml diff --git a/opendaylight/web/root/src/main/resources/css/bootstrap.min.css b/opendaylight/adsal/web/root/src/main/resources/css/bootstrap.min.css similarity index 100% rename from opendaylight/web/root/src/main/resources/css/bootstrap.min.css rename to opendaylight/adsal/web/root/src/main/resources/css/bootstrap.min.css diff --git a/opendaylight/web/root/src/main/resources/css/fuelux-responsive.min.css b/opendaylight/adsal/web/root/src/main/resources/css/fuelux-responsive.min.css similarity index 100% rename from opendaylight/web/root/src/main/resources/css/fuelux-responsive.min.css rename to opendaylight/adsal/web/root/src/main/resources/css/fuelux-responsive.min.css diff --git a/opendaylight/web/root/src/main/resources/css/fuelux.min.css b/opendaylight/adsal/web/root/src/main/resources/css/fuelux.min.css similarity index 100% rename from opendaylight/web/root/src/main/resources/css/fuelux.min.css rename to opendaylight/adsal/web/root/src/main/resources/css/fuelux.min.css diff --git a/opendaylight/web/root/src/main/resources/css/login.less b/opendaylight/adsal/web/root/src/main/resources/css/login.less similarity index 100% rename from opendaylight/web/root/src/main/resources/css/login.less rename to opendaylight/adsal/web/root/src/main/resources/css/login.less diff --git a/opendaylight/web/root/src/main/resources/css/one.less b/opendaylight/adsal/web/root/src/main/resources/css/one.less similarity index 100% rename from opendaylight/web/root/src/main/resources/css/one.less rename to opendaylight/adsal/web/root/src/main/resources/css/one.less diff --git a/opendaylight/web/root/src/main/resources/css/opendaylight.css b/opendaylight/adsal/web/root/src/main/resources/css/opendaylight.css similarity index 100% rename from opendaylight/web/root/src/main/resources/css/opendaylight.css rename to opendaylight/adsal/web/root/src/main/resources/css/opendaylight.css diff --git a/opendaylight/web/root/src/main/resources/img/Device_pc_3045_default_64.png b/opendaylight/adsal/web/root/src/main/resources/img/Device_pc_3045_default_64.png similarity index 100% rename from opendaylight/web/root/src/main/resources/img/Device_pc_3045_default_64.png rename to opendaylight/adsal/web/root/src/main/resources/img/Device_pc_3045_default_64.png diff --git a/opendaylight/web/root/src/main/resources/img/Device_switch_3062_unknown_64.png b/opendaylight/adsal/web/root/src/main/resources/img/Device_switch_3062_unknown_64.png similarity index 100% rename from opendaylight/web/root/src/main/resources/img/Device_switch_3062_unknown_64.png rename to opendaylight/adsal/web/root/src/main/resources/img/Device_switch_3062_unknown_64.png diff --git a/opendaylight/web/root/src/main/resources/img/Expand16T.png b/opendaylight/adsal/web/root/src/main/resources/img/Expand16T.png similarity index 100% rename from opendaylight/web/root/src/main/resources/img/Expand16T.png rename to opendaylight/adsal/web/root/src/main/resources/img/Expand16T.png diff --git a/opendaylight/web/root/src/main/resources/img/Key_0024_16.png b/opendaylight/adsal/web/root/src/main/resources/img/Key_0024_16.png similarity index 100% rename from opendaylight/web/root/src/main/resources/img/Key_0024_16.png rename to opendaylight/adsal/web/root/src/main/resources/img/Key_0024_16.png diff --git a/opendaylight/web/root/src/main/resources/img/alert_unreachable_2008_128.png b/opendaylight/adsal/web/root/src/main/resources/img/alert_unreachable_2008_128.png similarity index 100% rename from opendaylight/web/root/src/main/resources/img/alert_unreachable_2008_128.png rename to opendaylight/adsal/web/root/src/main/resources/img/alert_unreachable_2008_128.png diff --git a/opendaylight/web/root/src/main/resources/img/form.png b/opendaylight/adsal/web/root/src/main/resources/img/form.png similarity index 100% rename from opendaylight/web/root/src/main/resources/img/form.png rename to opendaylight/adsal/web/root/src/main/resources/img/form.png diff --git a/opendaylight/web/root/src/main/resources/img/logo.png b/opendaylight/adsal/web/root/src/main/resources/img/logo.png similarity index 100% rename from opendaylight/web/root/src/main/resources/img/logo.png rename to opendaylight/adsal/web/root/src/main/resources/img/logo.png diff --git a/opendaylight/web/root/src/main/resources/img/logo_16.png b/opendaylight/adsal/web/root/src/main/resources/img/logo_16.png similarity index 100% rename from opendaylight/web/root/src/main/resources/img/logo_16.png rename to opendaylight/adsal/web/root/src/main/resources/img/logo_16.png diff --git a/opendaylight/web/root/src/main/resources/img/nextpageleft.png b/opendaylight/adsal/web/root/src/main/resources/img/nextpageleft.png similarity index 100% rename from opendaylight/web/root/src/main/resources/img/nextpageleft.png rename to opendaylight/adsal/web/root/src/main/resources/img/nextpageleft.png diff --git a/opendaylight/web/root/src/main/resources/img/nextpageright.png b/opendaylight/adsal/web/root/src/main/resources/img/nextpageright.png similarity index 100% rename from opendaylight/web/root/src/main/resources/img/nextpageright.png rename to opendaylight/adsal/web/root/src/main/resources/img/nextpageright.png diff --git a/opendaylight/web/root/src/main/resources/img/open_1054_16.png b/opendaylight/adsal/web/root/src/main/resources/img/open_1054_16.png similarity index 100% rename from opendaylight/web/root/src/main/resources/img/open_1054_16.png rename to opendaylight/adsal/web/root/src/main/resources/img/open_1054_16.png diff --git a/opendaylight/web/root/src/main/resources/img/open_1054_24.png b/opendaylight/adsal/web/root/src/main/resources/img/open_1054_24.png similarity index 100% rename from opendaylight/web/root/src/main/resources/img/open_1054_24.png rename to opendaylight/adsal/web/root/src/main/resources/img/open_1054_24.png diff --git a/opendaylight/web/root/src/main/resources/img/save_as_0106_16.png b/opendaylight/adsal/web/root/src/main/resources/img/save_as_0106_16.png similarity index 100% rename from opendaylight/web/root/src/main/resources/img/save_as_0106_16.png rename to opendaylight/adsal/web/root/src/main/resources/img/save_as_0106_16.png diff --git a/opendaylight/web/root/src/main/resources/img/save_as_0106_24.png b/opendaylight/adsal/web/root/src/main/resources/img/save_as_0106_24.png similarity index 100% rename from opendaylight/web/root/src/main/resources/img/save_as_0106_24.png rename to opendaylight/adsal/web/root/src/main/resources/img/save_as_0106_24.png diff --git a/opendaylight/web/root/src/main/resources/img/search.png b/opendaylight/adsal/web/root/src/main/resources/img/search.png similarity index 100% rename from opendaylight/web/root/src/main/resources/img/search.png rename to opendaylight/adsal/web/root/src/main/resources/img/search.png diff --git a/opendaylight/web/root/src/main/resources/img/searchremove.png b/opendaylight/adsal/web/root/src/main/resources/img/searchremove.png similarity index 100% rename from opendaylight/web/root/src/main/resources/img/searchremove.png rename to opendaylight/adsal/web/root/src/main/resources/img/searchremove.png diff --git a/opendaylight/web/root/src/main/resources/img/sort_down.png b/opendaylight/adsal/web/root/src/main/resources/img/sort_down.png similarity index 100% rename from opendaylight/web/root/src/main/resources/img/sort_down.png rename to opendaylight/adsal/web/root/src/main/resources/img/sort_down.png diff --git a/opendaylight/web/root/src/main/resources/img/sort_up.png b/opendaylight/adsal/web/root/src/main/resources/img/sort_up.png similarity index 100% rename from opendaylight/web/root/src/main/resources/img/sort_up.png rename to opendaylight/adsal/web/root/src/main/resources/img/sort_up.png diff --git a/opendaylight/web/root/src/main/resources/img/topology_view_1033_128.png b/opendaylight/adsal/web/root/src/main/resources/img/topology_view_1033_128.png similarity index 100% rename from opendaylight/web/root/src/main/resources/img/topology_view_1033_128.png rename to opendaylight/adsal/web/root/src/main/resources/img/topology_view_1033_128.png diff --git a/opendaylight/web/root/src/main/resources/img/topology_view_1033_16.png b/opendaylight/adsal/web/root/src/main/resources/img/topology_view_1033_16.png similarity index 100% rename from opendaylight/web/root/src/main/resources/img/topology_view_1033_16.png rename to opendaylight/adsal/web/root/src/main/resources/img/topology_view_1033_16.png diff --git a/opendaylight/web/root/src/main/resources/img/user_0020_16.png b/opendaylight/adsal/web/root/src/main/resources/img/user_0020_16.png similarity index 100% rename from opendaylight/web/root/src/main/resources/img/user_0020_16.png rename to opendaylight/adsal/web/root/src/main/resources/img/user_0020_16.png diff --git a/opendaylight/web/root/src/main/resources/img/user_0020_24.png b/opendaylight/adsal/web/root/src/main/resources/img/user_0020_24.png similarity index 100% rename from opendaylight/web/root/src/main/resources/img/user_0020_24.png rename to opendaylight/adsal/web/root/src/main/resources/img/user_0020_24.png diff --git a/opendaylight/web/root/src/main/resources/img/user_group_0107_16.png b/opendaylight/adsal/web/root/src/main/resources/img/user_group_0107_16.png similarity index 100% rename from opendaylight/web/root/src/main/resources/img/user_group_0107_16.png rename to opendaylight/adsal/web/root/src/main/resources/img/user_group_0107_16.png diff --git a/opendaylight/web/root/src/main/resources/img/user_group_0107_24.png b/opendaylight/adsal/web/root/src/main/resources/img/user_group_0107_24.png similarity index 100% rename from opendaylight/web/root/src/main/resources/img/user_group_0107_24.png rename to opendaylight/adsal/web/root/src/main/resources/img/user_group_0107_24.png diff --git a/opendaylight/web/root/src/main/resources/js/bootstrap.min.js b/opendaylight/adsal/web/root/src/main/resources/js/bootstrap.min.js similarity index 100% rename from opendaylight/web/root/src/main/resources/js/bootstrap.min.js rename to opendaylight/adsal/web/root/src/main/resources/js/bootstrap.min.js diff --git a/opendaylight/web/root/src/main/resources/js/datasource.js b/opendaylight/adsal/web/root/src/main/resources/js/datasource.js similarity index 100% rename from opendaylight/web/root/src/main/resources/js/datasource.js rename to opendaylight/adsal/web/root/src/main/resources/js/datasource.js diff --git a/opendaylight/web/root/src/main/resources/js/fuelux/COPYING b/opendaylight/adsal/web/root/src/main/resources/js/fuelux/COPYING similarity index 100% rename from opendaylight/web/root/src/main/resources/js/fuelux/COPYING rename to opendaylight/adsal/web/root/src/main/resources/js/fuelux/COPYING diff --git a/opendaylight/web/root/src/main/resources/js/fuelux/all.min.js b/opendaylight/adsal/web/root/src/main/resources/js/fuelux/all.min.js similarity index 100% rename from opendaylight/web/root/src/main/resources/js/fuelux/all.min.js rename to opendaylight/adsal/web/root/src/main/resources/js/fuelux/all.min.js diff --git a/opendaylight/web/root/src/main/resources/js/fuelux/checkbox.js b/opendaylight/adsal/web/root/src/main/resources/js/fuelux/checkbox.js similarity index 100% rename from opendaylight/web/root/src/main/resources/js/fuelux/checkbox.js rename to opendaylight/adsal/web/root/src/main/resources/js/fuelux/checkbox.js diff --git a/opendaylight/web/root/src/main/resources/js/fuelux/combobox.js b/opendaylight/adsal/web/root/src/main/resources/js/fuelux/combobox.js similarity index 100% rename from opendaylight/web/root/src/main/resources/js/fuelux/combobox.js rename to opendaylight/adsal/web/root/src/main/resources/js/fuelux/combobox.js diff --git a/opendaylight/web/root/src/main/resources/js/fuelux/datagrid.js b/opendaylight/adsal/web/root/src/main/resources/js/fuelux/datagrid.js similarity index 100% rename from opendaylight/web/root/src/main/resources/js/fuelux/datagrid.js rename to opendaylight/adsal/web/root/src/main/resources/js/fuelux/datagrid.js diff --git a/opendaylight/web/root/src/main/resources/js/fuelux/loader.min.js b/opendaylight/adsal/web/root/src/main/resources/js/fuelux/loader.min.js similarity index 100% rename from opendaylight/web/root/src/main/resources/js/fuelux/loader.min.js rename to opendaylight/adsal/web/root/src/main/resources/js/fuelux/loader.min.js diff --git a/opendaylight/web/root/src/main/resources/js/fuelux/pillbox.js b/opendaylight/adsal/web/root/src/main/resources/js/fuelux/pillbox.js similarity index 100% rename from opendaylight/web/root/src/main/resources/js/fuelux/pillbox.js rename to opendaylight/adsal/web/root/src/main/resources/js/fuelux/pillbox.js diff --git a/opendaylight/web/root/src/main/resources/js/fuelux/radio.js b/opendaylight/adsal/web/root/src/main/resources/js/fuelux/radio.js similarity index 100% rename from opendaylight/web/root/src/main/resources/js/fuelux/radio.js rename to opendaylight/adsal/web/root/src/main/resources/js/fuelux/radio.js diff --git a/opendaylight/web/root/src/main/resources/js/fuelux/search.js b/opendaylight/adsal/web/root/src/main/resources/js/fuelux/search.js similarity index 100% rename from opendaylight/web/root/src/main/resources/js/fuelux/search.js rename to opendaylight/adsal/web/root/src/main/resources/js/fuelux/search.js diff --git a/opendaylight/web/root/src/main/resources/js/fuelux/select.js b/opendaylight/adsal/web/root/src/main/resources/js/fuelux/select.js similarity index 100% rename from opendaylight/web/root/src/main/resources/js/fuelux/select.js rename to opendaylight/adsal/web/root/src/main/resources/js/fuelux/select.js diff --git a/opendaylight/web/root/src/main/resources/js/fuelux/spinner.js b/opendaylight/adsal/web/root/src/main/resources/js/fuelux/spinner.js similarity index 100% rename from opendaylight/web/root/src/main/resources/js/fuelux/spinner.js rename to opendaylight/adsal/web/root/src/main/resources/js/fuelux/spinner.js diff --git a/opendaylight/web/root/src/main/resources/js/fuelux/tree.js b/opendaylight/adsal/web/root/src/main/resources/js/fuelux/tree.js similarity index 100% rename from opendaylight/web/root/src/main/resources/js/fuelux/tree.js rename to opendaylight/adsal/web/root/src/main/resources/js/fuelux/tree.js diff --git a/opendaylight/web/root/src/main/resources/js/fuelux/util.js b/opendaylight/adsal/web/root/src/main/resources/js/fuelux/util.js similarity index 100% rename from opendaylight/web/root/src/main/resources/js/fuelux/util.js rename to opendaylight/adsal/web/root/src/main/resources/js/fuelux/util.js diff --git a/opendaylight/web/root/src/main/resources/js/fuelux/wizard.js b/opendaylight/adsal/web/root/src/main/resources/js/fuelux/wizard.js similarity index 100% rename from opendaylight/web/root/src/main/resources/js/fuelux/wizard.js rename to opendaylight/adsal/web/root/src/main/resources/js/fuelux/wizard.js diff --git a/opendaylight/web/root/src/main/resources/js/jit.js b/opendaylight/adsal/web/root/src/main/resources/js/jit.js similarity index 100% rename from opendaylight/web/root/src/main/resources/js/jit.js rename to opendaylight/adsal/web/root/src/main/resources/js/jit.js diff --git a/opendaylight/web/root/src/main/resources/js/jquery-1.9.1.min.js b/opendaylight/adsal/web/root/src/main/resources/js/jquery-1.9.1.min.js similarity index 100% rename from opendaylight/web/root/src/main/resources/js/jquery-1.9.1.min.js rename to opendaylight/adsal/web/root/src/main/resources/js/jquery-1.9.1.min.js diff --git a/opendaylight/web/root/src/main/resources/js/less-1.3.3.min.js b/opendaylight/adsal/web/root/src/main/resources/js/less-1.3.3.min.js similarity index 100% rename from opendaylight/web/root/src/main/resources/js/less-1.3.3.min.js rename to opendaylight/adsal/web/root/src/main/resources/js/less-1.3.3.min.js diff --git a/opendaylight/web/root/src/main/resources/js/lib.js b/opendaylight/adsal/web/root/src/main/resources/js/lib.js similarity index 100% rename from opendaylight/web/root/src/main/resources/js/lib.js rename to opendaylight/adsal/web/root/src/main/resources/js/lib.js diff --git a/opendaylight/web/root/src/main/resources/js/open-topology.js b/opendaylight/adsal/web/root/src/main/resources/js/open-topology.js similarity index 100% rename from opendaylight/web/root/src/main/resources/js/open-topology.js rename to opendaylight/adsal/web/root/src/main/resources/js/open-topology.js diff --git a/opendaylight/web/root/src/main/resources/js/open.js b/opendaylight/adsal/web/root/src/main/resources/js/open.js similarity index 100% rename from opendaylight/web/root/src/main/resources/js/open.js rename to opendaylight/adsal/web/root/src/main/resources/js/open.js diff --git a/opendaylight/web/root/src/main/resources/js/underscore-min.js b/opendaylight/adsal/web/root/src/main/resources/js/underscore-min.js similarity index 100% rename from opendaylight/web/root/src/main/resources/js/underscore-min.js rename to opendaylight/adsal/web/root/src/main/resources/js/underscore-min.js diff --git a/opendaylight/web/topology/pom.xml b/opendaylight/adsal/web/topology/pom.xml similarity index 98% rename from opendaylight/web/topology/pom.xml rename to opendaylight/adsal/web/topology/pom.xml index 24b53db767..0afe038086 100644 --- a/opendaylight/web/topology/pom.xml +++ b/opendaylight/adsal/web/topology/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight topology.web diff --git a/opendaylight/web/topology/src/main/java/org/opendaylight/controller/topology/web/Topology.java b/opendaylight/adsal/web/topology/src/main/java/org/opendaylight/controller/topology/web/Topology.java similarity index 100% rename from opendaylight/web/topology/src/main/java/org/opendaylight/controller/topology/web/Topology.java rename to opendaylight/adsal/web/topology/src/main/java/org/opendaylight/controller/topology/web/Topology.java diff --git a/opendaylight/web/topology/src/main/resources/META-INF/spring.factories b/opendaylight/adsal/web/topology/src/main/resources/META-INF/spring.factories similarity index 100% rename from opendaylight/web/topology/src/main/resources/META-INF/spring.factories rename to opendaylight/adsal/web/topology/src/main/resources/META-INF/spring.factories diff --git a/opendaylight/web/topology/src/main/resources/META-INF/spring.handlers b/opendaylight/adsal/web/topology/src/main/resources/META-INF/spring.handlers similarity index 100% rename from opendaylight/web/topology/src/main/resources/META-INF/spring.handlers rename to opendaylight/adsal/web/topology/src/main/resources/META-INF/spring.handlers diff --git a/opendaylight/web/topology/src/main/resources/META-INF/spring.schemas b/opendaylight/adsal/web/topology/src/main/resources/META-INF/spring.schemas similarity index 100% rename from opendaylight/web/topology/src/main/resources/META-INF/spring.schemas rename to opendaylight/adsal/web/topology/src/main/resources/META-INF/spring.schemas diff --git a/opendaylight/web/topology/src/main/resources/META-INF/spring.tooling b/opendaylight/adsal/web/topology/src/main/resources/META-INF/spring.tooling similarity index 100% rename from opendaylight/web/topology/src/main/resources/META-INF/spring.tooling rename to opendaylight/adsal/web/topology/src/main/resources/META-INF/spring.tooling diff --git a/opendaylight/web/topology/src/main/resources/WEB-INF/Topology-servlet.xml b/opendaylight/adsal/web/topology/src/main/resources/WEB-INF/Topology-servlet.xml similarity index 100% rename from opendaylight/web/topology/src/main/resources/WEB-INF/Topology-servlet.xml rename to opendaylight/adsal/web/topology/src/main/resources/WEB-INF/Topology-servlet.xml diff --git a/opendaylight/web/topology/src/main/resources/WEB-INF/jsp/autherror.jsp b/opendaylight/adsal/web/topology/src/main/resources/WEB-INF/jsp/autherror.jsp similarity index 100% rename from opendaylight/web/topology/src/main/resources/WEB-INF/jsp/autherror.jsp rename to opendaylight/adsal/web/topology/src/main/resources/WEB-INF/jsp/autherror.jsp diff --git a/opendaylight/web/topology/src/main/resources/WEB-INF/jsp/error.jsp b/opendaylight/adsal/web/topology/src/main/resources/WEB-INF/jsp/error.jsp similarity index 100% rename from opendaylight/web/topology/src/main/resources/WEB-INF/jsp/error.jsp rename to opendaylight/adsal/web/topology/src/main/resources/WEB-INF/jsp/error.jsp diff --git a/opendaylight/web/topology/src/main/resources/WEB-INF/jsp/login.jsp b/opendaylight/adsal/web/topology/src/main/resources/WEB-INF/jsp/login.jsp similarity index 100% rename from opendaylight/web/topology/src/main/resources/WEB-INF/jsp/login.jsp rename to opendaylight/adsal/web/topology/src/main/resources/WEB-INF/jsp/login.jsp diff --git a/opendaylight/web/topology/src/main/resources/WEB-INF/web.xml b/opendaylight/adsal/web/topology/src/main/resources/WEB-INF/web.xml similarity index 100% rename from opendaylight/web/topology/src/main/resources/WEB-INF/web.xml rename to opendaylight/adsal/web/topology/src/main/resources/WEB-INF/web.xml diff --git a/opendaylight/web/topology/src/main/resources/js/page.js b/opendaylight/adsal/web/topology/src/main/resources/js/page.js similarity index 100% rename from opendaylight/web/topology/src/main/resources/js/page.js rename to opendaylight/adsal/web/topology/src/main/resources/js/page.js diff --git a/opendaylight/web/topology/src/test/java/org/opendaylight/controller/topology/web/TopologyTest.java b/opendaylight/adsal/web/topology/src/test/java/org/opendaylight/controller/topology/web/TopologyTest.java similarity index 100% rename from opendaylight/web/topology/src/test/java/org/opendaylight/controller/topology/web/TopologyTest.java rename to opendaylight/adsal/web/topology/src/test/java/org/opendaylight/controller/topology/web/TopologyTest.java diff --git a/opendaylight/web/troubleshoot/pom.xml b/opendaylight/adsal/web/troubleshoot/pom.xml similarity index 98% rename from opendaylight/web/troubleshoot/pom.xml rename to opendaylight/adsal/web/troubleshoot/pom.xml index 14817bd186..1ef5de11c4 100644 --- a/opendaylight/web/troubleshoot/pom.xml +++ b/opendaylight/adsal/web/troubleshoot/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight 1.5.0-SNAPSHOT - ../../commons/opendaylight + ../../../commons/opendaylight troubleshoot.web diff --git a/opendaylight/web/troubleshoot/src/main/java/org/opendaylight/controller/troubleshoot/web/Troubleshoot.java b/opendaylight/adsal/web/troubleshoot/src/main/java/org/opendaylight/controller/troubleshoot/web/Troubleshoot.java similarity index 100% rename from opendaylight/web/troubleshoot/src/main/java/org/opendaylight/controller/troubleshoot/web/Troubleshoot.java rename to opendaylight/adsal/web/troubleshoot/src/main/java/org/opendaylight/controller/troubleshoot/web/Troubleshoot.java diff --git a/opendaylight/web/troubleshoot/src/main/java/org/opendaylight/controller/troubleshoot/web/TroubleshootingJsonBean.java b/opendaylight/adsal/web/troubleshoot/src/main/java/org/opendaylight/controller/troubleshoot/web/TroubleshootingJsonBean.java similarity index 100% rename from opendaylight/web/troubleshoot/src/main/java/org/opendaylight/controller/troubleshoot/web/TroubleshootingJsonBean.java rename to opendaylight/adsal/web/troubleshoot/src/main/java/org/opendaylight/controller/troubleshoot/web/TroubleshootingJsonBean.java diff --git a/opendaylight/web/troubleshoot/src/main/resources/META-INF/spring.factories b/opendaylight/adsal/web/troubleshoot/src/main/resources/META-INF/spring.factories similarity index 100% rename from opendaylight/web/troubleshoot/src/main/resources/META-INF/spring.factories rename to opendaylight/adsal/web/troubleshoot/src/main/resources/META-INF/spring.factories diff --git a/opendaylight/web/troubleshoot/src/main/resources/META-INF/spring.handlers b/opendaylight/adsal/web/troubleshoot/src/main/resources/META-INF/spring.handlers similarity index 100% rename from opendaylight/web/troubleshoot/src/main/resources/META-INF/spring.handlers rename to opendaylight/adsal/web/troubleshoot/src/main/resources/META-INF/spring.handlers diff --git a/opendaylight/web/troubleshoot/src/main/resources/META-INF/spring.schemas b/opendaylight/adsal/web/troubleshoot/src/main/resources/META-INF/spring.schemas similarity index 100% rename from opendaylight/web/troubleshoot/src/main/resources/META-INF/spring.schemas rename to opendaylight/adsal/web/troubleshoot/src/main/resources/META-INF/spring.schemas diff --git a/opendaylight/web/troubleshoot/src/main/resources/META-INF/spring.tooling b/opendaylight/adsal/web/troubleshoot/src/main/resources/META-INF/spring.tooling similarity index 100% rename from opendaylight/web/troubleshoot/src/main/resources/META-INF/spring.tooling rename to opendaylight/adsal/web/troubleshoot/src/main/resources/META-INF/spring.tooling diff --git a/opendaylight/web/troubleshoot/src/main/resources/WEB-INF/Troubleshoot-servlet.xml b/opendaylight/adsal/web/troubleshoot/src/main/resources/WEB-INF/Troubleshoot-servlet.xml similarity index 100% rename from opendaylight/web/troubleshoot/src/main/resources/WEB-INF/Troubleshoot-servlet.xml rename to opendaylight/adsal/web/troubleshoot/src/main/resources/WEB-INF/Troubleshoot-servlet.xml diff --git a/opendaylight/web/troubleshoot/src/main/resources/WEB-INF/jsp/autherror.jsp b/opendaylight/adsal/web/troubleshoot/src/main/resources/WEB-INF/jsp/autherror.jsp similarity index 100% rename from opendaylight/web/troubleshoot/src/main/resources/WEB-INF/jsp/autherror.jsp rename to opendaylight/adsal/web/troubleshoot/src/main/resources/WEB-INF/jsp/autherror.jsp diff --git a/opendaylight/web/troubleshoot/src/main/resources/WEB-INF/jsp/error.jsp b/opendaylight/adsal/web/troubleshoot/src/main/resources/WEB-INF/jsp/error.jsp similarity index 100% rename from opendaylight/web/troubleshoot/src/main/resources/WEB-INF/jsp/error.jsp rename to opendaylight/adsal/web/troubleshoot/src/main/resources/WEB-INF/jsp/error.jsp diff --git a/opendaylight/web/troubleshoot/src/main/resources/WEB-INF/jsp/login.jsp b/opendaylight/adsal/web/troubleshoot/src/main/resources/WEB-INF/jsp/login.jsp similarity index 100% rename from opendaylight/web/troubleshoot/src/main/resources/WEB-INF/jsp/login.jsp rename to opendaylight/adsal/web/troubleshoot/src/main/resources/WEB-INF/jsp/login.jsp diff --git a/opendaylight/web/troubleshoot/src/main/resources/WEB-INF/web.xml b/opendaylight/adsal/web/troubleshoot/src/main/resources/WEB-INF/web.xml similarity index 100% rename from opendaylight/web/troubleshoot/src/main/resources/WEB-INF/web.xml rename to opendaylight/adsal/web/troubleshoot/src/main/resources/WEB-INF/web.xml diff --git a/opendaylight/web/troubleshoot/src/main/resources/js/page.js b/opendaylight/adsal/web/troubleshoot/src/main/resources/js/page.js similarity index 100% rename from opendaylight/web/troubleshoot/src/main/resources/js/page.js rename to opendaylight/adsal/web/troubleshoot/src/main/resources/js/page.js diff --git a/opendaylight/northbound/networkconfiguration/neutron/enunciate.xml b/opendaylight/networkconfiguration/neutron/northbound/enunciate.xml similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/enunciate.xml rename to opendaylight/networkconfiguration/neutron/northbound/enunciate.xml diff --git a/opendaylight/northbound/networkconfiguration/neutron/pom.xml b/opendaylight/networkconfiguration/neutron/northbound/pom.xml similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/pom.xml rename to opendaylight/networkconfiguration/neutron/northbound/pom.xml diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/INeutronRequest.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/INeutronRequest.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/INeutronRequest.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/INeutronRequest.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallNorthbound.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallNorthbound.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallNorthbound.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallNorthbound.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallPolicyNorthbound.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallPolicyNorthbound.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallPolicyNorthbound.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallPolicyNorthbound.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallPolicyRequest.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallPolicyRequest.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallPolicyRequest.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallPolicyRequest.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallRequest.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallRequest.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallRequest.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallRequest.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallRuleRequest.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallRuleRequest.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallRuleRequest.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallRuleRequest.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallRulesNorthbound.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallRulesNorthbound.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallRulesNorthbound.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallRulesNorthbound.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFloatingIPRequest.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFloatingIPRequest.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFloatingIPRequest.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFloatingIPRequest.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFloatingIPsNorthbound.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFloatingIPsNorthbound.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFloatingIPsNorthbound.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFloatingIPsNorthbound.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerHealthMonitorNorthbound.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerHealthMonitorNorthbound.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerHealthMonitorNorthbound.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerHealthMonitorNorthbound.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerHealthMonitorRequest.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerHealthMonitorRequest.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerHealthMonitorRequest.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerHealthMonitorRequest.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerListenerNorthbound.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerListenerNorthbound.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerListenerNorthbound.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerListenerNorthbound.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerListenerRequest.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerListenerRequest.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerListenerRequest.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerListenerRequest.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerNorthbound.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerNorthbound.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerNorthbound.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerNorthbound.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolMemberRequest.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolMemberRequest.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolMemberRequest.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolMemberRequest.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolMembersNorthbound.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolMembersNorthbound.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolMembersNorthbound.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolMembersNorthbound.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolNorthbound.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolNorthbound.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolNorthbound.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolNorthbound.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolRequest.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolRequest.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolRequest.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolRequest.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerRequest.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerRequest.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerRequest.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerRequest.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworkRequest.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworkRequest.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworkRequest.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworkRequest.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworksNorthbound.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworksNorthbound.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworksNorthbound.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworksNorthbound.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNorthboundRSApplication.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNorthboundRSApplication.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNorthboundRSApplication.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNorthboundRSApplication.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronPageLink.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronPageLink.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronPageLink.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronPageLink.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronPortRequest.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronPortRequest.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronPortRequest.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronPortRequest.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronPortsNorthbound.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronPortsNorthbound.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronPortsNorthbound.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronPortsNorthbound.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronRouterRequest.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronRouterRequest.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronRouterRequest.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronRouterRequest.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronRoutersNorthbound.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronRoutersNorthbound.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronRoutersNorthbound.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronRoutersNorthbound.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityGroupRequest.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityGroupRequest.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityGroupRequest.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityGroupRequest.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityGroupsNorthbound.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityGroupsNorthbound.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityGroupsNorthbound.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityGroupsNorthbound.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityRuleRequest.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityRuleRequest.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityRuleRequest.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityRuleRequest.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityRulesNorthbound.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityRulesNorthbound.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityRulesNorthbound.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityRulesNorthbound.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSubnetRequest.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSubnetRequest.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSubnetRequest.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSubnetRequest.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSubnetsNorthbound.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSubnetsNorthbound.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSubnetsNorthbound.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSubnetsNorthbound.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/PaginatedRequestFactory.java b/opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/PaginatedRequestFactory.java similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/PaginatedRequestFactory.java rename to opendaylight/networkconfiguration/neutron/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/PaginatedRequestFactory.java diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/resources/WEB-INF/web.xml b/opendaylight/networkconfiguration/neutron/northbound/src/main/resources/WEB-INF/web.xml similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/resources/WEB-INF/web.xml rename to opendaylight/networkconfiguration/neutron/northbound/src/main/resources/WEB-INF/web.xml diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/resources/org/opendaylight/controller/networkconfig/neutron/northbound/jaxb.properties b/opendaylight/networkconfiguration/neutron/northbound/src/main/resources/org/opendaylight/controller/networkconfig/neutron/northbound/jaxb.properties similarity index 100% rename from opendaylight/northbound/networkconfiguration/neutron/src/main/resources/org/opendaylight/controller/networkconfig/neutron/northbound/jaxb.properties rename to opendaylight/networkconfiguration/neutron/northbound/src/main/resources/org/opendaylight/controller/networkconfig/neutron/northbound/jaxb.properties diff --git a/pom.xml b/pom.xml index 0340277bfc..d1e5494b44 100644 --- a/pom.xml +++ b/pom.xml @@ -15,38 +15,6 @@ opendaylight/distribution/opendaylight - opendaylight/forwarding/staticrouting - opendaylight/clustering/services - opendaylight/clustering/services_implementation - opendaylight/clustering/stub - opendaylight/clustering/test - opendaylight/configuration/api - opendaylight/configuration/implementation - opendaylight/routing/dijkstra_implementation - opendaylight/arphandler - opendaylight/forwardingrulesmanager/api - opendaylight/forwardingrulesmanager/implementation - opendaylight/hosttracker/api - opendaylight/hosttracker/implementation - opendaylight/hosttracker/shell - opendaylight/hosttracker_new/api - opendaylight/hosttracker_new/implementation - opendaylight/containermanager/api - opendaylight/containermanager/implementation - opendaylight/containermanager/shell - opendaylight/appauth - opendaylight/switchmanager/api - opendaylight/switchmanager/implementation - opendaylight/statisticsmanager/api - opendaylight/statisticsmanager/implementation - opendaylight/topologymanager/implementation - opendaylight/topologymanager/shell - opendaylight/usermanager/api - opendaylight/usermanager/implementation - opendaylight/connectionmanager/api - opendaylight/connectionmanager/implementation - opendaylight/security - opendaylight/karaf-tomcat-security @@ -56,16 +24,6 @@ third-party/commons/thirdparty - - opendaylight/sal/api - opendaylight/sal/implementation - - - opendaylight/sal/connection/api - opendaylight/sal/connection/implementation - opendaylight/sal/networkconfiguration/api - opendaylight/sal/networkconfiguration/implementation - opendaylight/md-sal @@ -73,54 +31,17 @@ opendaylight/netconf - - opendaylight/web/root - opendaylight/web/flows - opendaylight/web/devices - opendaylight/web/troubleshoot - opendaylight/web/topology - opendaylight/web/osgi-brandfragment + + opendaylight/adsal opendaylight/networkconfiguration/neutron opendaylight/networkconfiguration/neutron/implementation - opendaylight/northbound/networkconfiguration/neutron - - - opendaylight/northbound/commons - opendaylight/northbound/bundlescanner/api - opendaylight/northbound/bundlescanner/implementation - opendaylight/northbound/topology - opendaylight/northbound/staticrouting - opendaylight/northbound/statistics - opendaylight/northbound/flowprogrammer - opendaylight/northbound/hosttracker - opendaylight/northbound/subnets - opendaylight/northbound/switchmanager - opendaylight/northbound/containermanager - opendaylight/northbound/networkconfiguration/bridgedomain - opendaylight/northbound/httpservice-bridge - opendaylight/northbound/jolokia - opendaylight/northbound/connectionmanager - opendaylight/northbound/usermanager - opendaylight/northbound/controllermanager - - - opendaylight/logging/bridge - - - opendaylight/protocol_plugins/openflow - opendaylight/protocol_plugins/stub - - - opendaylight/samples/simpleforwarding - opendaylight/samples/loadbalancer - opendaylight/samples/northbound/loadbalancer + opendaylight/networkconfiguration/neutron/northbound opendaylight/commons/concepts opendaylight/commons/protocol-framework - opendaylight/commons/httpclient opendaylight/commons/checkstyle opendaylight/commons/opendaylight opendaylight/commons/parent @@ -129,7 +50,6 @@ opendaylight/commons/liblldp - opendaylight/dummy-console opendaylight/karaf-branding opendaylight/distribution/opendaylight-karaf-empty opendaylight/distribution/opendaylight-karaf @@ -153,29 +73,8 @@ false - opendaylight/clustering/integrationtest - opendaylight/configuration/integrationtest - opendaylight/forwardingrulesmanager/integrationtest - opendaylight/hosttracker/integrationtest - opendaylight/switchmanager/integrationtest - opendaylight/topologymanager/integrationtest - - opendaylight/northbound/integrationtest - opendaylight/statisticsmanager/integrationtest - opendaylight/commons/integrationtest - opendaylight/containermanager/it.implementation opendaylight/distribution/sanitytest/ - - docs - - false - - - opendaylight/northbound/java-client - opendaylight/northbound/swagger-ui - -