Refactor bootstrap for JPMS support

Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>

Author: prudhvigodithi

buildSrc/src/main/groovy/org/opensearch/gradle/test/ClusterFormationTasks.groovy

@@ -925,12 +925,12 @@ class ClusterFormationTasks {
             standardOutput = new ByteArrayOutputStream()
             doLast {
                 String out = standardOutput.toString()
-                if (out.contains("${ext.pid} org.opensearch.bootstrap.OpenSearch") == false) {
+                if (out.contains("${ext.pid} org.opensearch.server.bootstrap.OpenSearch") == false) {
                     logger.error('jps -l')
                     logger.error(out)
                     logger.error("pid file: ${node.pidFile}")
                     logger.error("pid: ${ext.pid}")
-                    throw new GradleException("jps -l did not report any process with org.opensearch.bootstrap.OpenSearch\n" +
+                    throw new GradleException("jps -l did not report any process with org.opensearch.server.bootstrap.OpenSearch\n" +
                             "Did you run gradle clean? Maybe an old pid file is still lying around.")
                 } else {
                     logger.info(out)

…ces/org/opensearch/bootstrap/test.policy …/opensearch/server/bootstrap/test.policyclient/rest-high-level/src/test/resources/org/opensearch/bootstrap/test.policy renamed to client/rest-high-level/src/test/resources/org/opensearch/server/bootstrap/test.policy client/rest-high-level/src/test/resources/org/opensearch/bootstrap/test.policy renamed to client/rest-high-level/src/test/resources/org/opensearch/server/bootstrap/test.policy

@@ -69,7 +69,7 @@ if [[ $DAEMONIZE = false ]]; then
     -Dopensearch.distribution.type="$OPENSEARCH_DISTRIBUTION_TYPE" \
     -Dopensearch.bundled_jdk="$OPENSEARCH_BUNDLED_JDK" \
     -cp "$OPENSEARCH_CLASSPATH" \
-    org.opensearch.bootstrap.OpenSearch \
+    org.opensearch.server.bootstrap.OpenSearch \
     "$@" <<<"$KEYSTORE_PASSWORD"
 else
   exec \
@@ -81,7 +81,7 @@ else
     -Dopensearch.distribution.type="$OPENSEARCH_DISTRIBUTION_TYPE" \
     -Dopensearch.bundled_jdk="$OPENSEARCH_BUNDLED_JDK" \
     -cp "$OPENSEARCH_CLASSPATH" \
-    org.opensearch.bootstrap.OpenSearch \
+    org.opensearch.server.bootstrap.OpenSearch \
     "$@" \
     <<<"$KEYSTORE_PASSWORD" &
   retval=$?

distribution/src/bin/opensearch

@@ -222,7 +222,7 @@ if not "%SERVICE_USERNAME%" == "" (
 	)
 )
 rem //IS == Install Service
-"%EXECUTABLE%" //IS//%SERVICE_ID% --Startup %OPENSEARCH_START_TYPE% --StopTimeout %OPENSEARCH_STOP_TIMEOUT% --StartClass org.opensearch.bootstrap.OpenSearch --StartMethod main ++StartParams --quiet --StopClass org.opensearch.bootstrap.OpenSearch --StopMethod close --Classpath "%OPENSEARCH_CLASSPATH%" --JvmMs %JVM_MS% --JvmMx %JVM_MX% --JvmSs %JVM_SS% --JvmOptions %OTHER_JAVA_OPTS% ++JvmOptions %OPENSEARCH_PARAMS% %LOG_OPTS% --PidFile "%SERVICE_ID%.pid" --DisplayName "%SERVICE_DISPLAY_NAME%" --Description "%SERVICE_DESCRIPTION%" --Jvm "%JAVA_HOME%%JVM_DLL%" --StartMode jvm --StopMode jvm --StartPath "%OPENSEARCH_HOME%" %SERVICE_PARAMS% ++Environment HOSTNAME="%%COMPUTERNAME%%"
+"%EXECUTABLE%" //IS//%SERVICE_ID% --Startup %OPENSEARCH_START_TYPE% --StopTimeout %OPENSEARCH_STOP_TIMEOUT% --StartClass org.opensearch.server.bootstrap.OpenSearch --StartMethod main ++StartParams --quiet --StopClass org.opensearch.server.bootstrap.OpenSearch --StopMethod close --Classpath "%OPENSEARCH_CLASSPATH%" --JvmMs %JVM_MS% --JvmMx %JVM_MX% --JvmSs %JVM_SS% --JvmOptions %OTHER_JAVA_OPTS% ++JvmOptions %OPENSEARCH_PARAMS% %LOG_OPTS% --PidFile "%SERVICE_ID%.pid" --DisplayName "%SERVICE_DISPLAY_NAME%" --Description "%SERVICE_DESCRIPTION%" --Jvm "%JAVA_HOME%%JVM_DLL%" --StartMode jvm --StopMode jvm --StartPath "%OPENSEARCH_HOME%" %SERVICE_PARAMS% ++Environment HOSTNAME="%%COMPUTERNAME%%"
 
 if not errorlevel 1 goto installed
 echo Failed installing '%SERVICE_ID%' service

distribution/src/bin/opensearch-service.bat

@@ -110,7 +110,7 @@ ECHO.!KEYSTORE_PASSWORD!| "%JAVA%" %OPENSEARCH_JAVA_OPTS% -Dopensearch ^
   -Dopensearch.path.home="%OPENSEARCH_HOME%" -Dopensearch.path.conf="%OPENSEARCH_PATH_CONF%" ^
   -Dopensearch.distribution.type="%OPENSEARCH_DISTRIBUTION_TYPE%" ^
   -Dopensearch.bundled_jdk="%OPENSEARCH_BUNDLED_JDK%" ^
-  -cp "%OPENSEARCH_CLASSPATH%" "org.opensearch.bootstrap.OpenSearch" !newparams!
+  -cp "%OPENSEARCH_CLASSPATH%" "org.opensearch.server.bootstrap.OpenSearch" !newparams!
 
 endlocal
 endlocal

distribution/src/bin/opensearch.bat

@@ -29,7 +29,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.bootstrap;
+package org.opensearch.server.bootstrap;
 
 import org.opensearch.common.settings.KeyStoreCommandTestCase;
 import org.opensearch.common.settings.KeyStoreWrapper;

…opensearch/bootstrap/BootstrapTests.java …rch/server/bootstrap/BootstrapTests.javadistribution/tools/keystore-cli/src/test/java/org/opensearch/bootstrap/BootstrapTests.java renamed to distribution/tools/keystore-cli/src/test/java/org/opensearch/server/bootstrap/BootstrapTests.java distribution/tools/keystore-cli/src/test/java/org/opensearch/bootstrap/BootstrapTests.java renamed to distribution/tools/keystore-cli/src/test/java/org/opensearch/server/bootstrap/BootstrapTests.java

@@ -32,7 +32,6 @@
 
 package org.opensearch.painless;
 
-import org.opensearch.bootstrap.BootstrapInfo;
 import org.opensearch.painless.antlr.Walker;
 import org.opensearch.painless.ir.ClassNode;
 import org.opensearch.painless.lookup.PainlessLookup;
@@ -46,6 +45,7 @@
 import org.opensearch.painless.spi.Allowlist;
 import org.opensearch.painless.symbol.Decorations.IRNodeDecoration;
 import org.opensearch.painless.symbol.ScriptScope;
+import org.opensearch.server.bootstrap.BootstrapInfo;
 import org.objectweb.asm.util.Printer;
 
 import java.lang.reflect.Method;

modules/lang-painless/src/main/java/org/opensearch/painless/Compiler.java

@@ -32,7 +32,6 @@
 
 package org.opensearch.painless.lookup;
 
-import org.opensearch.bootstrap.BootstrapInfo;
 import org.opensearch.painless.Def;
 import org.opensearch.painless.MethodWriter;
 import org.opensearch.painless.WriterConstants;
@@ -45,6 +44,7 @@
 import org.opensearch.painless.spi.AllowlistMethod;
 import org.opensearch.painless.spi.annotation.InjectConstantAnnotation;
 import org.opensearch.painless.spi.annotation.NoImportAnnotation;
+import org.opensearch.server.bootstrap.BootstrapInfo;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.commons.GeneratorAdapter;

modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessLookupBuilder.java

@@ -40,10 +40,10 @@
 import org.apache.tika.parser.Parser;
 import org.apache.tika.parser.ParserDecorator;
 import org.opensearch.SpecialPermission;
-import org.opensearch.bootstrap.FilePermissionUtils;
 import org.opensearch.bootstrap.JarHell;
 import org.opensearch.common.SuppressForbidden;
 import org.opensearch.common.io.PathUtils;
+import org.opensearch.server.bootstrap.FilePermissionUtils;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

plugins/ingest-attachment/src/main/java/org/opensearch/ingest/attachment/TikaImpl.java

@@ -30,7 +30,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.bootstrap;
+package org.opensearch.server.bootstrap;
 
 import org.apache.logging.log4j.Logger;
 import org.opensearch.common.SuppressForbidden;
@@ -44,7 +44,7 @@
 import java.util.List;
 
 import static java.util.Collections.emptyList;
-import static org.opensearch.bootstrap.BootstrapChecks.OPENSEARCH_ENFORCE_BOOTSTRAP_CHECKS;
+import static org.opensearch.server.bootstrap.BootstrapChecks.OPENSEARCH_ENFORCE_BOOTSTRAP_CHECKS;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.hasToString;