From 2fb4d7e732175a31d32e67968c957f8bfd887196 Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Wed, 22 Jul 2015 11:24:03 +0200 Subject: [PATCH] Bug 4035: Invert dependency binding-impl -> binding-config Dependency between sal-binding-broker-impl and sal-binding-config was inverted in order to ease split-off and to provide config wiring outside of implementation. This is required for separation of MD-SAL Binding implementation into MD-SAL Project. Change-Id: Id18567b2c51045461ed12500fe5cb2f324f55b0c Signed-off-by: Tony Tkacik --- opendaylight/md-sal/pom.xml | 14 ++++---------- opendaylight/md-sal/sal-binding-broker/pom.xml | 17 ++--------------- opendaylight/md-sal/sal-binding-config/pom.xml | 18 ++++++++++++++++++ .../impl/BindingAsyncDataBrokerImplModule.java | 0 ...indingAsyncDataBrokerImplModuleFactory.java | 0 .../binding/impl/BindingBrokerImplModule.java | 0 .../impl/BindingBrokerImplModuleFactory.java | 0 .../impl/BindingNotificationAdapterModule.java | 0 ...indingNotificationAdapterModuleFactory.java | 0 ...indingNotificationPublishAdapterModule.java | 0 ...otificationPublishAdapterModuleFactory.java | 0 .../md/sal/binding/impl/DummyNoopProvider.java | 0 ...orwardedCompatibleDataBrokerImplModule.java | 0 ...dCompatibleDataBrokerImplModuleFactory.java | 0 .../impl/NotificationBrokerImplModule.java | 0 .../NotificationBrokerImplModuleFactory.java | 0 .../sal/binding/impl/RpcBrokerImplModule.java | 0 .../impl/RpcBrokerImplModuleFactory.java | 0 .../sal/binding/impl/RuntimeMappingModule.java | 0 .../impl/RuntimeMappingModuleFactory.java | 0 .../yang/opendaylight-binding-broker-impl.yang | 0 opendaylight/md-sal/sal-binding-it/pom.xml | 5 +++++ .../md-sal/sal-inmemory-datastore/pom.xml | 5 ----- opendaylight/md-sal/samples/pom.xml | 12 +----------- 24 files changed, 30 insertions(+), 41 deletions(-) rename opendaylight/md-sal/{sal-binding-broker => sal-binding-config}/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModule.java (100%) rename opendaylight/md-sal/{sal-binding-broker => sal-binding-config}/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModuleFactory.java (100%) rename opendaylight/md-sal/{sal-binding-broker => sal-binding-config}/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModule.java (100%) rename opendaylight/md-sal/{sal-binding-broker => sal-binding-config}/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModuleFactory.java (100%) rename opendaylight/md-sal/{sal-binding-broker => sal-binding-config}/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModule.java (100%) rename opendaylight/md-sal/{sal-binding-broker => sal-binding-config}/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModuleFactory.java (100%) rename opendaylight/md-sal/{sal-binding-broker => sal-binding-config}/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModule.java (100%) rename opendaylight/md-sal/{sal-binding-broker => sal-binding-config}/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModuleFactory.java (100%) rename opendaylight/md-sal/{sal-binding-broker => sal-binding-config}/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/DummyNoopProvider.java (100%) rename opendaylight/md-sal/{sal-binding-broker => sal-binding-config}/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/ForwardedCompatibleDataBrokerImplModule.java (100%) rename opendaylight/md-sal/{sal-binding-broker => sal-binding-config}/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/ForwardedCompatibleDataBrokerImplModuleFactory.java (100%) rename opendaylight/md-sal/{sal-binding-broker => sal-binding-config}/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModule.java (100%) rename opendaylight/md-sal/{sal-binding-broker => sal-binding-config}/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModuleFactory.java (100%) rename opendaylight/md-sal/{sal-binding-broker => sal-binding-config}/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RpcBrokerImplModule.java (100%) rename opendaylight/md-sal/{sal-binding-broker => sal-binding-config}/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RpcBrokerImplModuleFactory.java (100%) rename opendaylight/md-sal/{sal-binding-broker => sal-binding-config}/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java (100%) rename opendaylight/md-sal/{sal-binding-broker => sal-binding-config}/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModuleFactory.java (100%) rename opendaylight/md-sal/{sal-binding-broker => sal-binding-config}/src/main/yang/opendaylight-binding-broker-impl.yang (100%) diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index 5328438b8a..9834008b0b 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -87,6 +87,10 @@ messagebus-spi messagebus-impl messagebus-config + + + sal-binding-it + sal-binding-dom-it @@ -217,16 +221,6 @@ - - integrationtests - - false - - - sal-binding-it - sal-binding-dom-it - - benchmarks diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml index 54e0d07cd4..7090781903 100644 --- a/opendaylight/md-sal/sal-binding-broker/pom.xml +++ b/opendaylight/md-sal/sal-binding-broker/pom.xml @@ -22,10 +22,6 @@ org.opendaylight.controller sal-binding-api - - org.opendaylight.controller - sal-binding-config - org.opendaylight.controller sal-binding-util @@ -119,21 +115,12 @@ ${project.groupId}.${project.artifactId} - org.opendaylight.controller.sal.binding.spi.*, - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.binding.impl.rev131028.*, - org.opendaylight.controller.config.yang.md.sal.binding.impl - - org.opendaylight.controller.sal.binding.impl, - org.opendaylight.controller.sal.binding.impl.*, - org.opendaylight.controller.sal.binding.codegen, - org.opendaylight.controller.sal.binding.codegen.*, org.opendaylight.controller.md.sal.binding.impl, org.opendaylight.controller.md.sal.binding.compat, org.opendaylight.controller.md.sal.binding.spi, - - org.opendaylight.controller.sal.binding.osgi.* - + org.opendaylight.controller.sal.binding.codegen.impl, + diff --git a/opendaylight/md-sal/sal-binding-config/pom.xml b/opendaylight/md-sal/sal-binding-config/pom.xml index edfe95b906..12ba3ccaa8 100644 --- a/opendaylight/md-sal/sal-binding-config/pom.xml +++ b/opendaylight/md-sal/sal-binding-config/pom.xml @@ -18,6 +18,14 @@ org.opendaylight.controller sal-binding-api + + org.opendaylight.controller + sal-core-api + + + org.opendaylight.controller + sal-binding-broker-impl + org.opendaylight.yangtools binding-data-codec @@ -30,6 +38,16 @@ org.apache.felix maven-bundle-plugin true + + + ${project.groupId}.${project.artifactId} + + {local-packages}, + org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.binding.impl.rev131028.*, + org.opendaylight.controller.config.yang.md.sal.binding.impl + + + org.opendaylight.yangtools diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModule.java similarity index 100% rename from opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModule.java rename to opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModule.java diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModuleFactory.java similarity index 100% rename from opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModuleFactory.java rename to opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModuleFactory.java diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModule.java similarity index 100% rename from opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModule.java rename to opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModule.java diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModuleFactory.java similarity index 100% rename from opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModuleFactory.java rename to opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModuleFactory.java diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModule.java similarity index 100% rename from opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModule.java rename to opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModule.java diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModuleFactory.java similarity index 100% rename from opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModuleFactory.java rename to opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModuleFactory.java diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModule.java similarity index 100% rename from opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModule.java rename to opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModule.java diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModuleFactory.java similarity index 100% rename from opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModuleFactory.java rename to opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModuleFactory.java diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/DummyNoopProvider.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/DummyNoopProvider.java similarity index 100% rename from opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/DummyNoopProvider.java rename to opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/DummyNoopProvider.java diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/ForwardedCompatibleDataBrokerImplModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/ForwardedCompatibleDataBrokerImplModule.java similarity index 100% rename from opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/ForwardedCompatibleDataBrokerImplModule.java rename to opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/ForwardedCompatibleDataBrokerImplModule.java diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/ForwardedCompatibleDataBrokerImplModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/ForwardedCompatibleDataBrokerImplModuleFactory.java similarity index 100% rename from opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/ForwardedCompatibleDataBrokerImplModuleFactory.java rename to opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/ForwardedCompatibleDataBrokerImplModuleFactory.java diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModule.java similarity index 100% rename from opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModule.java rename to opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModule.java diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModuleFactory.java similarity index 100% rename from opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModuleFactory.java rename to opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModuleFactory.java diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RpcBrokerImplModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RpcBrokerImplModule.java similarity index 100% rename from opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RpcBrokerImplModule.java rename to opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RpcBrokerImplModule.java diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RpcBrokerImplModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RpcBrokerImplModuleFactory.java similarity index 100% rename from opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RpcBrokerImplModuleFactory.java rename to opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RpcBrokerImplModuleFactory.java diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java similarity index 100% rename from opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java rename to opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModuleFactory.java similarity index 100% rename from opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModuleFactory.java rename to opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModuleFactory.java diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/yang/opendaylight-binding-broker-impl.yang b/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-binding-broker-impl.yang similarity index 100% rename from opendaylight/md-sal/sal-binding-broker/src/main/yang/opendaylight-binding-broker-impl.yang rename to opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-binding-broker-impl.yang diff --git a/opendaylight/md-sal/sal-binding-it/pom.xml b/opendaylight/md-sal/sal-binding-it/pom.xml index 37bf67d193..97e719f6c6 100644 --- a/opendaylight/md-sal/sal-binding-it/pom.xml +++ b/opendaylight/md-sal/sal-binding-it/pom.xml @@ -77,6 +77,11 @@ org.opendaylight.controller sal-binding-broker-impl + + org.opendaylight.controller + sal-binding-config + + org.opendaylight.yangtools.thirdparty antlr4-runtime-osgi-nohead diff --git a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml index 82277d3782..a152de96f9 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml +++ b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml @@ -29,11 +29,6 @@ sal-binding-api - - org.opendaylight.controller - sal-binding-config - - org.opendaylight.controller sal-common-api diff --git a/opendaylight/md-sal/samples/pom.xml b/opendaylight/md-sal/samples/pom.xml index af62b53852..5661177c11 100644 --- a/opendaylight/md-sal/samples/pom.xml +++ b/opendaylight/md-sal/samples/pom.xml @@ -17,6 +17,7 @@ toaster-provider toaster-config clustering-test-app + toaster-it scm:git:http://git.opendaylight.org/gerrit/controller.git @@ -25,15 +26,4 @@ https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL - - - integrationtests - - false - - - toaster-it - - - -- 2.36.6