From c016486964893bce2209986b211269593b6e5357 Mon Sep 17 00:00:00 2001 From: Rabi Panda Date: Thu, 11 Mar 2021 12:11:53 -0800 Subject: [PATCH] [Rename] refactor libs/plugin-cli and libs/secure-sm. (#261) Refactor the libs/plugin-cli and libs/secure-sm modules to rename the package names - `org.elasticsearch.plugins` to `org.opensearch.plugins` - `org.elasticsearch.secure_sm` to `org.opensearch.secure_sm` Signed-off-by: Rabi Panda --- .../plugins/ExtendedPluginsClassLoader.java | 2 +- libs/secure-sm/build.gradle | 4 ++-- .../{elasticsearch => opensearch}/secure_sm/SecureSM.java | 2 +- .../secure_sm/SuppressForbidden.java | 2 +- .../secure_sm/ThreadPermission.java | 2 +- .../secure_sm/SecureSMTests.java | 6 +++--- .../secure_sm/ThreadPermissionTests.java | 2 +- .../src/main/java/org/elasticsearch/bootstrap/Security.java | 2 +- .../org/elasticsearch/plugins/PluginLoaderIndirection.java | 2 ++ .../org/elasticsearch/bootstrap/BootstrapForTesting.java | 2 +- 10 files changed, 14 insertions(+), 12 deletions(-) rename libs/plugin-classloader/src/main/java/org/{elasticsearch => opensearch}/plugins/ExtendedPluginsClassLoader.java (98%) rename libs/secure-sm/src/main/java/org/{elasticsearch => opensearch}/secure_sm/SecureSM.java (99%) rename libs/secure-sm/src/main/java/org/{elasticsearch => opensearch}/secure_sm/SuppressForbidden.java (97%) rename libs/secure-sm/src/main/java/org/{elasticsearch => opensearch}/secure_sm/ThreadPermission.java (98%) rename libs/secure-sm/src/test/java/org/{elasticsearch => opensearch}/secure_sm/SecureSMTests.java (95%) rename libs/secure-sm/src/test/java/org/{elasticsearch => opensearch}/secure_sm/ThreadPermissionTests.java (98%) diff --git a/libs/plugin-classloader/src/main/java/org/elasticsearch/plugins/ExtendedPluginsClassLoader.java b/libs/plugin-classloader/src/main/java/org/opensearch/plugins/ExtendedPluginsClassLoader.java similarity index 98% rename from libs/plugin-classloader/src/main/java/org/elasticsearch/plugins/ExtendedPluginsClassLoader.java rename to libs/plugin-classloader/src/main/java/org/opensearch/plugins/ExtendedPluginsClassLoader.java index 8346725863f68..73be485a9aa27 100644 --- a/libs/plugin-classloader/src/main/java/org/elasticsearch/plugins/ExtendedPluginsClassLoader.java +++ b/libs/plugin-classloader/src/main/java/org/opensearch/plugins/ExtendedPluginsClassLoader.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.plugins; +package org.opensearch.plugins; import java.security.AccessController; import java.security.PrivilegedAction; diff --git a/libs/secure-sm/build.gradle b/libs/secure-sm/build.gradle index 39414fd3afc6e..7463d1da077b4 100644 --- a/libs/secure-sm/build.gradle +++ b/libs/secure-sm/build.gradle @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -apply plugin: 'elasticsearch.publish' +apply plugin: 'opensearch.publish' dependencies { // do not add non-test compile dependencies to secure-sm without a good reason to do so @@ -26,7 +26,7 @@ dependencies { testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}" testImplementation(project(":test:framework")) { - exclude group: 'org.elasticsearch', module: 'elasticsearch-secure-sm' + exclude group: 'org.opensearch', module: 'opensearch-secure-sm' } } diff --git a/libs/secure-sm/src/main/java/org/elasticsearch/secure_sm/SecureSM.java b/libs/secure-sm/src/main/java/org/opensearch/secure_sm/SecureSM.java similarity index 99% rename from libs/secure-sm/src/main/java/org/elasticsearch/secure_sm/SecureSM.java rename to libs/secure-sm/src/main/java/org/opensearch/secure_sm/SecureSM.java index bddb111f45bb6..93c6f4d2f5121 100644 --- a/libs/secure-sm/src/main/java/org/elasticsearch/secure_sm/SecureSM.java +++ b/libs/secure-sm/src/main/java/org/opensearch/secure_sm/SecureSM.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.secure_sm; +package org.opensearch.secure_sm; import java.security.AccessController; import java.security.Permission; diff --git a/libs/secure-sm/src/main/java/org/elasticsearch/secure_sm/SuppressForbidden.java b/libs/secure-sm/src/main/java/org/opensearch/secure_sm/SuppressForbidden.java similarity index 97% rename from libs/secure-sm/src/main/java/org/elasticsearch/secure_sm/SuppressForbidden.java rename to libs/secure-sm/src/main/java/org/opensearch/secure_sm/SuppressForbidden.java index 75a9acce06c72..a8fb10bc8a325 100644 --- a/libs/secure-sm/src/main/java/org/elasticsearch/secure_sm/SuppressForbidden.java +++ b/libs/secure-sm/src/main/java/org/opensearch/secure_sm/SuppressForbidden.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.secure_sm; +package org.opensearch.secure_sm; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/libs/secure-sm/src/main/java/org/elasticsearch/secure_sm/ThreadPermission.java b/libs/secure-sm/src/main/java/org/opensearch/secure_sm/ThreadPermission.java similarity index 98% rename from libs/secure-sm/src/main/java/org/elasticsearch/secure_sm/ThreadPermission.java rename to libs/secure-sm/src/main/java/org/opensearch/secure_sm/ThreadPermission.java index 8cdb68da99e8e..0f0a0f669e300 100644 --- a/libs/secure-sm/src/main/java/org/elasticsearch/secure_sm/ThreadPermission.java +++ b/libs/secure-sm/src/main/java/org/opensearch/secure_sm/ThreadPermission.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.secure_sm; +package org.opensearch.secure_sm; import java.security.BasicPermission; diff --git a/libs/secure-sm/src/test/java/org/elasticsearch/secure_sm/SecureSMTests.java b/libs/secure-sm/src/test/java/org/opensearch/secure_sm/SecureSMTests.java similarity index 95% rename from libs/secure-sm/src/test/java/org/elasticsearch/secure_sm/SecureSMTests.java rename to libs/secure-sm/src/test/java/org/opensearch/secure_sm/SecureSMTests.java index f39bcbc986665..3b4966f6a73c3 100644 --- a/libs/secure-sm/src/test/java/org/elasticsearch/secure_sm/SecureSMTests.java +++ b/libs/secure-sm/src/test/java/org/opensearch/secure_sm/SecureSMTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.secure_sm; +package org.opensearch.secure_sm; import junit.framework.TestCase; @@ -60,8 +60,8 @@ public void testClassCanExit() { assertTrue(SecureSM.classCanExit("com.carrotsearch.ant.tasks.junit4.slave.JvmExit", SecureSM.TEST_RUNNER_PACKAGES)); assertTrue(SecureSM.classCanExit("org.eclipse.jdt.internal.junit.runner.RemoteTestRunner", SecureSM.TEST_RUNNER_PACKAGES)); assertTrue(SecureSM.classCanExit("com.intellij.rt.execution.junit.JUnitStarter", SecureSM.TEST_RUNNER_PACKAGES)); - assertTrue(SecureSM.classCanExit("org.elasticsearch.Foo", new String[]{"org.elasticsearch.Foo"})); - assertFalse(SecureSM.classCanExit("org.elasticsearch.Foo", new String[]{"org.elasticsearch.Bar"})); + assertTrue(SecureSM.classCanExit("org.opensearch.Foo", new String[]{"org.opensearch.Foo"})); + assertFalse(SecureSM.classCanExit("org.opensearch.Foo", new String[]{"org.opensearch.Bar"})); } public void testCreateThread() throws Exception { diff --git a/libs/secure-sm/src/test/java/org/elasticsearch/secure_sm/ThreadPermissionTests.java b/libs/secure-sm/src/test/java/org/opensearch/secure_sm/ThreadPermissionTests.java similarity index 98% rename from libs/secure-sm/src/test/java/org/elasticsearch/secure_sm/ThreadPermissionTests.java rename to libs/secure-sm/src/test/java/org/opensearch/secure_sm/ThreadPermissionTests.java index b8c7282170aa7..7e1e375d9cfb6 100644 --- a/libs/secure-sm/src/test/java/org/elasticsearch/secure_sm/ThreadPermissionTests.java +++ b/libs/secure-sm/src/test/java/org/opensearch/secure_sm/ThreadPermissionTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.secure_sm; +package org.opensearch.secure_sm; import junit.framework.TestCase; diff --git a/server/src/main/java/org/elasticsearch/bootstrap/Security.java b/server/src/main/java/org/elasticsearch/bootstrap/Security.java index 616bb82eab73b..58281652d123c 100644 --- a/server/src/main/java/org/elasticsearch/bootstrap/Security.java +++ b/server/src/main/java/org/elasticsearch/bootstrap/Security.java @@ -27,7 +27,7 @@ import org.elasticsearch.http.HttpTransportSettings; import org.elasticsearch.plugins.PluginInfo; import org.elasticsearch.plugins.PluginsService; -import org.elasticsearch.secure_sm.SecureSM; +import org.opensearch.secure_sm.SecureSM; import org.elasticsearch.transport.TcpTransport; import java.io.IOException; diff --git a/server/src/main/java/org/elasticsearch/plugins/PluginLoaderIndirection.java b/server/src/main/java/org/elasticsearch/plugins/PluginLoaderIndirection.java index 7a07e4f08e849..4574e5fd30917 100644 --- a/server/src/main/java/org/elasticsearch/plugins/PluginLoaderIndirection.java +++ b/server/src/main/java/org/elasticsearch/plugins/PluginLoaderIndirection.java @@ -19,6 +19,8 @@ package org.elasticsearch.plugins; +import org.opensearch.plugins.ExtendedPluginsClassLoader; + import java.util.List; /** diff --git a/test/framework/src/main/java/org/elasticsearch/bootstrap/BootstrapForTesting.java b/test/framework/src/main/java/org/elasticsearch/bootstrap/BootstrapForTesting.java index 6834574d3971a..05f553afa7ba8 100644 --- a/test/framework/src/main/java/org/elasticsearch/bootstrap/BootstrapForTesting.java +++ b/test/framework/src/main/java/org/elasticsearch/bootstrap/BootstrapForTesting.java @@ -31,7 +31,7 @@ import org.elasticsearch.common.network.IfConfig; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.plugins.PluginInfo; -import org.elasticsearch.secure_sm.SecureSM; +import org.opensearch.secure_sm.SecureSM; import org.junit.Assert; import java.io.InputStream;