From ae17b366961388a8f01bdaa4d36d60e5754438e9 Mon Sep 17 00:00:00 2001 From: Ben Butler-Cole Date: Wed, 16 Dec 2015 08:38:33 +0000 Subject: [PATCH] Remove some lingering traces of the old ZooKeeper-based clustering --- .../resources/licensing-requirements-base.xml | 3 - .../man/neo4j-coordinator-shell.1.asciidoc | 17 --- .../src/docs/man/neo4j-coordinator.1.asciidoc | 17 --- enterprise/ha/src/main/script/bootstrap.sh | 7 -- enterprise/ha/src/main/script/hadevcluster.sh | 112 ------------------ .../java/org/neo4j/ha/StartLocalHaDb.java | 48 -------- manual/manual/Makefile | 2 +- .../manual/assemblies/manpages-enterprise.xml | 2 - manual/manual/pom.xml | 2 - .../installer-debian/build.xml | 2 - .../arbiter/debian/neo4j-arbiter.install | 2 - .../arbiter/debian/neo4j-arbiter.links | 3 - .../arbiter/debian/neo4j-arbiter.manpages | 2 - .../bin/Neo4j-Management/Get-Java.ps1 | 12 +- .../Neo4j-Management/Start-Neo4jBackup.ps1 | 2 +- .../Neo4j-Management/Start-Neo4jImport.ps1 | 2 +- .../shell-scripts/bin/Neo4jBackup.bat | 4 - .../shell-scripts/bin/Neo4jCoordinator.bat | 20 ---- .../bin/Neo4jCoordinatorShell.bat | 20 ---- .../shell-scripts/bin/neo4j-coordinator | 22 ---- .../shell-scripts/bin/neo4j-coordinator-shell | 22 ---- .../Neo4j-Management/unit/Get-Java.Tests.ps1 | 6 +- .../main/assemblies/advanced-unix-dist.xml | 1 - .../main/assemblies/advanced-windows-dist.xml | 1 - .../main/assemblies/community-unix-dist.xml | 1 - .../assemblies/community-windows-dist.xml | 1 - 26 files changed, 7 insertions(+), 326 deletions(-) delete mode 100644 community/server/src/docs/man/neo4j-coordinator-shell.1.asciidoc delete mode 100644 community/server/src/docs/man/neo4j-coordinator.1.asciidoc delete mode 100755 enterprise/ha/src/main/script/bootstrap.sh delete mode 100755 enterprise/ha/src/main/script/hadevcluster.sh delete mode 100644 enterprise/ha/src/test/java/org/neo4j/ha/StartLocalHaDb.java delete mode 100644 packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4jCoordinator.bat delete mode 100644 packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4jCoordinatorShell.bat delete mode 100644 packaging/standalone/src/main/distribution/shell-scripts/bin/neo4j-coordinator delete mode 100644 packaging/standalone/src/main/distribution/shell-scripts/bin/neo4j-coordinator-shell diff --git a/community/licensecheck-config/src/main/resources/licensing-requirements-base.xml b/community/licensecheck-config/src/main/resources/licensing-requirements-base.xml index fdf8eb0b27f3a..c6c12d1c70fd8 100644 --- a/community/licensecheck-config/src/main/resources/licensing-requirements-base.xml +++ b/community/licensecheck-config/src/main/resources/licensing-requirements-base.xml @@ -31,9 +31,6 @@ ASL2.0 - - ASL2.0 - diff --git a/community/server/src/docs/man/neo4j-coordinator-shell.1.asciidoc b/community/server/src/docs/man/neo4j-coordinator-shell.1.asciidoc deleted file mode 100644 index d86a6813b3252..0000000000000 --- a/community/server/src/docs/man/neo4j-coordinator-shell.1.asciidoc +++ /dev/null @@ -1,17 +0,0 @@ -= NEO4J-COORDINATOR-SHELL(1) -:author: The Neo4j Team - -== NAME -neo4j-coordinator-shell - Neo4j Coordinator Shell interactive interface - -[[neo4j-manpage]] -== SYNOPSIS - -*neo4j-coordinator-shell* - -[[neo4j-manpage-description]] -== DESCRIPTION - -The Coordinator functionality and corresponding scripts are no longer required for Neo4j HA operations since version 1.9. - - diff --git a/community/server/src/docs/man/neo4j-coordinator.1.asciidoc b/community/server/src/docs/man/neo4j-coordinator.1.asciidoc deleted file mode 100644 index bde73d9b516a4..0000000000000 --- a/community/server/src/docs/man/neo4j-coordinator.1.asciidoc +++ /dev/null @@ -1,17 +0,0 @@ -= NEO4J-COORDINATOR(1) -:author: The Neo4j Team - -== NAME -neo4j-coordinator - Neo4j Coordinator for High-Availability clusters - -[[neo4j-manpage]] -== SYNOPSIS - -*neo4j-coordinator* - -[[neo4j-manpage-description]] -== DESCRIPTION - -The Coordinator functionality and corresponding scripts are no longer required for Neo4j HA operations since version 1.9. - - diff --git a/enterprise/ha/src/main/script/bootstrap.sh b/enterprise/ha/src/main/script/bootstrap.sh deleted file mode 100755 index c91baeefdd099..0000000000000 --- a/enterprise/ha/src/main/script/bootstrap.sh +++ /dev/null @@ -1,7 +0,0 @@ -SCRIPTDIR=$(cd $(dirname $0); pwd) -HADIR=$(dirname $(dirname $(dirname $SCRIPTDIR))) -HAZIP="$HADIR/target/neo4j-ha-0.5-SNAPSHOT-dev.zip" -LIBDIR="$HADIR/target/dependency" -function rebuild () { - return 0 -} diff --git a/enterprise/ha/src/main/script/hadevcluster.sh b/enterprise/ha/src/main/script/hadevcluster.sh deleted file mode 100755 index 5785e55bdbc8f..0000000000000 --- a/enterprise/ha/src/main/script/hadevcluster.sh +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/sh -source $(dirname $0)/bootstrap.sh - -MAIN_CLASS_PATH=$HADIR/classes -MAINCLASS=org.neo4j.ha.StartLocalHaDb - -$SCRIPTDIR/shutdown.sh $MAINCLASS pid/ha - -COUNT=1 -OPTIONS=() -for OPT in "$@"; do - case "$OPT" in - -*) - OPTIONS=(${OPTIONS[@]} $OPT) - ;; - [0-9]) - COUNT=$OPT - ;; - *) - echo UNKNOWN PARAMETER $OPT - ;; - esac -done - -EXISTING=() -for HA in data/ha?; do - EXISTING=(${EXISTING[@]} $(basename $HA | cut -b3-)) - if [ ! -f etc/$(basename $HA).cfg ]; then - EXISTING=() - break - fi -done - -if [ $# -lt 1 ]; then - if [ -z "${EXISTING[*]}" ]; then - INSTANCES=(1) - else - INSTANCES=(${EXISTING[@]}) - fi -else - INSTANCES=() - for ((HA=1; HA <= $COUNT ; HA++)); do - INSTANCES=(${INSTANCES[@]} $HA) - done -fi - -ZKCLUSTER=$(grep clientPort etc/zk?.cfg \ - | cut -d= -f2 \ - | lam -s localhost: - \ - | paste -s -d , -) - -if rebuild; then - MAIN_CLASS_PATH=$HADIR/target/test-classes - if [ ! -f "$HAZIP" ]; then - cd $HADIR - ant - cd - - elif [ ! -d "$MAIN_CLASS_PATH" ]; then - cd $HADIR - mvn test-compile - cd - - fi - - mkdir $LIBDIR - cd $LIBDIR - unzip -o $HAZIP - cd - -fi - -CLASSPATH=$MAIN_CLASS_PATH -for JARFILE in $LIBDIR/*.jar; do - CLASSPATH=$CLASSPATH:$JARFILE -done - -mkdir -p data etc pid -rm -f pid/ha - -if [ "${INSTANCES[*]}" != "${EXISTING[*]}" ]; then - rm -rf data/empty - java -cp $CLASSPATH org.neo4j.ha.CreateEmptyDb data/empty -fi - -for HA in "${INSTANCES[@]}"; do - HACONF=etc/ha$HA.cfg - if [ "${INSTANCES[*]}" != "${EXISTING[*]}" ]; then - rm -rf data/ha$HA - cp -R data/empty data/ha$HA - - echo ha.server_id = $HA > $HACONF - echo ha.server = localhost:600$HA >>$HACONF - echo ha.upgrade_coordinators = $ZKCLUSTER >>$HACONF - echo enable_remote_shell = port=133$HA >>$HACONF - fi - - VMOPTIONS= - for OPT in "${OPTIONS[@]}"; do - case "$OPT" in - -debug) - VMOPTIONS="$VMOPTIONS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=144$HA" - ;; - -empty) - if [ "${INSTANCES[*]}" == "${EXISTING[*]}" ]; then - rm -rf data/ha$HA - cp -R data/empty data/ha$HA - fi - ;; - esac - done - - java -cp $CLASSPATH $VMOPTIONS $MAINCLASS data/ha$HA $HACONF & - echo $! >> pid/ha -done diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/StartLocalHaDb.java b/enterprise/ha/src/test/java/org/neo4j/ha/StartLocalHaDb.java deleted file mode 100644 index 17f9101793098..0000000000000 --- a/enterprise/ha/src/test/java/org/neo4j/ha/StartLocalHaDb.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2002-2015 "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.ha; - -import org.junit.Ignore; -import org.neo4j.cluster.ClusterSettings; -import org.neo4j.graphdb.GraphDatabaseService; -import org.neo4j.graphdb.factory.HighlyAvailableGraphDatabaseFactory; - -@Ignore("Not a test") -public class StartLocalHaDb -{ - public static void main( String[] args ) - { - String path = args[0]; - String configFile = args[1]; - final GraphDatabaseService graphDb = new HighlyAvailableGraphDatabaseFactory(). - newHighlyAvailableDatabaseBuilder( path ). - setConfig( ClusterSettings.server_id, "1"). - loadPropertiesFromFile( configFile ). - newGraphDatabase(); - Runtime.getRuntime().addShutdownHook( new Thread() - { - @Override - public void run() - { - graphDb.shutdown(); - } - } ); - } -} diff --git a/manual/manual/Makefile b/manual/manual/Makefile index 1f282b5332b65..5cba4ba888500 100644 --- a/manual/manual/Makefile +++ b/manual/manual/Makefile @@ -14,7 +14,7 @@ make_dir = $(tools_dir)/make include $(make_dir)/context-manual.make -manpage_list = "neo4j server" "neo4j-installer server" "neo4j-arbiter server" "neo4j-coordinator server" "neo4j-coordinator-shell server" "neo4j-shell shell" "neo4j-backup backup" "neo4j-import import-tool" +manpage_list = "neo4j server" "neo4j-installer server" "neo4j-arbiter server" "neo4j-shell shell" "neo4j-backup backup" "neo4j-import import-tool" webhelp_dist: initialize install-extensions manpages copy-images docbook docbook-html year-check # cleanup diff --git a/manual/manual/assemblies/manpages-enterprise.xml b/manual/manual/assemblies/manpages-enterprise.xml index a7c9beaeb6248..4a16ceb3999f7 100644 --- a/manual/manual/assemblies/manpages-enterprise.xml +++ b/manual/manual/assemblies/manpages-enterprise.xml @@ -38,8 +38,6 @@ neo4j-import.* neo4j-backup.* neo4j-arbiter.* - neo4j-coordinator.* - neo4j-coordinator-shell.* diff --git a/manual/manual/pom.xml b/manual/manual/pom.xml index 1828aa92c3b53..8c4122da6d118 100644 --- a/manual/manual/pom.xml +++ b/manual/manual/pom.xml @@ -361,8 +361,6 @@ - - diff --git a/packaging/installer-linux/installer-debian/build.xml b/packaging/installer-linux/installer-debian/build.xml index 89a8a5b26e969..ccaa85e1b445b 100644 --- a/packaging/installer-linux/installer-debian/build.xml +++ b/packaging/installer-linux/installer-debian/build.xml @@ -49,8 +49,6 @@ - - diff --git a/packaging/installer-linux/installer-debian/src/main/resources/arbiter/debian/neo4j-arbiter.install b/packaging/installer-linux/installer-debian/src/main/resources/arbiter/debian/neo4j-arbiter.install index 9705c947b953e..a6f6f6aba8a51 100644 --- a/packaging/installer-linux/installer-debian/src/main/resources/arbiter/debian/neo4j-arbiter.install +++ b/packaging/installer-linux/installer-debian/src/main/resources/arbiter/debian/neo4j-arbiter.install @@ -5,8 +5,6 @@ server/UPGRADE.txt var/lib/neo4j-arbiter server/data/README.txt var/lib/neo4j-arbiter/data server/bin/neo4j-arbiter var/lib/neo4j-arbiter/bin -server/bin/neo4j-coordinator var/lib/neo4j-arbiter/bin -server/bin/neo4j-coordinator-shell var/lib/neo4j-arbiter/bin server/bin/utils var/lib/neo4j-arbiter/bin server/lib usr/share/neo4j-arbiter diff --git a/packaging/installer-linux/installer-debian/src/main/resources/arbiter/debian/neo4j-arbiter.links b/packaging/installer-linux/installer-debian/src/main/resources/arbiter/debian/neo4j-arbiter.links index c4a16c23dcc02..d100bdd54efcb 100644 --- a/packaging/installer-linux/installer-debian/src/main/resources/arbiter/debian/neo4j-arbiter.links +++ b/packaging/installer-linux/installer-debian/src/main/resources/arbiter/debian/neo4j-arbiter.links @@ -4,6 +4,3 @@ usr/share/neo4j-arbiter/system var/lib/neo4j-arbiter/system var/log/neo4j-arbiter var/lib/neo4j-arbiter/data/log etc/neo4j-arbiter var/lib/neo4j-arbiter/conf - -# surely we don't need this anymore - but to we need a link for the arbiter? why is this here? -#var/lib/neo4j-coordinator/bin/neo4j-coordinator-shell usr/bin/neo4j-coordinator-shell diff --git a/packaging/installer-linux/installer-debian/src/main/resources/arbiter/debian/neo4j-arbiter.manpages b/packaging/installer-linux/installer-debian/src/main/resources/arbiter/debian/neo4j-arbiter.manpages index a3196552c1b54..f6a4e74feeb24 100644 --- a/packaging/installer-linux/installer-debian/src/main/resources/arbiter/debian/neo4j-arbiter.manpages +++ b/packaging/installer-linux/installer-debian/src/main/resources/arbiter/debian/neo4j-arbiter.manpages @@ -1,3 +1 @@ manpages/neo4j-arbiter.1.gz -manpages/neo4j-coordinator.1.gz -manpages/neo4j-coordinator-shell.1.gz 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 4be5c016cedb5..328c87f1caf5f 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 @@ -27,9 +27,6 @@ Retrieves information about Java on the local machine to start Neo4j services an .PARAMETER Neo4jServer The Neo4j Server Object -.PARAMETER ExtraClassPath -Additional paths to be added the Java Class Path - .PARAMETER ForServer Retrieve the Java command line to start a Neo4j Server @@ -72,9 +69,6 @@ Function Get-Java ,[Parameter(Mandatory=$true,ValueFromPipeline=$false,ParameterSetName='ArbiterInvoke')] [switch]$ForArbiter - ,[Parameter(Mandatory=$false,ValueFromPipeline=$false,ParameterSetName='UtilityInvoke')] - [string[]]$ExtraClassPath = @() - ,[Parameter(Mandatory=$true,ValueFromPipeline=$false,ParameterSetName='UtilityInvoke')] [switch]$ForUtility @@ -207,11 +201,7 @@ Function Get-Java Get-ChildItem -Path $RepoPath | Where-Object { $_.Extension -eq '.jar'} | % { $ClassPath += "`"$($_.FullName)`";" } - # Get the additional classpath jars - $ExtraClassPath | ForEach-Object -Process { If (Test-Path -Path $_) { Write-Output $_} } | Get-ChildItem | Where-Object { $_.Extension -eq '.jar'} | % { - $ClassPath += "`"$($_.FullName)`";" - } - if ($ClassPath.Length -gt 0) { $ClassPath = $ClassPath.SubString(0, $ClassPath.Length-1) } # Strip the trailing semicolon if needed + if ($ClassPath.Length -gt 0) { $ClassPath = $ClassPath.SubString(0, $ClassPath.Length-1) } # Strip the trailing semicolon if needed $ShellArgs = @() if ($Env:JAVA_OPTS -ne $null) { $ShellArgs += $Env:JAVA_OPTS } diff --git a/packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4j-Management/Start-Neo4jBackup.ps1 b/packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4j-Management/Start-Neo4jBackup.ps1 index 6491c80f6f5ad..6970ede13f56d 100644 --- a/packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4j-Management/Start-Neo4jBackup.ps1 +++ b/packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4j-Management/Start-Neo4jBackup.ps1 @@ -161,7 +161,7 @@ Function Start-Neo4jBackup } # Get Java - $JavaCMD = Get-Java -Neo4jServer $thisServer -ForUtility -AppName 'neo4j-backup' -StartingClass 'org.neo4j.backup.BackupTool' -ExtraClassPath (Join-Path -Path $thisServer.Home -ChildPath 'system\coordinator\lib') + $JavaCMD = Get-Java -Neo4jServer $thisServer -ForUtility -AppName 'neo4j-backup' -StartingClass 'org.neo4j.backup.BackupTool' if ($JavaCMD -eq $null) { Write-Error 'Unable to locate Java' diff --git a/packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4j-Management/Start-Neo4jImport.ps1 b/packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4j-Management/Start-Neo4jImport.ps1 index 3f32343e83898..bfcf74b68f24b 100644 --- a/packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4j-Management/Start-Neo4jImport.ps1 +++ b/packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4j-Management/Start-Neo4jImport.ps1 @@ -107,7 +107,7 @@ Function Start-Neo4jImport # Get Java - $JavaCMD = Get-Java -Neo4jServer $thisServer -ForUtility -AppName 'neo4j-import' -StartingClass 'org.neo4j.tooling.ImportTool' -ExtraClassPath (Join-Path -Path $thisServer.Home -ChildPath 'system\coordinator\lib') + $JavaCMD = Get-Java -Neo4jServer $thisServer -ForUtility -AppName 'neo4j-import' -StartingClass 'org.neo4j.tooling.ImportTool' if ($JavaCMD -eq $null) { Write-Error 'Unable to locate Java' diff --git a/packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4jBackup.bat b/packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4jBackup.bat index 64895136ac256..3782eed4058a5 100644 --- a/packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4jBackup.bat +++ b/packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4jBackup.bat @@ -75,10 +75,6 @@ set LIBPATH="" pushd "%REPO%" for %%G in (*.jar) do call:APPEND_TO_LIBPATH %%G popd -set REPO=%BASEDIR%\system\coordinator\lib -pushd "%REPO%" -for %%G in (*.jar) do call:APPEND_TO_LIBPATH %%G -popd goto LIBPATH_END : APPEND_TO_LIBPATH diff --git a/packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4jCoordinator.bat b/packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4jCoordinator.bat deleted file mode 100644 index 192c1e904d4d0..0000000000000 --- a/packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4jCoordinator.bat +++ /dev/null @@ -1,20 +0,0 @@ -@echo off -rem Copyright (c) 2002-2015 "Neo Technology," -rem Network Engine for Objects in Lund AB [http://neotechnology.com] -rem -rem This file is part of Neo4j. -rem -rem Neo4j is free software: you can redistribute it and/or modify -rem it under the terms of the GNU General Public License as published by -rem the Free Software Foundation, either version 3 of the License, or -rem (at your option) any later version. -rem -rem This program is distributed in the hope that it will be useful, -rem but WITHOUT ANY WARRANTY; without even the implied warranty of -rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -rem GNU General Public License for more details. -rem -rem You should have received a copy of the GNU General Public License -rem along with this program. If not, see . - -echo "The Coordinator functionality and corresponding scripts are no longer required for Neo4j HA operations since version 1.9" diff --git a/packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4jCoordinatorShell.bat b/packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4jCoordinatorShell.bat deleted file mode 100644 index 98bfd89de51eb..0000000000000 --- a/packaging/standalone/src/main/distribution/shell-scripts/bin/Neo4jCoordinatorShell.bat +++ /dev/null @@ -1,20 +0,0 @@ -@echo off -rem Copyright (c) 2002-2015 "Neo Technology," -rem Network Engine for Objects in Lund AB [http://neotechnology.com] -rem -rem This file is part of Neo4j. -rem -rem Neo4j is free software: you can redistribute it and/or modify -rem it under the terms of the GNU General Public License as published by -rem the Free Software Foundation, either version 3 of the License, or -rem (at your option) any later version. -rem -rem This program is distributed in the hope that it will be useful, -rem but WITHOUT ANY WARRANTY; without even the implied warranty of -rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -rem GNU General Public License for more details. -rem -rem You should have received a copy of the GNU General Public License -rem along with this program. If not, see . - -echo "The Coordinator functionality and corresponding scripts are no longer required for Neo4j HA operations since version 1.9" diff --git a/packaging/standalone/src/main/distribution/shell-scripts/bin/neo4j-coordinator b/packaging/standalone/src/main/distribution/shell-scripts/bin/neo4j-coordinator deleted file mode 100644 index 00b6c2d143eab..0000000000000 --- a/packaging/standalone/src/main/distribution/shell-scripts/bin/neo4j-coordinator +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -# Copyright (c) 2002-2015 "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 . - -echo "The Coordinator functionality and corresponding scripts are no longer required for Neo4j HA operations since version 1.9" >&2 -exit 1 diff --git a/packaging/standalone/src/main/distribution/shell-scripts/bin/neo4j-coordinator-shell b/packaging/standalone/src/main/distribution/shell-scripts/bin/neo4j-coordinator-shell deleted file mode 100644 index 00b6c2d143eab..0000000000000 --- a/packaging/standalone/src/main/distribution/shell-scripts/bin/neo4j-coordinator-shell +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -# Copyright (c) 2002-2015 "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 . - -echo "The Coordinator functionality and corresponding scripts are no longer required for Neo4j HA operations since version 1.9" >&2 -exit 1 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 7b8847053eddd..e3f6308cbfeb3 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 @@ -393,11 +393,11 @@ InModuleScope Neo4j-Management { 'Home' = 'TestDrive:\Path'; 'ServerVersion' = '99.99'; 'ServerType' = 'Community' }) - $result = Get-Java -ForUtility -AppName 'someapp' -StartingClass 'someclass' -ExtraClassPath 'TestDrive:\FakeExtraClass' -Neo4jServer $serverObject -ErrorAction Stop + $result = Get-Java -ForUtility -AppName 'someapp' -StartingClass 'someclass' -Neo4jServer $serverObject -ErrorAction Stop $resultArgs = ($result.args -join ' ') It "should have correct ClassPath" { - $resultArgs | Should Match ([regex]::Escape('-classpath ;"TestDrive:\fake1.jar";"TestDrive:\FakeExtraClass\fake2.jar"')) + $resultArgs | Should Match ([regex]::Escape('-classpath ;"TestDrive:\fake1.jar"')) } It "should have correct Repo" { $resultArgs | Should Match ([regex]::Escape('-Dapp.repo="TestDrive:\Path\lib"')) @@ -448,4 +448,4 @@ InModuleScope Neo4j-Management { } } } -} \ No newline at end of file +} diff --git a/packaging/standalone/standalone-advanced/src/main/assemblies/advanced-unix-dist.xml b/packaging/standalone/standalone-advanced/src/main/assemblies/advanced-unix-dist.xml index d6b0696a6c3f5..76a6598c60893 100644 --- a/packaging/standalone/standalone-advanced/src/main/assemblies/advanced-unix-dist.xml +++ b/packaging/standalone/standalone-advanced/src/main/assemblies/advanced-unix-dist.xml @@ -68,7 +68,6 @@ **/*.bat **/neo4j-backup* - **/neo4j-coord* **/*arbiter* **/*.psd1 **/*.psm1 diff --git a/packaging/standalone/standalone-advanced/src/main/assemblies/advanced-windows-dist.xml b/packaging/standalone/standalone-advanced/src/main/assemblies/advanced-windows-dist.xml index e07b0863c2255..22420eb8b9fb0 100644 --- a/packaging/standalone/standalone-advanced/src/main/assemblies/advanced-windows-dist.xml +++ b/packaging/standalone/standalone-advanced/src/main/assemblies/advanced-windows-dist.xml @@ -52,7 +52,6 @@ **/Neo4jBackup* - **/Neo4jCoord* **/Neo4jArbiter* true diff --git a/packaging/standalone/standalone-community/src/main/assemblies/community-unix-dist.xml b/packaging/standalone/standalone-community/src/main/assemblies/community-unix-dist.xml index edde5ec6ab133..a91001c749d28 100644 --- a/packaging/standalone/standalone-community/src/main/assemblies/community-unix-dist.xml +++ b/packaging/standalone/standalone-community/src/main/assemblies/community-unix-dist.xml @@ -55,7 +55,6 @@ **/*.bat **/neo4j-backup* - **/neo4j-coord* **/*arbiter* **/*.psd1 **/*.psm1 diff --git a/packaging/standalone/standalone-community/src/main/assemblies/community-windows-dist.xml b/packaging/standalone/standalone-community/src/main/assemblies/community-windows-dist.xml index e80be06729356..58e303107f8f3 100644 --- a/packaging/standalone/standalone-community/src/main/assemblies/community-windows-dist.xml +++ b/packaging/standalone/standalone-community/src/main/assemblies/community-windows-dist.xml @@ -52,7 +52,6 @@ **/Neo4jBackup* - **/Neo4jCoord* **/Neo4jArbiter* true