Moved liquibase.Activator to liquibase.osgi.Activator

liquibase · Dec 8, 2021 · f4dbf0f · f4dbf0f
1 parent 7e62189
commit f4dbf0f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/liquibase-core/pom.xml b/liquibase-core/pom.xml
@@ -159,7 +159,7 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>org.liquibase.core</Bundle-SymbolicName>
-                        <Bundle-Activator>liquibase.Activator</Bundle-Activator>
+                        <Bundle-Activator>liquibase.osgi.Activator</Bundle-Activator>
                         <Import-Package>
                             javax.activation*;resolution:=optional,
                             javax.servlet.*;version="[2.6,4)";resolution:=optional,

diff --git a/liquibase-core/src/main/java/liquibase/Scope.java b/liquibase-core/src/main/java/liquibase/Scope.java
@@ -11,6 +11,7 @@
 import liquibase.logging.Logger;
 import liquibase.logging.core.JavaLogService;
 import liquibase.logging.core.LogServiceFactory;
+import liquibase.osgi.Activator;
 import liquibase.resource.ClassLoaderResourceAccessor;
 import liquibase.resource.ResourceAccessor;
 import liquibase.servicelocator.ServiceLocator;
@@ -96,7 +97,7 @@ public static Scope getCurrentScope() {
             }
 
             rootScope.values.put(Attr.serviceLocator.name(), serviceLocator);
-            rootScope.values.put(Attr.osgiPlatform.name(),Activator.OSGIContainerChecker.isOsgiPlatform());
+            rootScope.values.put(Attr.osgiPlatform.name(), Activator.OSGIContainerChecker.isOsgiPlatform());
         }
         return scopeManager.getCurrentScope();
     }

diff --git a/...re/src/main/java/liquibase/Activator.java → ...c/main/java/liquibase/osgi/Activator.java b/...re/src/main/java/liquibase/Activator.java → ...c/main/java/liquibase/osgi/Activator.java
@@ -1,10 +1,10 @@
-package liquibase;
+package liquibase.osgi;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
-import liquibase.Activator.LiquibaseBundle;
+import liquibase.osgi.Activator.LiquibaseBundle;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;

diff --git a/liquibase-core/src/main/java/liquibase/util/OsgiUtil.java b/liquibase-core/src/main/java/liquibase/util/OsgiUtil.java
@@ -2,8 +2,8 @@
 
 import java.util.List;
 import java.util.stream.Collectors;
-import liquibase.Activator;
-import liquibase.Activator.LiquibaseBundle;
+import liquibase.osgi.Activator;
+import liquibase.osgi.Activator.LiquibaseBundle;
 
 public final class OsgiUtil {
 
@@ -13,7 +13,7 @@ private OsgiUtil() {
     /**
      * try to load a class under OSGI environment. It will try to load the class
      * from all liquibase bundles registered via
-     * {@link liquibase.Activator Activator}
+     * {@link Activator Activator}
      *
      * @param <T>
      * @param className name of class
@@ -42,7 +42,7 @@ public static <T> Class<T> loadClass(String className) throws ClassNotFoundExcep
 
     /**
      *
-     * @param className
+     * @param clazz
      * @return true is a class is allowed
      * @throws java.lang.ClassNotFoundException
      */