From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 21 Jun 2024 15:08:44 +0000 (+0200)
Subject: Rename binding-runtime-dynamic to binding-loader
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=HEAD;p=yangtools.git

Rename binding-runtime-dynamic to binding-loader

Rename the artifact and adjust the exported packages.

JIRA: YANGTOOLS-1576
Change-Id: Ib6ffd9b30dc9b14c381a9adb41b2134a14a3d1dc
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 038cf6fa04..a2f4fd11b6 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -336,6 +336,11 @@
                 <artifactId>binding-data-codec-spi</artifactId>
                 <version>14.0.0-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>binding-loader</artifactId>
+                <version>14.0.0-SNAPSHOT</version>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>binding-model-api</artifactId>
@@ -366,11 +371,6 @@
                 <artifactId>binding-runtime-api</artifactId>
                 <version>14.0.0-SNAPSHOT</version>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>binding-runtime-dynamic</artifactId>
-                <version>14.0.0-SNAPSHOT</version>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>binding-runtime-osgi</artifactId>
diff --git a/binding/binding-data-codec-dynamic/pom.xml b/binding/binding-data-codec-dynamic/pom.xml
index dd84245d6a..0e02214a0d 100644
--- a/binding/binding-data-codec-dynamic/pom.xml
+++ b/binding/binding-data-codec-dynamic/pom.xml
@@ -62,15 +62,15 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>binding-model-api</artifactId>
+            <artifactId>binding-loader</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>binding-runtime-api</artifactId>
+            <artifactId>binding-model-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>binding-runtime-dynamic</artifactId>
+            <artifactId>binding-runtime-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
diff --git a/binding/binding-data-codec-dynamic/src/main/java/module-info.java b/binding/binding-data-codec-dynamic/src/main/java/module-info.java
index 8b512149c2..8b137fd21e 100644
--- a/binding/binding-data-codec-dynamic/src/main/java/module-info.java
+++ b/binding/binding-data-codec-dynamic/src/main/java/module-info.java
@@ -28,10 +28,10 @@ module org.opendaylight.yangtools.binding.data.codec.dynamic {
     requires transitive org.opendaylight.yangtools.binding.runtime.api;
     requires com.google.common;
     requires net.bytebuddy;
-    requires org.opendaylight.mdsal.binding.loader;
+    requires org.opendaylight.yangtools.binding.loader;
+    requires org.opendaylight.yangtools.binding.model.api;
     requires org.opendaylight.yangtools.binding.reflect;
     requires org.opendaylight.yangtools.binding.spec;
-    requires org.opendaylight.yangtools.binding.model.api;
     requires org.opendaylight.yangtools.concepts;
     requires org.opendaylight.yangtools.util;
     requires org.opendaylight.yangtools.yang.common;
diff --git a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/AbstractOpaqueCodecContext.java b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/AbstractOpaqueCodecContext.java
index 8cfd61dd34..d6db28ff90 100644
--- a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/AbstractOpaqueCodecContext.java
+++ b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/AbstractOpaqueCodecContext.java
@@ -19,11 +19,11 @@ import net.bytebuddy.ByteBuddy;
 import net.bytebuddy.dynamic.DynamicType.Builder;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.mdsal.binding.loader.BindingClassLoader;
-import org.opendaylight.mdsal.binding.loader.BindingClassLoader.GeneratorResult;
 import org.opendaylight.yangtools.binding.OpaqueData;
 import org.opendaylight.yangtools.binding.OpaqueObject;
 import org.opendaylight.yangtools.binding.data.codec.api.BindingOpaqueObjectCodecTreeNode;
+import org.opendaylight.yangtools.binding.loader.BindingClassLoader;
+import org.opendaylight.yangtools.binding.loader.BindingClassLoader.GeneratorResult;
 import org.opendaylight.yangtools.yang.data.api.schema.ForeignDataNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
diff --git a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/AnydataCodecContext.java b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/AnydataCodecContext.java
index 4967b17cc7..13b4dbc438 100644
--- a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/AnydataCodecContext.java
+++ b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/AnydataCodecContext.java
@@ -8,9 +8,9 @@
 package org.opendaylight.yangtools.binding.data.codec.impl;
 
 import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.mdsal.binding.loader.BindingClassLoader;
 import org.opendaylight.yangtools.binding.OpaqueData;
 import org.opendaylight.yangtools.binding.OpaqueObject;
+import org.opendaylight.yangtools.binding.loader.BindingClassLoader;
 import org.opendaylight.yangtools.yang.data.api.schema.AnydataNode;
 import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes;
 import org.opendaylight.yangtools.yang.model.api.AnydataSchemaNode;
diff --git a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/AnyxmlCodecContext.java b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/AnyxmlCodecContext.java
index 15792aa6c8..e970909d10 100644
--- a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/AnyxmlCodecContext.java
+++ b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/AnyxmlCodecContext.java
@@ -10,9 +10,9 @@ package org.opendaylight.yangtools.binding.data.codec.impl;
 import static com.google.common.base.Verify.verify;
 
 import javax.xml.transform.dom.DOMSource;
-import org.opendaylight.mdsal.binding.loader.BindingClassLoader;
 import org.opendaylight.yangtools.binding.OpaqueData;
 import org.opendaylight.yangtools.binding.OpaqueObject;
+import org.opendaylight.yangtools.binding.loader.BindingClassLoader;
 import org.opendaylight.yangtools.yang.data.api.schema.AnyxmlNode;
 import org.opendaylight.yangtools.yang.data.api.schema.DOMSourceAnyxmlNode;
 import org.opendaylight.yangtools.yang.data.api.schema.ForeignDataNode;
diff --git a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/BindingCodecContext.java b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/BindingCodecContext.java
index 8a6f52d5e7..797fdb7813 100644
--- a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/BindingCodecContext.java
+++ b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/BindingCodecContext.java
@@ -41,7 +41,6 @@ import java.util.concurrent.ExecutionException;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.kohsuke.MetaInfServices;
-import org.opendaylight.mdsal.binding.loader.BindingClassLoader;
 import org.opendaylight.yangtools.binding.Action;
 import org.opendaylight.yangtools.binding.Augmentation;
 import org.opendaylight.yangtools.binding.BaseIdentity;
@@ -72,6 +71,7 @@ import org.opendaylight.yangtools.binding.data.codec.api.MissingSchemaException;
 import org.opendaylight.yangtools.binding.data.codec.spi.AbstractBindingNormalizedNodeSerializer;
 import org.opendaylight.yangtools.binding.data.codec.spi.BindingDOMCodecServices;
 import org.opendaylight.yangtools.binding.data.codec.spi.BindingSchemaMapping;
+import org.opendaylight.yangtools.binding.loader.BindingClassLoader;
 import org.opendaylight.yangtools.binding.model.api.JavaTypeName;
 import org.opendaylight.yangtools.binding.reflect.BindingReflections;
 import org.opendaylight.yangtools.binding.runtime.api.ActionRuntimeType;
diff --git a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/ClassGeneratorBridge.java b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/ClassGeneratorBridge.java
index dae4d575d7..eb4ba7b0a8 100644
--- a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/ClassGeneratorBridge.java
+++ b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/ClassGeneratorBridge.java
@@ -13,7 +13,7 @@ import com.google.common.annotations.Beta;
 import java.util.function.Supplier;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.mdsal.binding.loader.BindingClassLoader.ClassGenerator;
+import org.opendaylight.yangtools.binding.loader.BindingClassLoader.ClassGenerator;
 
 /**
  * Bridge for initializing generated instance constants during class loading time. This class is public only due to
diff --git a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/CodecContextFactory.java b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/CodecContextFactory.java
index 3169ce2f2a..de59b5e59d 100644
--- a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/CodecContextFactory.java
+++ b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/CodecContextFactory.java
@@ -10,7 +10,7 @@ package org.opendaylight.yangtools.binding.data.codec.impl;
 import com.google.common.collect.ImmutableMap;
 import java.lang.reflect.Method;
 import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.mdsal.binding.loader.BindingClassLoader;
+import org.opendaylight.yangtools.binding.loader.BindingClassLoader;
 import org.opendaylight.yangtools.binding.runtime.api.BindingRuntimeContext;
 import org.opendaylight.yangtools.binding.runtime.api.ListRuntimeType;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
diff --git a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/CodecDataObjectGenerator.java b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/CodecDataObjectGenerator.java
index 37031e3063..51f9f3a285 100644
--- a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/CodecDataObjectGenerator.java
+++ b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/CodecDataObjectGenerator.java
@@ -41,12 +41,12 @@ import net.bytebuddy.implementation.bytecode.member.MethodReturn;
 import net.bytebuddy.implementation.bytecode.member.MethodVariableAccess;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.mdsal.binding.loader.BindingClassLoader;
-import org.opendaylight.mdsal.binding.loader.BindingClassLoader.ClassGenerator;
-import org.opendaylight.mdsal.binding.loader.BindingClassLoader.GeneratorResult;
 import org.opendaylight.yangtools.binding.contract.Naming;
 import org.opendaylight.yangtools.binding.data.codec.impl.ClassGeneratorBridge.CodecContextSupplierProvider;
 import org.opendaylight.yangtools.binding.data.codec.impl.ClassGeneratorBridge.LocalNameProvider;
+import org.opendaylight.yangtools.binding.loader.BindingClassLoader;
+import org.opendaylight.yangtools.binding.loader.BindingClassLoader.ClassGenerator;
+import org.opendaylight.yangtools.binding.loader.BindingClassLoader.GeneratorResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/CodecPackage.java b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/CodecPackage.java
index 1928fa3109..0699b474b2 100644
--- a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/CodecPackage.java
+++ b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/CodecPackage.java
@@ -11,9 +11,9 @@ import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
 import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.mdsal.binding.loader.BindingClassLoader;
-import org.opendaylight.mdsal.binding.loader.BindingClassLoader.ClassGenerator;
 import org.opendaylight.yangtools.binding.contract.Naming;
+import org.opendaylight.yangtools.binding.loader.BindingClassLoader;
+import org.opendaylight.yangtools.binding.loader.BindingClassLoader.ClassGenerator;
 
 /**
  * Centralized registry of Java package names used by classes generated by codec components.
@@ -34,7 +34,7 @@ enum CodecPackage {
 
     private static final int PACKAGE_PREFIX_LENGTH = Naming.PACKAGE_PREFIX.length();
 
-    private String packagePrefix;
+    private final String packagePrefix;
 
     CodecPackage(final String packagePrefix) {
         this.packagePrefix = requireNonNull(packagePrefix);
diff --git a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/DataContainerStreamerGenerator.java b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/DataContainerStreamerGenerator.java
index e83f7a3edf..0763acf6d1 100644
--- a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/DataContainerStreamerGenerator.java
+++ b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/DataContainerStreamerGenerator.java
@@ -48,9 +48,6 @@ import net.bytebuddy.jar.asm.Opcodes;
 import net.bytebuddy.matcher.ElementMatcher;
 import net.bytebuddy.matcher.ElementMatchers;
 import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.mdsal.binding.loader.BindingClassLoader;
-import org.opendaylight.mdsal.binding.loader.BindingClassLoader.ClassGenerator;
-import org.opendaylight.mdsal.binding.loader.BindingClassLoader.GeneratorResult;
 import org.opendaylight.yangtools.binding.Augmentable;
 import org.opendaylight.yangtools.binding.DataContainer;
 import org.opendaylight.yangtools.binding.DataObject;
@@ -59,6 +56,9 @@ import org.opendaylight.yangtools.binding.KeyAware;
 import org.opendaylight.yangtools.binding.contract.Naming;
 import org.opendaylight.yangtools.binding.data.codec.api.BindingStreamEventWriter;
 import org.opendaylight.yangtools.binding.data.codec.spi.BindingSchemaMapping;
+import org.opendaylight.yangtools.binding.loader.BindingClassLoader;
+import org.opendaylight.yangtools.binding.loader.BindingClassLoader.ClassGenerator;
+import org.opendaylight.yangtools.binding.loader.BindingClassLoader.GeneratorResult;
 import org.opendaylight.yangtools.binding.model.api.GeneratedType;
 import org.opendaylight.yangtools.binding.model.api.ParameterizedType;
 import org.opendaylight.yangtools.binding.model.api.Type;
diff --git a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/NotificationCodecContext.java b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/NotificationCodecContext.java
index 38f0a5c194..be2f9c8ecb 100644
--- a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/NotificationCodecContext.java
+++ b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/NotificationCodecContext.java
@@ -34,10 +34,10 @@ import net.bytebuddy.implementation.bytecode.member.MethodVariableAccess;
 import net.bytebuddy.jar.asm.Opcodes;
 import net.bytebuddy.matcher.ElementMatchers;
 import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.mdsal.binding.loader.BindingClassLoader.GeneratorResult;
 import org.opendaylight.yangtools.binding.BaseNotification;
 import org.opendaylight.yangtools.binding.DataObject;
 import org.opendaylight.yangtools.binding.EventInstantAware;
+import org.opendaylight.yangtools.binding.loader.BindingClassLoader.GeneratorResult;
 import org.opendaylight.yangtools.binding.runtime.api.NotificationRuntimeType;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
diff --git a/binding/binding-data-codec-dynamic/src/test/java/org/opendaylight/yangtools/binding/data/codec/impl/CodecClassLoaderTest.java b/binding/binding-data-codec-dynamic/src/test/java/org/opendaylight/yangtools/binding/data/codec/impl/CodecClassLoaderTest.java
index ae6b4d38ea..490e80c4ca 100644
--- a/binding/binding-data-codec-dynamic/src/test/java/org/opendaylight/yangtools/binding/data/codec/impl/CodecClassLoaderTest.java
+++ b/binding/binding-data-codec-dynamic/src/test/java/org/opendaylight/yangtools/binding/data/codec/impl/CodecClassLoaderTest.java
@@ -17,9 +17,9 @@ import net.bytebuddy.matcher.ElementMatchers;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.opendaylight.mdsal.binding.loader.BindingClassLoader;
-import org.opendaylight.mdsal.binding.loader.BindingClassLoader.GeneratorResult;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.union.test.rev220428.Top;
+import org.opendaylight.yangtools.binding.loader.BindingClassLoader;
+import org.opendaylight.yangtools.binding.loader.BindingClassLoader.GeneratorResult;
 
 public class CodecClassLoaderTest {
     private final BindingClassLoader codecClassLoader = BindingClassLoader.create(CodecClassLoaderTest.class, null);
diff --git a/binding/binding-runtime-dynamic/pom.xml b/binding/binding-loader/pom.xml
similarity index 97%
rename from binding/binding-runtime-dynamic/pom.xml
rename to binding/binding-loader/pom.xml
index 732e2fb0c5..8c67b51bc8 100644
--- a/binding/binding-runtime-dynamic/pom.xml
+++ b/binding/binding-loader/pom.xml
@@ -16,7 +16,7 @@
         <relativePath>../../bundle-parent</relativePath>
     </parent>
 
-    <artifactId>binding-runtime-dynamic</artifactId>
+    <artifactId>binding-loader</artifactId>
     <packaging>bundle</packaging>
     <description>YANG Binding runtime for JIT environments</description>
 
diff --git a/binding/binding-runtime-dynamic/src/main/java/module-info.java b/binding/binding-loader/src/main/java/module-info.java
similarity index 86%
rename from binding/binding-runtime-dynamic/src/main/java/module-info.java
rename to binding/binding-loader/src/main/java/module-info.java
index 377d6aa506..5f15992e4f 100644
--- a/binding/binding-runtime-dynamic/src/main/java/module-info.java
+++ b/binding/binding-loader/src/main/java/module-info.java
@@ -5,13 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 /**
  * A ClassLoader for binding constructs. It allows loading of runtime-generated classes with a combined visibility with
  * a set of parent class loaders.
  */
-module org.opendaylight.mdsal.binding.loader {
-    exports org.opendaylight.mdsal.binding.loader;
+module org.opendaylight.yangtools.binding.loader {
+    exports org.opendaylight.yangtools.binding.loader;
 
     requires transitive net.bytebuddy;
 
diff --git a/binding/binding-runtime-dynamic/src/main/java/org/opendaylight/mdsal/binding/loader/BindingClassLoader.java b/binding/binding-loader/src/main/java/org/opendaylight/yangtools/binding/loader/BindingClassLoader.java
similarity index 99%
rename from binding/binding-runtime-dynamic/src/main/java/org/opendaylight/mdsal/binding/loader/BindingClassLoader.java
rename to binding/binding-loader/src/main/java/org/opendaylight/yangtools/binding/loader/BindingClassLoader.java
index 2a75829d5d..988d8be761 100644
--- a/binding/binding-runtime-dynamic/src/main/java/org/opendaylight/mdsal/binding/loader/BindingClassLoader.java
+++ b/binding/binding-loader/src/main/java/org/opendaylight/yangtools/binding/loader/BindingClassLoader.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.mdsal.binding.loader;
+package org.opendaylight.yangtools.binding.loader;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Verify.verify;
diff --git a/binding/binding-runtime-dynamic/src/main/java/org/opendaylight/mdsal/binding/loader/LeafBindingClassLoader.java b/binding/binding-loader/src/main/java/org/opendaylight/yangtools/binding/loader/LeafBindingClassLoader.java
similarity index 98%
rename from binding/binding-runtime-dynamic/src/main/java/org/opendaylight/mdsal/binding/loader/LeafBindingClassLoader.java
rename to binding/binding-loader/src/main/java/org/opendaylight/yangtools/binding/loader/LeafBindingClassLoader.java
index 856eab0726..f09842f1a7 100644
--- a/binding/binding-runtime-dynamic/src/main/java/org/opendaylight/mdsal/binding/loader/LeafBindingClassLoader.java
+++ b/binding/binding-loader/src/main/java/org/opendaylight/yangtools/binding/loader/LeafBindingClassLoader.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.mdsal.binding.loader;
+package org.opendaylight.yangtools.binding.loader;
 
 import static com.google.common.base.Verify.verify;
 import static java.util.Objects.requireNonNull;
diff --git a/binding/binding-runtime-dynamic/src/main/java/org/opendaylight/mdsal/binding/loader/RootBindingClassLoader.java b/binding/binding-loader/src/main/java/org/opendaylight/yangtools/binding/loader/RootBindingClassLoader.java
similarity index 98%
rename from binding/binding-runtime-dynamic/src/main/java/org/opendaylight/mdsal/binding/loader/RootBindingClassLoader.java
rename to binding/binding-loader/src/main/java/org/opendaylight/yangtools/binding/loader/RootBindingClassLoader.java
index 4d9cdcacff..d36dbdbcfd 100644
--- a/binding/binding-runtime-dynamic/src/main/java/org/opendaylight/mdsal/binding/loader/RootBindingClassLoader.java
+++ b/binding/binding-loader/src/main/java/org/opendaylight/yangtools/binding/loader/RootBindingClassLoader.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.mdsal.binding.loader;
+package org.opendaylight.yangtools.binding.loader;
 
 import static com.google.common.base.Verify.verify;
 
diff --git a/binding/binding-runtime-dynamic/src/main/java/org/opendaylight/mdsal/binding/loader/package-info.java b/binding/binding-loader/src/main/java/org/opendaylight/yangtools/binding/loader/package-info.java
similarity index 94%
rename from binding/binding-runtime-dynamic/src/main/java/org/opendaylight/mdsal/binding/loader/package-info.java
rename to binding/binding-loader/src/main/java/org/opendaylight/yangtools/binding/loader/package-info.java
index 12137d8729..9821f4a57f 100644
--- a/binding/binding-runtime-dynamic/src/main/java/org/opendaylight/mdsal/binding/loader/package-info.java
+++ b/binding/binding-loader/src/main/java/org/opendaylight/yangtools/binding/loader/package-info.java
@@ -14,4 +14,4 @@
  * While the interfaces and classes in this package may be publicly accessible, they are an implementation detail and
  * may change incompatibly at any time.
  */
-package org.opendaylight.mdsal.binding.loader;
\ No newline at end of file
+package org.opendaylight.yangtools.binding.loader;
\ No newline at end of file
diff --git a/binding/pom.xml b/binding/pom.xml
index 9898148d47..7059f6a613 100644
--- a/binding/pom.xml
+++ b/binding/pom.xml
@@ -34,13 +34,13 @@
         <module>binding-data-codec-dynamic</module>
         <module>binding-data-codec-osgi</module>
         <module>binding-data-codec-spi</module>
+        <module>binding-loader</module>
         <module>binding-model-api</module>
         <module>binding-model-ri</module>
         <module>binding-parent</module>
         <module>binding-reflect</module>
         <module>binding-ri</module>
         <module>binding-runtime-api</module>
-        <module>binding-runtime-dynamic</module>
         <module>binding-runtime-osgi</module>
         <module>binding-runtime-spi</module>
         <module>binding-spec</module>