Remove some lingering traces of the old ZooKeeper-based clustering

community/licensecheck-config/src/main/resources/licensing-requirements-base.xml

@@ -31,9 +31,6 @@
     <artifact id="org.codehaus.jettison:jettison:bundle:1.3">
       <license>ASL2.0</license>
     </artifact>
-    <artifact id="org.apache.zookeeper:zookeeper:jar:3.3.2">
-      <license>ASL2.0</license>
-    </artifact>
   </missing-licenses>
   <override-licenses>
     <artifact id="org.scala-lang:scala-library:">

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

manual/manual/assemblies/manpages-enterprise.xml

@@ -38,8 +38,6 @@
         <include>neo4j-import.*</include>
         <include>neo4j-backup.*</include>
         <include>neo4j-arbiter.*</include>
-        <include>neo4j-coordinator.*</include>
-        <include>neo4j-coordinator-shell.*</include>
       </includes>
     </fileSet>
   </fileSets>

manual/manual/pom.xml

@@ -361,8 +361,6 @@
               <gzip src="${project.build.directory}/docbkx/manpages/man1/neo4j-installer.1" destfile="${project.build.directory}/manpages/neo4j-installer.1.gz"/>
               <gzip src="${project.build.directory}/docbkx/manpages/man1/neo4j-backup.1" destfile="${project.build.directory}/manpages/neo4j-backup.1.gz"/>
               <gzip src="${project.build.directory}/docbkx/manpages/man1/neo4j-arbiter.1" destfile="${project.build.directory}/manpages/neo4j-arbiter.1.gz"/>
-              <gzip src="${project.build.directory}/docbkx/manpages/man1/neo4j-coordinator.1" destfile="${project.build.directory}/manpages/neo4j-coordinator.1.gz"/>
-              <gzip src="${project.build.directory}/docbkx/manpages/man1/neo4j-coordinator-shell.1" destfile="${project.build.directory}/manpages/neo4j-coordinator-shell.1.gz"/>
               <gzip src="${project.build.directory}/docbkx/manpages/man1/neo4j-import.1" destfile="${project.build.directory}/manpages/neo4j-import.1.gz"/>
             </postProcess>
             </configuration>

packaging/installer-linux/installer-debian/build.xml

@@ -49,8 +49,6 @@
                     <include name="**/server/bin/utils"/>
                     <include name="**/server/bin/neo4j-backup"/>
                     <include name="**/server/bin/neo4j-arbiter"/>
-                    <include name="**/server/bin/neo4j-coordinator"/>
-                    <include name="**/server/bin/neo4j-coordinator-shell"/>
                 </fileset>
             </chmod>
 

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

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

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

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 }

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'

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'

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