[Rename] o.e.bootstrap (#303)
This commit refactors the o.e.bootstrap package to o.opensearch.bootstrap. All references throughout the code are also refactored. Signed-off-by: Nicholas Knize <nknize@amazon.com>
This commit is contained in:
parent
5ad13ca2f7
commit
8737443c9d
|
@ -207,7 +207,7 @@ if not "%SERVICE_USERNAME%" == "" (
|
|||
set SERVICE_PARAMS=%SERVICE_PARAMS% --ServiceUser "%SERVICE_USERNAME%" --ServicePassword "%SERVICE_PASSWORD%"
|
||||
)
|
||||
)
|
||||
"%EXECUTABLE%" //IS//%SERVICE_ID% --Startup %ES_START_TYPE% --StopTimeout %ES_STOP_TIMEOUT% --StartClass org.elasticsearch.bootstrap.OpenSearch --StartMethod main ++StartParams --quiet --StopClass org.elasticsearch.bootstrap.OpenSearch --StopMethod close --Classpath "%ES_CLASSPATH%" --JvmMs %JVM_MS% --JvmMx %JVM_MX% --JvmSs %JVM_SS% --JvmOptions %OTHER_JAVA_OPTS% ++JvmOptions %ES_PARAMS% %LOG_OPTS% --PidFile "%SERVICE_ID%.pid" --DisplayName "%SERVICE_DISPLAY_NAME%" --Description "%SERVICE_DESCRIPTION%" --Jvm "%JAVA_HOME%%JVM_DLL%" --StartMode jvm --StopMode jvm --StartPath "%ES_HOME%" %SERVICE_PARAMS% ++Environment HOSTNAME="%%COMPUTERNAME%%"
|
||||
"%EXECUTABLE%" //IS//%SERVICE_ID% --Startup %ES_START_TYPE% --StopTimeout %ES_STOP_TIMEOUT% --StartClass org.opensearch.bootstrap.OpenSearch --StartMethod main ++StartParams --quiet --StopClass org.opensearch.bootstrap.OpenSearch --StopMethod close --Classpath "%ES_CLASSPATH%" --JvmMs %JVM_MS% --JvmMx %JVM_MX% --JvmSs %JVM_SS% --JvmOptions %OTHER_JAVA_OPTS% ++JvmOptions %ES_PARAMS% %LOG_OPTS% --PidFile "%SERVICE_ID%.pid" --DisplayName "%SERVICE_DISPLAY_NAME%" --Description "%SERVICE_DESCRIPTION%" --Jvm "%JAVA_HOME%%JVM_DLL%" --StartMode jvm --StopMode jvm --StartPath "%ES_HOME%" %SERVICE_PARAMS% ++Environment HOSTNAME="%%COMPUTERNAME%%"
|
||||
|
||||
if not errorlevel 1 goto installed
|
||||
echo Failed installing '%SERVICE_ID%' service
|
||||
|
|
|
@ -101,7 +101,7 @@ ECHO.!KEYSTORE_PASSWORD!| %JAVA% %ES_JAVA_OPTS% -Delasticsearch ^
|
|||
-Des.path.home="%ES_HOME%" -Des.path.conf="%ES_PATH_CONF%" ^
|
||||
-Des.distribution.type="%ES_DISTRIBUTION_TYPE%" ^
|
||||
-Des.bundled_jdk="%ES_BUNDLED_JDK%" ^
|
||||
-cp "%ES_CLASSPATH%" "org.elasticsearch.bootstrap.OpenSearch" !newparams!
|
||||
-cp "%ES_CLASSPATH%" "org.opensearch.bootstrap.OpenSearch" !newparams!
|
||||
|
||||
endlocal
|
||||
endlocal
|
||||
|
|
|
@ -28,6 +28,7 @@ import org.elasticsearch.env.Environment;
|
|||
import org.elasticsearch.test.ESTestCase;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.opensearch.bootstrap.Bootstrap;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.IOException;
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
package org.opensearch.painless;
|
||||
|
||||
import org.elasticsearch.bootstrap.BootstrapInfo;
|
||||
import org.opensearch.bootstrap.BootstrapInfo;
|
||||
import org.opensearch.painless.antlr.Walker;
|
||||
import org.opensearch.painless.ir.ClassNode;
|
||||
import org.opensearch.painless.lookup.PainlessLookup;
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
package org.opensearch.painless.lookup;
|
||||
|
||||
import org.elasticsearch.bootstrap.BootstrapInfo;
|
||||
import org.opensearch.bootstrap.BootstrapInfo;
|
||||
import org.opensearch.painless.Def;
|
||||
import org.opensearch.painless.MethodWriter;
|
||||
import org.opensearch.painless.WriterConstants;
|
||||
|
|
|
@ -26,7 +26,7 @@ import org.elasticsearch.action.search.TransportSearchAction;
|
|||
import org.opensearch.action.support.AutoCreateIndex;
|
||||
import org.opensearch.action.support.DestructiveOperations;
|
||||
import org.opensearch.action.support.replication.TransportReplicationAction;
|
||||
import org.elasticsearch.bootstrap.BootstrapSettings;
|
||||
import org.opensearch.bootstrap.BootstrapSettings;
|
||||
import org.opensearch.client.Client;
|
||||
import org.opensearch.client.transport.TransportClient;
|
||||
import org.opensearch.cluster.ClusterModule;
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.bootstrap;
|
||||
package org.opensearch.bootstrap;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
@ -29,6 +29,8 @@ import org.apache.lucene.util.Constants;
|
|||
import org.apache.lucene.util.StringHelper;
|
||||
import org.opensearch.OpenSearchException;
|
||||
import org.elasticsearch.Version;
|
||||
import org.elasticsearch.bootstrap.JarHell;
|
||||
import org.elasticsearch.bootstrap.JavaVersion;
|
||||
import org.opensearch.cli.KeyStoreAwareCommand;
|
||||
import org.opensearch.cli.Terminal;
|
||||
import org.opensearch.cli.UserException;
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.bootstrap;
|
||||
package org.opensearch.bootstrap;
|
||||
|
||||
import java.util.Objects;
|
||||
|
|
@ -17,12 +17,13 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.bootstrap;
|
||||
package org.opensearch.bootstrap;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.apache.logging.log4j.message.ParameterizedMessage;
|
||||
import org.apache.lucene.util.Constants;
|
||||
import org.elasticsearch.bootstrap.JavaVersion;
|
||||
import org.opensearch.cluster.coordination.ClusterBootstrapService;
|
||||
import org.elasticsearch.common.SuppressForbidden;
|
||||
import org.elasticsearch.common.io.PathUtils;
|
|
@ -16,7 +16,7 @@
|
|||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.elasticsearch.bootstrap;
|
||||
package org.opensearch.bootstrap;
|
||||
|
||||
import org.opensearch.cluster.metadata.Metadata;
|
||||
import org.elasticsearch.common.settings.Settings;
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.bootstrap;
|
||||
package org.opensearch.bootstrap;
|
||||
|
||||
import java.nio.file.Path;
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.bootstrap;
|
||||
package org.opensearch.bootstrap;
|
||||
|
||||
import org.elasticsearch.common.SuppressForbidden;
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.bootstrap;
|
||||
package org.opensearch.bootstrap;
|
||||
|
||||
import org.elasticsearch.common.settings.Setting;
|
||||
import org.elasticsearch.common.settings.Setting.Property;
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.bootstrap;
|
||||
package org.opensearch.bootstrap;
|
||||
|
||||
public interface ConsoleCtrlHandler {
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.bootstrap;
|
||||
package org.opensearch.bootstrap;
|
||||
|
||||
import org.elasticsearch.common.SuppressForbidden;
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.bootstrap;
|
||||
package org.opensearch.bootstrap;
|
||||
|
||||
import com.sun.jna.Native;
|
||||
import com.sun.jna.NativeLong;
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.bootstrap;
|
||||
package org.opensearch.bootstrap;
|
||||
|
||||
import com.sun.jna.IntegerType;
|
||||
import com.sun.jna.Native;
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.bootstrap;
|
||||
package org.opensearch.bootstrap;
|
||||
|
||||
import com.sun.jna.Native;
|
||||
import com.sun.jna.Pointer;
|
||||
|
@ -26,11 +26,11 @@ import com.sun.jna.WString;
|
|||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.apache.lucene.util.Constants;
|
||||
import org.elasticsearch.monitor.jvm.JvmInfo;
|
||||
import org.opensearch.monitor.jvm.JvmInfo;
|
||||
|
||||
import java.nio.file.Path;
|
||||
|
||||
import static org.elasticsearch.bootstrap.JNAKernel32Library.SizeT;
|
||||
import static org.opensearch.bootstrap.JNAKernel32Library.SizeT;
|
||||
|
||||
/**
|
||||
* This class performs the actual work with JNA and library bindings to call native methods. It should only be used after
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.bootstrap;
|
||||
package org.opensearch.bootstrap;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.bootstrap;
|
||||
package org.opensearch.bootstrap;
|
||||
|
||||
import joptsimple.OptionSet;
|
||||
import joptsimple.OptionSpec;
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.bootstrap;
|
||||
package org.opensearch.bootstrap;
|
||||
|
||||
import org.elasticsearch.common.SuppressForbidden;
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.bootstrap;
|
||||
package org.opensearch.bootstrap;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
|
@ -17,16 +17,17 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.bootstrap;
|
||||
package org.opensearch.bootstrap;
|
||||
|
||||
import org.elasticsearch.bootstrap.JarHell;
|
||||
import org.opensearch.cli.Command;
|
||||
import org.elasticsearch.common.SuppressForbidden;
|
||||
import org.elasticsearch.common.io.PathUtils;
|
||||
import org.elasticsearch.common.settings.Settings;
|
||||
import org.elasticsearch.env.Environment;
|
||||
import org.elasticsearch.http.HttpTransportSettings;
|
||||
import org.elasticsearch.plugins.PluginInfo;
|
||||
import org.elasticsearch.plugins.PluginsService;
|
||||
import org.opensearch.http.HttpTransportSettings;
|
||||
import org.opensearch.plugins.PluginInfo;
|
||||
import org.opensearch.plugins.PluginsService;
|
||||
import org.opensearch.secure_sm.SecureSM;
|
||||
import org.opensearch.transport.TcpTransport;
|
||||
|
||||
|
@ -54,8 +55,8 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import static org.elasticsearch.bootstrap.FilePermissionUtils.addDirectoryPath;
|
||||
import static org.elasticsearch.bootstrap.FilePermissionUtils.addSingleFilePath;
|
||||
import static org.opensearch.bootstrap.FilePermissionUtils.addDirectoryPath;
|
||||
import static org.opensearch.bootstrap.FilePermissionUtils.addSingleFilePath;
|
||||
|
||||
/**
|
||||
* Initializes SecurityManager with necessary permissions.
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.bootstrap;
|
||||
package org.opensearch.bootstrap;
|
||||
|
||||
import org.apache.lucene.util.Constants;
|
||||
import org.elasticsearch.core.internal.io.IOUtils;
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.bootstrap;
|
||||
package org.opensearch.bootstrap;
|
||||
|
||||
import org.elasticsearch.common.inject.CreationException;
|
||||
import org.elasticsearch.common.inject.spi.Message;
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.bootstrap;
|
||||
package org.opensearch.bootstrap;
|
||||
|
||||
import com.sun.jna.Library;
|
||||
import com.sun.jna.Memory;
|
|
@ -20,7 +20,7 @@
|
|||
package org.elasticsearch.monitor.process;
|
||||
|
||||
import org.apache.lucene.util.Constants;
|
||||
import org.elasticsearch.bootstrap.BootstrapInfo;
|
||||
import org.opensearch.bootstrap.BootstrapInfo;
|
||||
import org.elasticsearch.test.ESTestCase;
|
||||
|
||||
import static org.elasticsearch.monitor.jvm.JvmInfo.jvmInfo;
|
||||
|
|
|
@ -20,8 +20,8 @@ package org.elasticsearch.node;
|
|||
|
||||
import org.apache.lucene.util.LuceneTestCase;
|
||||
import org.apache.lucene.util.SetOnce;
|
||||
import org.elasticsearch.bootstrap.BootstrapCheck;
|
||||
import org.elasticsearch.bootstrap.BootstrapContext;
|
||||
import org.opensearch.bootstrap.BootstrapCheck;
|
||||
import org.opensearch.bootstrap.BootstrapContext;
|
||||
import org.opensearch.cluster.ClusterName;
|
||||
import org.elasticsearch.common.breaker.CircuitBreaker;
|
||||
import org.elasticsearch.common.network.NetworkModule;
|
||||
|
|
|
@ -31,6 +31,12 @@ import org.elasticsearch.common.io.PathUtils;
|
|||
import org.elasticsearch.common.network.IfConfig;
|
||||
import org.elasticsearch.common.settings.Settings;
|
||||
import org.elasticsearch.plugins.PluginInfo;
|
||||
import org.opensearch.bootstrap.Bootstrap;
|
||||
import org.opensearch.bootstrap.BootstrapInfo;
|
||||
import org.opensearch.bootstrap.BootstrapSettings;
|
||||
import org.opensearch.bootstrap.FilePermissionUtils;
|
||||
import org.opensearch.bootstrap.OpenSearchPolicy;
|
||||
import org.opensearch.bootstrap.Security;
|
||||
import org.opensearch.secure_sm.SecureSM;
|
||||
import org.junit.Assert;
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
package org.elasticsearch.test;
|
||||
|
||||
import org.opensearch.Version;
|
||||
import org.elasticsearch.bootstrap.BootstrapContext;
|
||||
import org.opensearch.bootstrap.BootstrapContext;
|
||||
import org.opensearch.cluster.metadata.Metadata;
|
||||
import org.elasticsearch.common.settings.Settings;
|
||||
import org.elasticsearch.env.Environment;
|
||||
|
|
Loading…
Reference in New Issue