diff --git a/community/server/pom.xml b/community/server/pom.xml index 02cc5d35ca42a..d47c07732a4c0 100644 --- a/community/server/pom.xml +++ b/community/server/pom.xml @@ -48,7 +48,7 @@ ${project.version} 1.0.1 - org.neo4j.server.CommunityBootstrapper + org.neo4j.server.CommunityEntryPoint target/generated-resources/appassembler/jsw target/test-classes/etc/neo-server diff --git a/community/server/src/main/java/org/neo4j/server/BlockingBootstrapper.java b/community/server/src/main/java/org/neo4j/server/BlockingBootstrapper.java index ec99ddcb19766..a33a51bd33e3d 100644 --- a/community/server/src/main/java/org/neo4j/server/BlockingBootstrapper.java +++ b/community/server/src/main/java/org/neo4j/server/BlockingBootstrapper.java @@ -40,7 +40,7 @@ public BlockingBootstrapper( Bootstrapper wrapped ) public final int start( File configFile, Pair... configOverrides ) { int status = wrapped.start( configFile, configOverrides ); - if ( status != BaseBootstrapper.OK ) + if ( status != ServerBootstrapper.OK ) { return status; } diff --git a/community/server/src/main/java/org/neo4j/server/CommunityBootstrapper.java b/community/server/src/main/java/org/neo4j/server/CommunityBootstrapper.java index 36a9a5be111ed..a2cf386b5db90 100644 --- a/community/server/src/main/java/org/neo4j/server/CommunityBootstrapper.java +++ b/community/server/src/main/java/org/neo4j/server/CommunityBootstrapper.java @@ -31,36 +31,11 @@ import static java.util.Arrays.asList; -public class CommunityBootstrapper extends BaseBootstrapper +public class CommunityBootstrapper extends ServerBootstrapper { public static final List> settingsClasses = asList( ServerSettings.class, GraphDatabaseSettings.class, DatabaseManagementSystemSettings.class ); - public static void main( String[] args ) - { - int status = start( new CommunityBootstrapper(), args ); - if ( status != 0 ) - { - System.exit( status ); - } - } - - private static BlockingBootstrapper bootstrapper; - - public static void start( String[] args ) - { - bootstrapper = new BlockingBootstrapper( new CommunityBootstrapper() ); - System.exit( start( bootstrapper, args ) ); - } - - public static void stop( @SuppressWarnings("UnusedParameters") String[] args ) - { - if ( bootstrapper != null ) - { - bootstrapper.stop(); - } - } - @Override protected NeoServer createNeoServer( Config config, GraphDatabaseDependencies dependencies, LogProvider logProvider ) diff --git a/community/server/src/main/java/org/neo4j/server/CommunityEntryPoint.java b/community/server/src/main/java/org/neo4j/server/CommunityEntryPoint.java new file mode 100644 index 0000000000000..53c17c942316a --- /dev/null +++ b/community/server/src/main/java/org/neo4j/server/CommunityEntryPoint.java @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2002-2016 "Neo Technology," + * Network Engine for Objects in Lund AB [http://neotechnology.com] + * + * This file is part of Neo4j. + * + * Neo4j is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.neo4j.server; + +public class CommunityEntryPoint +{ + private static BlockingBootstrapper bootstrapper; + + public static void main( String[] args ) + { + int status = ServerBootstrapper.start( new CommunityBootstrapper(), args ); + if ( status != 0 ) + { + System.exit( status ); + } + } + + public static void start( String[] args ) + { + bootstrapper = new BlockingBootstrapper( new CommunityBootstrapper() ); + System.exit( ServerBootstrapper.start( bootstrapper, args ) ); + } + + public static void stop( @SuppressWarnings("UnusedParameters") String[] args ) + { + if ( bootstrapper != null ) + { + bootstrapper.stop(); + } + } +} diff --git a/community/server/src/main/java/org/neo4j/server/BaseBootstrapper.java b/community/server/src/main/java/org/neo4j/server/ServerBootstrapper.java similarity index 99% rename from community/server/src/main/java/org/neo4j/server/BaseBootstrapper.java rename to community/server/src/main/java/org/neo4j/server/ServerBootstrapper.java index 5d0115a7ddd85..45668f8673a5b 100644 --- a/community/server/src/main/java/org/neo4j/server/BaseBootstrapper.java +++ b/community/server/src/main/java/org/neo4j/server/ServerBootstrapper.java @@ -44,7 +44,7 @@ import static org.neo4j.server.configuration.ServerSettings.SERVER_CONFIG_FILE; import static org.neo4j.server.configuration.ServerSettings.SERVER_CONFIG_FILE_KEY; -public abstract class BaseBootstrapper implements Bootstrapper +public abstract class ServerBootstrapper implements Bootstrapper { public static final int OK = 0; public static final int WEB_SERVER_STARTUP_ERROR_CODE = 1; diff --git a/community/server/src/test/java/org/neo4j/server/BaseBootstrapperTest.java b/community/server/src/test/java/org/neo4j/server/BaseBootstrapperTest.java index c9fdf96a228df..3b867d85c271d 100644 --- a/community/server/src/test/java/org/neo4j/server/BaseBootstrapperTest.java +++ b/community/server/src/test/java/org/neo4j/server/BaseBootstrapperTest.java @@ -52,7 +52,7 @@ public abstract class BaseBootstrapperTest extends ExclusiveServerTestBase @Rule public TemporaryFolder tempDir = new TemporaryFolder(); - protected BaseBootstrapper bootstrapper; + protected ServerBootstrapper bootstrapper; @Before public void before() throws IOException @@ -69,7 +69,7 @@ public void after() } } - protected abstract BaseBootstrapper newBootstrapper() throws IOException; + protected abstract ServerBootstrapper newBootstrapper() throws IOException; protected abstract void start( String[] args ); @@ -79,7 +79,7 @@ public void after() public void shouldStartStopNeoServerWithoutAnyConfigFiles() throws IOException { // When - int resultCode = BaseBootstrapper.start( bootstrapper, + int resultCode = ServerBootstrapper.start( bootstrapper, "-c", configOption( data_directory, tempDir.getRoot().getAbsolutePath() ), "-c", configOption( auth_store, tempDir.newFile().getAbsolutePath() ), "-c", configOption( tls_certificate_file, @@ -90,7 +90,7 @@ public void shouldStartStopNeoServerWithoutAnyConfigFiles() throws IOException ); // Then - assertEquals( BaseBootstrapper.OK, resultCode ); + assertEquals( ServerBootstrapper.OK, resultCode ); assertEventually( "Server was not started", bootstrapper::isRunning, is( true ), 1, TimeUnit.MINUTES ); } @@ -102,10 +102,12 @@ public void canSpecifyConfigFile() throws Throwable Map properties = stringMap( forced_kernel_id.name(), "ourcustomvalue" ); properties.putAll( ServerTestUtils.getDefaultRelativeProperties() ); + properties.put( "dbms.connector.1.type", "HTTP" ); + properties.put( "dbms.connector.1.enabled", "true" ); store( properties, configFile ); // When - BaseBootstrapper.start( bootstrapper, "-C", configFile.getAbsolutePath() ); + ServerBootstrapper.start( bootstrapper, "-C", configFile.getAbsolutePath() ); // Then assertThat( bootstrapper.getServer().getConfig().get( forced_kernel_id ), equalTo( "ourcustomvalue" ) ); @@ -119,10 +121,12 @@ public void canOverrideConfigValues() throws Throwable Map properties = stringMap( forced_kernel_id.name(), "thisshouldnotshowup" ); properties.putAll( ServerTestUtils.getDefaultRelativeProperties() ); + properties.put( "dbms.connector.1.type", "HTTP" ); + properties.put( "dbms.connector.1.enabled", "true" ); store( properties, configFile ); // When - BaseBootstrapper.start( bootstrapper, + ServerBootstrapper.start( bootstrapper, "-C", configFile.getAbsolutePath(), "-c", configOption( forced_kernel_id, "mycustomvalue" ) ); diff --git a/community/server/src/test/java/org/neo4j/server/CommunityBootstrapperTest.java b/community/server/src/test/java/org/neo4j/server/CommunityBootstrapperTest.java index e8f80cf791c6f..f1cded6293d07 100644 --- a/community/server/src/test/java/org/neo4j/server/CommunityBootstrapperTest.java +++ b/community/server/src/test/java/org/neo4j/server/CommunityBootstrapperTest.java @@ -22,7 +22,7 @@ public class CommunityBootstrapperTest extends BaseBootstrapperTest { @Override - protected BaseBootstrapper newBootstrapper() + protected ServerBootstrapper newBootstrapper() { return new CommunityBootstrapper(); } @@ -30,12 +30,12 @@ protected BaseBootstrapper newBootstrapper() @Override protected void start(String[] args) { - CommunityBootstrapper.start( args ); + CommunityEntryPoint.start( args ); } @Override protected void stop(String[] args) { - CommunityBootstrapper.stop( args ); + CommunityEntryPoint.stop( args ); } } diff --git a/enterprise/server-enterprise/pom.xml b/enterprise/server-enterprise/pom.xml index 1750b933f8574..ee4e919e7d504 100644 --- a/enterprise/server-enterprise/pom.xml +++ b/enterprise/server-enterprise/pom.xml @@ -20,7 +20,7 @@ org.neo4j.server.enterprise server-enterprise server.enterprise - org.neo4j.server.enterprise.EnterpriseBootstrapper + org.neo4j.server.enterprise.EnterpriseEntryPoint target/generated-resources/appassembler/jsw target/test-classes/etc/neo-server 3.0.2 diff --git a/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/ArbiterBootstrapper.java b/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/ArbiterBootstrapper.java index 890465eaa914d..13d20587d6cac 100644 --- a/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/ArbiterBootstrapper.java +++ b/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/ArbiterBootstrapper.java @@ -46,7 +46,6 @@ import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.logging.FormattedLogProvider; import org.neo4j.server.Bootstrapper; -import org.neo4j.server.configuration.ServerSettings; import static org.neo4j.helpers.Exceptions.peel; @@ -55,32 +54,6 @@ public class ArbiterBootstrapper implements Bootstrapper, AutoCloseable private final LifeSupport life = new LifeSupport(); private final Timer timer = new Timer( true ); - public static void main( String[] args ) throws IOException - { - int status = new ArbiterBootstrapper().start( getConfigFile() ); - if ( status != 0 ) - { - System.exit( status ); - } - } - - static File getConfigFile() - { - String configPath = System.getProperty( ServerSettings.SERVER_CONFIG_FILE_KEY ); - if ( configPath == null ) - { - throw new RuntimeException( "System property " + ServerSettings.SERVER_CONFIG_FILE_KEY + - " must be provided" ); - } - - File configFile = new File( configPath ); - if ( !configFile.exists() ) - { - throw new IllegalArgumentException( configFile + " doesn't exist" ); - } - return configFile; - } - @SafeVarargs @Override public final int start( File configFile, Pair... configOverrides ) @@ -132,6 +105,7 @@ public void close() stop(); } + @SafeVarargs private static Config getConfig( File configFile, Pair... configOverrides ) { Map config = new HashMap<>(); diff --git a/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/ArbiterEntryPoint.java b/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/ArbiterEntryPoint.java new file mode 100644 index 0000000000000..f04a179619de7 --- /dev/null +++ b/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/ArbiterEntryPoint.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2002-2016 "Neo Technology," + * Network Engine for Objects in Lund AB [http://neotechnology.com] + * + * This file is part of Neo4j. + * + * Neo4j is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +package org.neo4j.server.enterprise; + +import java.io.File; +import java.io.IOException; + +import org.neo4j.server.configuration.ServerSettings; + +public class ArbiterEntryPoint +{ + public static void main( String[] args ) throws IOException + { + int status = new ArbiterBootstrapper().start( getConfigFile() ); + if ( status != 0 ) + { + System.exit( status ); + } + } + + static File getConfigFile() + { + String configPath = System.getProperty( ServerSettings.SERVER_CONFIG_FILE_KEY ); + if ( configPath == null ) + { + throw new RuntimeException( "System property " + ServerSettings.SERVER_CONFIG_FILE_KEY + + " must be provided" ); + } + + File configFile = new File( configPath ); + if ( !configFile.exists() ) + { + throw new IllegalArgumentException( configFile + " doesn't exist" ); + } + return configFile; + } +} diff --git a/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseBootstrapper.java b/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseBootstrapper.java index d33b9ede69e4d..57725b1369e15 100644 --- a/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseBootstrapper.java +++ b/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseBootstrapper.java @@ -27,7 +27,6 @@ import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.ha.HaSettings; import org.neo4j.logging.LogProvider; -import org.neo4j.server.BlockingBootstrapper; import org.neo4j.server.CommunityBootstrapper; import org.neo4j.server.NeoServer; @@ -37,31 +36,6 @@ public class EnterpriseBootstrapper extends CommunityBootstrapper { - public static void main( String[] args ) - { - int exit = start( new EnterpriseBootstrapper(), args ); - if ( exit != 0 ) - { - System.exit( exit ); - } - } - - private static BlockingBootstrapper bootstrapper; - - public static void start( String[] args ) - { - bootstrapper = new BlockingBootstrapper( new EnterpriseBootstrapper() ); - System.exit( start( bootstrapper, args ) ); - } - - public static void stop( @SuppressWarnings("UnusedParameters") String[] args ) - { - if ( bootstrapper != null ) - { - bootstrapper.stop(); - } - } - @Override protected NeoServer createNeoServer( Config configurator, GraphDatabaseDependencies dependencies, LogProvider userLogProvider ) diff --git a/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseEntryPoint.java b/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseEntryPoint.java new file mode 100644 index 0000000000000..105021f514fdd --- /dev/null +++ b/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseEntryPoint.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2002-2016 "Neo Technology," + * Network Engine for Objects in Lund AB [http://neotechnology.com] + * + * This file is part of Neo4j. + * + * Neo4j is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +package org.neo4j.server.enterprise; + +import org.neo4j.server.BlockingBootstrapper; +import org.neo4j.server.ServerBootstrapper; + +public class EnterpriseEntryPoint +{ + private static BlockingBootstrapper bootstrapper; + + public static void main( String[] args ) + { + int status = ServerBootstrapper.start( new EnterpriseBootstrapper(), args ); + if ( status != 0 ) + { + System.exit( status ); + } + } + + public static void start( String[] args ) + { + bootstrapper = new BlockingBootstrapper( new EnterpriseBootstrapper() ); + System.exit( ServerBootstrapper.start( bootstrapper, args ) ); + } + + public static void stop( @SuppressWarnings("UnusedParameters") String[] args ) + { + if ( bootstrapper != null ) + { + bootstrapper.stop(); + } + } +} diff --git a/enterprise/server-enterprise/src/main/resources/META-INF/services/org.neo4j.server.Bootstrapper b/enterprise/server-enterprise/src/main/resources/META-INF/services/org.neo4j.server.Bootstrapper deleted file mode 100644 index e3bb13bad7c6e..0000000000000 --- a/enterprise/server-enterprise/src/main/resources/META-INF/services/org.neo4j.server.Bootstrapper +++ /dev/null @@ -1 +0,0 @@ -org.neo4j.server.enterprise.EnterpriseBootstrapper diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/ArbiterBootstrapperTestProxy.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/ArbiterBootstrapperTestProxy.java index 5d1e3334ca145..b9b6b0f723a0d 100644 --- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/ArbiterBootstrapperTestProxy.java +++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/ArbiterBootstrapperTestProxy.java @@ -33,7 +33,7 @@ public static void main( String[] args ) throws IOException System.out.println( START_SIGNAL ); try ( ArbiterBootstrapper arbiter = new ArbiterBootstrapper() ) { - arbiter.start( ArbiterBootstrapper.getConfigFile() ); + arbiter.start( ArbiterEntryPoint.getConfigFile() ); System.in.read(); } } diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/EnterpriseBootstrapperTest.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/EnterpriseBootstrapperTest.java index da46a54fba616..36c847d49b7c5 100644 --- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/EnterpriseBootstrapperTest.java +++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/EnterpriseBootstrapperTest.java @@ -26,7 +26,7 @@ import org.junit.rules.TemporaryFolder; import org.neo4j.cluster.ClusterSettings; -import org.neo4j.server.BaseBootstrapper; +import org.neo4j.server.ServerBootstrapper; import org.neo4j.server.BaseBootstrapperTest; import static org.hamcrest.Matchers.is; @@ -42,7 +42,7 @@ public class EnterpriseBootstrapperTest extends BaseBootstrapperTest { @Override - protected BaseBootstrapper newBootstrapper() + protected ServerBootstrapper newBootstrapper() { return new EnterpriseBootstrapper(); } @@ -50,13 +50,13 @@ protected BaseBootstrapper newBootstrapper() @Override protected void start(String[] args) { - EnterpriseBootstrapper.start( args ); + EnterpriseEntryPoint.start( args ); } @Override protected void stop(String[] args) { - EnterpriseBootstrapper.stop( args ); + EnterpriseEntryPoint.stop( args ); } @Rule @@ -66,15 +66,18 @@ protected void stop(String[] args) public void shouldBeAbleToStartInSingleMode() throws Exception { // When - int resultCode = BaseBootstrapper.start( bootstrapper, + int resultCode = ServerBootstrapper.start( bootstrapper, "-c", configOption( EnterpriseServerSettings.mode, "SINGLE" ), "-c", configOption( data_directory, getRelativePath( folder.getRoot(), data_directory ) ), "-c", configOption( auth_store, getRelativePath( folder.getRoot(), auth_store ) ), "-c", configOption( tls_key_file, getRelativePath( folder.getRoot(), tls_key_file ) ), - "-c", configOption( tls_certificate_file, getRelativePath( folder.getRoot(), tls_certificate_file ) ) ); + "-c", configOption( tls_certificate_file, getRelativePath( folder.getRoot(), tls_certificate_file ) ), + "-c", configOption( tls_certificate_file, getRelativePath( folder.getRoot(), tls_certificate_file ) ), + "-c", "dbms.connector.1.type=HTTP", + "-c", "dbms.connector.1.enabled=true" ); // Then - assertEquals( BaseBootstrapper.OK, resultCode ); + assertEquals( ServerBootstrapper.OK, resultCode ); assertEventually( "Server was not started", bootstrapper::isRunning, is( true ), 1, TimeUnit.MINUTES ); } @@ -82,17 +85,19 @@ public void shouldBeAbleToStartInSingleMode() throws Exception public void shouldBeAbleToStartInHAMode() throws Exception { // When - int resultCode = BaseBootstrapper.start( bootstrapper, + int resultCode = ServerBootstrapper.start( bootstrapper, "-c", configOption( EnterpriseServerSettings.mode, "HA" ), "-c", configOption( ClusterSettings.server_id, "1" ), "-c", configOption( ClusterSettings.initial_hosts, "127.0.0.1:5001" ), "-c", configOption( data_directory, getRelativePath( folder.getRoot(), data_directory ) ), "-c", configOption( auth_store, getRelativePath( folder.getRoot(), auth_store ) ), "-c", configOption( tls_key_file, getRelativePath( folder.getRoot(), tls_key_file ) ), - "-c", configOption( tls_certificate_file, getRelativePath( folder.getRoot(), tls_certificate_file ) ) ); + "-c", configOption( tls_certificate_file, getRelativePath( folder.getRoot(), tls_certificate_file ) ), + "-c", "dbms.connector.1.type=HTTP", + "-c", "dbms.connector.1.enabled=true" ); // Then - assertEquals( BaseBootstrapper.OK, resultCode ); + assertEquals( ServerBootstrapper.OK, resultCode ); assertEventually( "Server was not started", bootstrapper::isRunning, is( true ), 1, TimeUnit.MINUTES ); } } diff --git a/integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIntegrationTest.java b/integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIntegrationTest.java index c49dafbca575f..69dd824799f50 100644 --- a/integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIntegrationTest.java +++ b/integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIntegrationTest.java @@ -67,7 +67,7 @@ import org.neo4j.kernel.lifecycle.LifecycleException; import org.neo4j.register.Register.DoubleLongRegister; import org.neo4j.register.Registers; -import org.neo4j.server.BaseBootstrapper; +import org.neo4j.server.ServerBootstrapper; import org.neo4j.server.CommunityBootstrapper; import org.neo4j.server.ServerTestUtils; import org.neo4j.server.configuration.ServerSettings; @@ -211,7 +211,7 @@ public void serverDatabaseShouldStartOnOlderStoreWhenUpgradeIsEnabled() throws T try { - BaseBootstrapper bootstrapper = new CommunityBootstrapper(); + ServerBootstrapper bootstrapper = new CommunityBootstrapper(); try { bootstrapper.start( configFile ); diff --git a/packaging/installer-linux/installer-rpm/installer-rpm-community/pom.xml b/packaging/installer-linux/installer-rpm/installer-rpm-community/pom.xml index 56695b0f076ef..e1b8dd3fbf655 100644 --- a/packaging/installer-linux/installer-rpm/installer-rpm-community/pom.xml +++ b/packaging/installer-linux/installer-rpm/installer-rpm-community/pom.xml @@ -34,7 +34,7 @@ 0 - org.neo4j.server.CommunityBootstrapper + org.neo4j.server.CommunityEntryPoint Anders Nawroth <anders@neotechnology.com> none diff --git a/packaging/installer-linux/installer-rpm/installer-rpm-enterprise/pom.xml b/packaging/installer-linux/installer-rpm/installer-rpm-enterprise/pom.xml index c3533948f2c87..c92319cae999d 100644 --- a/packaging/installer-linux/installer-rpm/installer-rpm-enterprise/pom.xml +++ b/packaging/installer-linux/installer-rpm/installer-rpm-enterprise/pom.xml @@ -34,7 +34,7 @@ 0 - org.neo4j.server.enterprise.EnterpriseBootstrapper + org.neo4j.server.enterprise.EnterpriseEntryPoint Anders Nawroth <anders@neotechnology.com> none diff --git a/packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4j-Management/Get-Java.ps1 b/packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4j-Management/Get-Java.ps1 index 385ca946e46c2..4fe611040aa50 100644 --- a/packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4j-Management/Get-Java.ps1 +++ b/packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4j-Management/Get-Java.ps1 @@ -153,9 +153,9 @@ Function Get-Java # Shell arguments for the Neo4jServer and Arbiter classes if ($PsCmdlet.ParameterSetName -eq 'ServerInvoke') { - if ($Neo4jServer.ServerType -eq 'Enterprise') { $serverMainClass = 'org.neo4j.server.enterprise.EnterpriseBootstrapper' } - if ($Neo4jServer.ServerType -eq 'Community') { $serverMainClass = 'org.neo4j.server.CommunityBootstrapper' } - if ($Neo4jServer.DatabaseMode.ToUpper() -eq 'ARBITER') { $serverMainClass = 'org.neo4j.server.enterprise.ArbiterBootstrapper' } + if ($Neo4jServer.ServerType -eq 'Enterprise') { $serverMainClass = 'org.neo4j.server.enterprise.EnterpriseEntryPoint' } + if ($Neo4jServer.ServerType -eq 'Community') { $serverMainClass = 'org.neo4j.server.CommunityEntryPoint' } + if ($Neo4jServer.DatabaseMode.ToUpper() -eq 'ARBITER') { $serverMainClass = 'org.neo4j.server.enterprise.ArbiterEntryPoint' } if ($serverMainClass -eq '') { Write-Error "Unable to determine the Server Main Class from the server information"; return $null } diff --git a/packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4j-Management/Get-Neo4jPrunsrv.ps1 b/packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4j-Management/Get-Neo4jPrunsrv.ps1 index 0fded7d66c7d8..e55a4c228b391 100644 --- a/packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4j-Management/Get-Neo4jPrunsrv.ps1 +++ b/packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4j-Management/Get-Neo4jPrunsrv.ps1 @@ -116,9 +116,9 @@ Function Get-Neo4jPrunsrv '--Startup=automatic' ) - if ($Neo4jServer.ServerType -eq 'Enterprise') { $serverMainClass = 'org.neo4j.server.enterprise.EnterpriseBootstrapper' } - if ($Neo4jServer.ServerType -eq 'Community') { $serverMainClass = 'org.neo4j.server.CommunityBootstrapper' } - if ($Neo4jServer.DatabaseMode.ToUpper() -eq 'ARBITER') { $serverMainClass = 'org.neo4j.server.enterprise.ArbiterBootstrapper' } + if ($Neo4jServer.ServerType -eq 'Enterprise') { $serverMainClass = 'org.neo4j.server.enterprise.EnterpriseEntryPoint' } + if ($Neo4jServer.ServerType -eq 'Community') { $serverMainClass = 'org.neo4j.server.CommunityEntryPoint' } + if ($Neo4jServer.DatabaseMode.ToUpper() -eq 'ARBITER') { $serverMainClass = 'org.neo4j.server.enterprise.ArbiterEntryPoint' } if ($serverMainClass -eq '') { Write-Error "Unable to determine the Server Main Class from the server information"; return $null } $PrunArgs += @("--StopClass=$($serverMainClass)", "--StartClass=$($serverMainClass)") diff --git a/packaging/standalone/src/main/distribution/shell-scripts/bin/neo4j b/packaging/standalone/src/main/distribution/shell-scripts/bin/neo4j index 0790a131a7c49..de95d4a038734 100644 --- a/packaging/standalone/src/main/distribution/shell-scripts/bin/neo4j +++ b/packaging/standalone/src/main/distribution/shell-scripts/bin/neo4j @@ -110,7 +110,7 @@ setup_arbiter_options() { if is_arbiter; then SHUTDOWN_TIMEOUT=20 MIN_ALLOWED_OPEN_FILES=1 - MAIN_CLASS="org.neo4j.server.enterprise.ArbiterBootstrapper" + MAIN_CLASS="org.neo4j.server.enterprise.ArbiterEntryPoint" print_start_message() { echo "Started in ARBITER mode." diff --git a/packaging/standalone/src/tests/Neo4j-Management/unit/Get-Java.Tests.ps1 b/packaging/standalone/src/tests/Neo4j-Management/unit/Get-Java.Tests.ps1 index 0471befd7753f..983521cd3fc56 100644 --- a/packaging/standalone/src/tests/Neo4j-Management/unit/Get-Java.Tests.ps1 +++ b/packaging/standalone/src/tests/Neo4j-Management/unit/Get-Java.Tests.ps1 @@ -212,8 +212,8 @@ InModuleScope Neo4j-Management { $result = Get-Java -ForServer -Neo4jServer $serverObject $resultArgs = ($result.args -join ' ') - It "should have main class of org.neo4j.server.CommunityBootstrapper" { - $resultArgs | Should Match ([regex]::Escape('-DserverMainClass=org.neo4j.server.CommunityBootstrapper')) + It "should have main class of org.neo4j.server.CommunityEntryPoint" { + $resultArgs | Should Match ([regex]::Escape('-DserverMainClass=org.neo4j.server.CommunityEntryPoint')) } It "should have correct WorkingDir" { @@ -243,8 +243,8 @@ InModuleScope Neo4j-Management { $result = Get-Java -ForServer -Neo4jServer $serverObject $resultArgs = ($result.args -join ' ') - It "should have main class of org.neo4j.server.enterprise.EnterpriseBootstrapper" { - $resultArgs | Should Match ([regex]::Escape('-DserverMainClass=org.neo4j.server.enterprise.EnterpriseBootstrapper')) + It "should have main class of org.neo4j.server.enterprise.EnterpriseEntryPoint" { + $resultArgs | Should Match ([regex]::Escape('-DserverMainClass=org.neo4j.server.enterprise.EnterpriseEntryPoint')) } It "should have correct WorkingDir" { @@ -308,7 +308,7 @@ InModuleScope Neo4j-Management { $resultArgs = ($result.args -join ' ') It "should have main class of ArbiterBootstrapper" { - $resultArgs | Should Match ([regex]::Escape('-DserverMainClass=org.neo4j.server.enterprise.ArbiterBootstrapper')) + $resultArgs | Should Match ([regex]::Escape('-DserverMainClass=org.neo4j.server.enterprise.ArbiterEntryPoint')) } It "should have correct WorkingDir" { diff --git a/packaging/standalone/src/tests/shell-scripts/test-arbiter.sh b/packaging/standalone/src/tests/shell-scripts/test-arbiter.sh index 6f3ac01ad018f..df0a32205ae3d 100755 --- a/packaging/standalone/src/tests/shell-scripts/test-arbiter.sh +++ b/packaging/standalone/src/tests/shell-scripts/test-arbiter.sh @@ -13,7 +13,7 @@ test_expect_success "should start successfully" " " test_expect_success "should invoke arbiter main class" " - test_expect_java_arg 'org.neo4j.server.enterprise.ArbiterBootstrapper' + test_expect_java_arg 'org.neo4j.server.enterprise.ArbiterEntryPoint' " test_expect_success "should print a specific startup message" " diff --git a/packaging/standalone/standalone-community/pom.xml b/packaging/standalone/standalone-community/pom.xml index c524440ce052b..be79ebb9d3ee0 100644 --- a/packaging/standalone/standalone-community/pom.xml +++ b/packaging/standalone/standalone-community/pom.xml @@ -27,7 +27,7 @@ - org.neo4j.server.CommunityBootstrapper + org.neo4j.server.CommunityEntryPoint diff --git a/packaging/standalone/standalone-enterprise/pom.xml b/packaging/standalone/standalone-enterprise/pom.xml index c6f040eb8e099..32132f6cab033 100644 --- a/packaging/standalone/standalone-enterprise/pom.xml +++ b/packaging/standalone/standalone-enterprise/pom.xml @@ -28,7 +28,7 @@ - org.neo4j.server.enterprise.EnterpriseBootstrapper + org.neo4j.server.enterprise.EnterpriseEntryPoint