From 9d7a2d07015af1c94d814a10fb2dc8248e459a65 Mon Sep 17 00:00:00 2001
From: Mark Peace <mark.peace@neotechnology.com>
Date: Tue, 8 Mar 2016 16:49:43 +0000
Subject: [PATCH] Remove references to webadmin

---
 RepositoryOverview.asciidoc                   |   3 +-
 community/.gitignore                          |   3 -
 community/server/pom.xml                      |   4 -
 .../org/neo4j/server/AbstractNeoServer.java   |  10 +-
 .../rest/discovery/DiscoveryService.java      |   4 +-
 .../neo4j/server/rest/domain/HtmlHelper.java  |   2 -
 .../org/neo4j/server/ServerConfigDocIT.java   |  18 +-
 .../helpers/CommunityServerBuilder.java       |  24 +-
 .../CypherSessionDocTest.java                 |   6 +-
 .../org/neo4j/server/rest/JaxRsResponse.java  |  29 ++
 .../neo4j/server/rest/JmxServiceDocIT.java    |   6 +-
 .../neo4j/server/rest/ManageNodeDocIT.java    | 391 +++++++++++++++++-
 .../neo4j/server/rest/RedirectorDocIT.java    |   4 +-
 .../rest/dbms/AuthorizationFilterTest.java    |  17 +-
 .../auth/AuthorizationWhitelistIT.java        |   4 +-
 ...ommunityVersionAndEditionServiceDocIT.java | 129 ------
 ...nfigureEnabledManagementConsolesDocIT.java |  71 ----
 .../webadmin/rest/ConsoleServiceDocTest.java  |  93 -----
 .../webadmin/rest/JmxServiceDocTest.java      |  76 ----
 .../rest/Neo4jShellConsoleSessionDocTest.java | 119 ------
 .../webadmin/rest/RootServiceDocTest.java     |  68 ---
 .../rest/VersionAndEditionServiceTest.java    |  58 ---
 .../ServerRootRepresentationTest.java         |  54 ---
 .../enterprise/EnterpriseNeoServer.java       |   4 +-
 ...seAvailabilityDiscoveryRepresentation.java |   2 +-
 .../rest/CoreDatabaseAvailabilityService.java |   2 +-
 .../rest/DatabaseRoleInfoServerModule.java    |   2 +-
 .../rest/HaDiscoveryRepresentation.java       |   2 +-
 .../rest/MasterInfoService.java               |   2 +-
 .../StandaloneHaInfoFunctionalTest.java       |   6 +-
 .../EnterpriseVersionAndEditionServiceIT.java |   2 +-
 .../rest/MasterInfoServiceTest.java           |   2 +-
 manual/contents/src/tools/index.asciidoc      |   4 -
 manual/contents/src/tools/webadmin.asciidoc   |  10 -
 .../src/docs/dev/tutorials/cypher.asciidoc    |   4 +-
 packaging/standalone/document.properties      |   2 -
 packaging/standalone/pom.xml                  |   2 +-
 37 files changed, 480 insertions(+), 759 deletions(-)
 rename community/server/src/test/java/org/neo4j/server/{webadmin/console => rest}/CypherSessionDocTest.java (98%)
 delete mode 100644 community/server/src/test/java/org/neo4j/server/webadmin/rest/CommunityVersionAndEditionServiceDocIT.java
 delete mode 100644 community/server/src/test/java/org/neo4j/server/webadmin/rest/ConfigureEnabledManagementConsolesDocIT.java
 delete mode 100644 community/server/src/test/java/org/neo4j/server/webadmin/rest/ConsoleServiceDocTest.java
 delete mode 100644 community/server/src/test/java/org/neo4j/server/webadmin/rest/JmxServiceDocTest.java
 delete mode 100644 community/server/src/test/java/org/neo4j/server/webadmin/rest/Neo4jShellConsoleSessionDocTest.java
 delete mode 100644 community/server/src/test/java/org/neo4j/server/webadmin/rest/RootServiceDocTest.java
 delete mode 100644 community/server/src/test/java/org/neo4j/server/webadmin/rest/VersionAndEditionServiceTest.java
 delete mode 100644 community/server/src/test/java/org/neo4j/server/webadmin/rest/representations/ServerRootRepresentationTest.java
 rename enterprise/server-enterprise/src/main/java/org/neo4j/server/{webadmin => }/rest/CoreDatabaseAvailabilityDiscoveryRepresentation.java (97%)
 rename enterprise/server-enterprise/src/main/java/org/neo4j/server/{webadmin => }/rest/CoreDatabaseAvailabilityService.java (98%)
 rename enterprise/server-enterprise/src/main/java/org/neo4j/server/{webadmin => }/rest/DatabaseRoleInfoServerModule.java (98%)
 rename enterprise/server-enterprise/src/main/java/org/neo4j/server/{webadmin => }/rest/HaDiscoveryRepresentation.java (97%)
 rename enterprise/server-enterprise/src/main/java/org/neo4j/server/{webadmin => }/rest/MasterInfoService.java (99%)
 rename enterprise/server-enterprise/src/test/java/org/neo4j/server/{webadmin => }/rest/EnterpriseVersionAndEditionServiceIT.java (98%)
 rename enterprise/server-enterprise/src/test/java/org/neo4j/server/{webadmin => }/rest/MasterInfoServiceTest.java (99%)
 delete mode 100644 manual/contents/src/tools/webadmin.asciidoc

diff --git a/RepositoryOverview.asciidoc b/RepositoryOverview.asciidoc
index a9d260354ddeb..be87187286da3 100644
--- a/RepositoryOverview.asciidoc
+++ b/RepositoryOverview.asciidoc
@@ -110,8 +110,7 @@ neo4j-lucene-index::
 
 neo4j-server::
   The community version of http://neo4j.com/docs/milestone/reference-documentation.html[the Neo4j server].
-  It contains the functionality of the http://neo4j.com/docs/milestone/rest-api.html[REST API]
-  and http://neo4j.com/docs/milestone/tools-webadmin.html[the WebAdmin tool].
+  It contains the functionality of the http://neo4j.com/docs/milestone/rest-api.html[REST API].
 
 neo4j-community::
   The neo4j-community module is a historical alias for the neo4j module.
diff --git a/community/.gitignore b/community/.gitignore
index 3f202068ed597..d064be374bce8 100644
--- a/community/.gitignore
+++ b/community/.gitignore
@@ -18,9 +18,6 @@ target
 cypher/project
 cypher/lib_managed
 cypher/.cache
-server/src/main/resources/webadmin-html/js/neo4j/
-server/src/main/resources/webadmin-html/js/ribcage/
-server/src/main/resources/webadmin-html/js/webadmin.js
 artifacts
 */bin
 */pom-with-build-number.xml
diff --git a/community/server/pom.xml b/community/server/pom.xml
index c9d6af8bd3f49..d45d16442df88 100644
--- a/community/server/pom.xml
+++ b/community/server/pom.xml
@@ -502,10 +502,6 @@
               <title>Server REST Interface</title>
               <packages>org.neo4j.server.rest:org.neo4j.server.rest.*</packages>
             </group>
-            <group>
-              <title>Server Admin Interface</title>
-              <packages>org.neo4j.server.webadmin:org.neo4j.server.webadmin.*</packages>
-            </group>
           </groups>
         </configuration>
       </plugin>
diff --git a/community/server/src/main/java/org/neo4j/server/AbstractNeoServer.java b/community/server/src/main/java/org/neo4j/server/AbstractNeoServer.java
index 4ea7d93c0ed04..4dec94599fbfc 100644
--- a/community/server/src/main/java/org/neo4j/server/AbstractNeoServer.java
+++ b/community/server/src/main/java/org/neo4j/server/AbstractNeoServer.java
@@ -19,10 +19,6 @@
  */
 package org.neo4j.server;
 
-import com.sun.jersey.api.core.HttpContext;
-import org.apache.commons.configuration.Configuration;
-import org.bouncycastle.operator.OperatorCreationException;
-
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -36,6 +32,10 @@
 import java.util.regex.Pattern;
 import javax.servlet.Filter;
 
+import com.sun.jersey.api.core.HttpContext;
+import org.apache.commons.configuration.Configuration;
+import org.bouncycastle.operator.OperatorCreationException;
+
 import org.neo4j.bolt.security.ssl.Certificates;
 import org.neo4j.bolt.security.ssl.KeyStoreFactory;
 import org.neo4j.bolt.security.ssl.KeyStoreInformation;
@@ -85,6 +85,7 @@
 import static java.lang.Math.round;
 import static java.lang.String.format;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
 import static org.neo4j.helpers.Clock.SYSTEM_CLOCK;
 import static org.neo4j.helpers.collection.Iterables.map;
 import static org.neo4j.kernel.impl.util.JobScheduler.Groups.serverTransactionTimeout;
@@ -105,7 +106,6 @@ public abstract class AbstractNeoServer implements NeoServer
 
     private static final Pattern[] DEFAULT_URI_WHITELIST = new Pattern[]{
             Pattern.compile( "/browser.*" ),
-            Pattern.compile( "/webadmin.*" ),
             Pattern.compile( "/" )
     };
 
diff --git a/community/server/src/main/java/org/neo4j/server/rest/discovery/DiscoveryService.java b/community/server/src/main/java/org/neo4j/server/rest/discovery/DiscoveryService.java
index 074fcd7b5aeef..7e6158fd97500 100644
--- a/community/server/src/main/java/org/neo4j/server/rest/discovery/DiscoveryService.java
+++ b/community/server/src/main/java/org/neo4j/server/rest/discovery/DiscoveryService.java
@@ -53,10 +53,10 @@ public DiscoveryService( @Context Config configuration, @Context OutputFormat ou
     @Produces( MediaType.APPLICATION_JSON )
     public Response getDiscoveryDocument() throws URISyntaxException
     {
-        String webAdminManagementUri = configuration.get( ServerSettings.management_api_path ).getPath() + "/";
+        String managementUri = configuration.get( ServerSettings.management_api_path ).getPath() + "/";
         String dataUri = configuration.get( ServerSettings.rest_api_path ).getPath() + "/";
 
-        return outputFormat.ok( new DiscoveryRepresentation( webAdminManagementUri, dataUri ) );
+        return outputFormat.ok( new DiscoveryRepresentation( managementUri, dataUri ) );
     }
 
     @GET
diff --git a/community/server/src/main/java/org/neo4j/server/rest/domain/HtmlHelper.java b/community/server/src/main/java/org/neo4j/server/rest/domain/HtmlHelper.java
index 571a8afc0c677..561c069293524 100644
--- a/community/server/src/main/java/org/neo4j/server/rest/domain/HtmlHelper.java
+++ b/community/server/src/main/java/org/neo4j/server/rest/domain/HtmlHelper.java
@@ -28,7 +28,6 @@
 public class HtmlHelper
 {
     private final static String STYLE_LOCATION = "http://resthtml.neo4j.org/style/";
-    private final static String HTML_JAVASCRIPT_LOCATION = "/webadmin/htmlbrowse.js";
 
     public static String from( final Object object, final ObjectType objectType )
     {
@@ -53,7 +52,6 @@ public static StringBuilder start( final String title, final String additionalCo
         }
         builder.append( "<meta content=\"text/html; charset=utf-8\" http-equiv=\"Content-Type\">\n" + "<link href='"
                         + STYLE_LOCATION + "rest.css' rel='stylesheet' type='text/css'>\n"
-                        + "<script type='text/javascript' src='" + HTML_JAVASCRIPT_LOCATION + "'></script>\n"
                         + "</head>\n<body onload='javascript:neo4jHtmlBrowse.start();' id='" + title.toLowerCase()
                         + "'>\n" + "<div id='content'>" + "<div id='header'>"
                         + "<h1><a title='Neo4j REST interface' href='/'><span>Neo4j REST interface</span></a></h1>"
diff --git a/community/server/src/test/java/org/neo4j/server/ServerConfigDocIT.java b/community/server/src/test/java/org/neo4j/server/ServerConfigDocIT.java
index dc137e1c0a17b..31056dc5884e1 100644
--- a/community/server/src/test/java/org/neo4j/server/ServerConfigDocIT.java
+++ b/community/server/src/test/java/org/neo4j/server/ServerConfigDocIT.java
@@ -68,22 +68,22 @@ public void shouldPickUpPortFromConfig() throws Exception
     }
 
     @Test
-    public void shouldPickupRelativeUrisForWebAdminAndWebAdminRest() throws IOException
+    public void shouldPickupRelativeUrisForMangementApiAndRestApi() throws IOException
     {
-        String webAdminDataUri = "/a/different/data/uri/";
-        String webAdminManagementUri = "/a/different/management/uri/";
+        String dataUri = "/a/different/data/uri/";
+        String managementUri = "/a/different/management/uri/";
 
-        server = server().withRelativeWebDataAdminUriPath( webAdminDataUri )
+        server = server().withRelativeRestApiUriPath( dataUri )
                 .usingDataDir( folder.directory( name.getMethodName() ).getAbsolutePath() )
-                .withRelativeWebAdminUriPath( webAdminManagementUri )
+                .withRelativeManagementApiUriPath( managementUri )
                 .build();
         server.start();
 
-        JaxRsResponse response = new RestRequest().get( "http://localhost:7474" + webAdminDataUri,
+        JaxRsResponse response = new RestRequest().get( "http://localhost:7474" + dataUri,
                 MediaType.TEXT_HTML_TYPE );
         assertEquals( 200, response.getStatus() );
 
-        response = new RestRequest().get( "http://localhost:7474" + webAdminManagementUri );
+        response = new RestRequest().get( "http://localhost:7474" + managementUri );
         assertEquals( 200, response.getStatus() );
         response.close();
     }
@@ -131,7 +131,7 @@ public void shouldNotGenerateWADLWhenExplicitlyDisabledInConfig() throws IOExcep
     }
 
     @Test
-    public void shouldEnableWebadminConsoleByDefault() throws IOException
+    public void shouldEnablConsoleServiceByDefault() throws IOException
     {
         // Given
         server = server().usingDataDir( folder.directory( name.getMethodName() ).getAbsolutePath() ).build();
@@ -142,7 +142,7 @@ public void shouldEnableWebadminConsoleByDefault() throws IOException
     }
 
     @Test
-    public void shouldDisableWebadminConsoleWhenAskedTo() throws IOException
+    public void shouldDisableConsoleServiceWhenAskedTo() throws IOException
     {
         // Given
         server = server().withProperty( ServerSettings.console_module_enabled.name(), "false" )
diff --git a/community/server/src/test/java/org/neo4j/server/helpers/CommunityServerBuilder.java b/community/server/src/test/java/org/neo4j/server/helpers/CommunityServerBuilder.java
index 5832e72d6a174..111c602167b79 100644
--- a/community/server/src/test/java/org/neo4j/server/helpers/CommunityServerBuilder.java
+++ b/community/server/src/test/java/org/neo4j/server/helpers/CommunityServerBuilder.java
@@ -64,8 +64,8 @@ public class CommunityServerBuilder
     private String portNo = "7474";
     private String maxThreads = null;
     protected String dataDir = null;
-    private String webAdminUri = "/db/manage/";
-    private String webAdminDataUri = "/db/data/";
+    private String managementUri = "/db/manage/";
+    private String restUri = "/db/data/";
     protected PreFlightTasks preflightTasks;
     private final HashMap<String, String> thirdPartyPackages = new HashMap<>();
     private final Properties arbitraryProperties = new Properties();
@@ -134,8 +134,8 @@ public CommunityServerBuilder withClock( Clock clock )
     private Map<String, String> createConfiguration( File temporaryFolder )
     {
         Map<String, String> properties = stringMap(
-                ServerSettings.management_api_path.name(), webAdminUri,
-                ServerSettings.rest_api_path.name(), webAdminDataUri );
+                ServerSettings.management_api_path.name(), managementUri,
+                ServerSettings.rest_api_path.name(), restUri );
 
         ServerTestUtils.addDefaultRelativeProperties( properties, temporaryFolder );
 
@@ -237,18 +237,18 @@ public CommunityServerBuilder usingDataDir( String dataDir )
         return this;
     }
 
-    public CommunityServerBuilder withRelativeWebAdminUriPath( String webAdminUri )
+    public CommunityServerBuilder withRelativeManagementApiUriPath( String uri )
     {
         try
         {
-            URI theUri = new URI( webAdminUri );
+            URI theUri = new URI( uri );
             if ( theUri.isAbsolute() )
             {
-                this.webAdminUri = theUri.getPath();
+                this.managementUri = theUri.getPath();
             }
             else
             {
-                this.webAdminUri = theUri.toString();
+                this.managementUri = theUri.toString();
             }
         }
         catch ( URISyntaxException e )
@@ -258,18 +258,18 @@ public CommunityServerBuilder withRelativeWebAdminUriPath( String webAdminUri )
         return this;
     }
 
-    public CommunityServerBuilder withRelativeWebDataAdminUriPath( String webAdminDataUri )
+    public CommunityServerBuilder withRelativeRestApiUriPath( String uri )
     {
         try
         {
-            URI theUri = new URI( webAdminDataUri );
+            URI theUri = new URI( uri );
             if ( theUri.isAbsolute() )
             {
-                this.webAdminDataUri = theUri.getPath();
+                this.restUri = theUri.getPath();
             }
             else
             {
-                this.webAdminDataUri = theUri.toString();
+                this.restUri = theUri.toString();
             }
         }
         catch ( URISyntaxException e )
diff --git a/community/server/src/test/java/org/neo4j/server/webadmin/console/CypherSessionDocTest.java b/community/server/src/test/java/org/neo4j/server/rest/CypherSessionDocTest.java
similarity index 98%
rename from community/server/src/test/java/org/neo4j/server/webadmin/console/CypherSessionDocTest.java
rename to community/server/src/test/java/org/neo4j/server/rest/CypherSessionDocTest.java
index 67fcf9bf80bc1..c6eaea28cf104 100644
--- a/community/server/src/test/java/org/neo4j/server/webadmin/console/CypherSessionDocTest.java
+++ b/community/server/src/test/java/org/neo4j/server/rest/CypherSessionDocTest.java
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.server.webadmin.console;
-
-import org.junit.Test;
+package org.neo4j.server.rest;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.junit.Test;
+
 import org.neo4j.helpers.collection.Pair;
 import org.neo4j.kernel.impl.factory.GraphDatabaseFacade;
 import org.neo4j.logging.NullLogProvider;
diff --git a/community/server/src/test/java/org/neo4j/server/rest/JaxRsResponse.java b/community/server/src/test/java/org/neo4j/server/rest/JaxRsResponse.java
index c50b7eac2b2fc..1319571ce0fb2 100644
--- a/community/server/src/test/java/org/neo4j/server/rest/JaxRsResponse.java
+++ b/community/server/src/test/java/org/neo4j/server/rest/JaxRsResponse.java
@@ -20,6 +20,7 @@
 package org.neo4j.server.rest;
 
 import java.net.URI;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -29,6 +30,18 @@
 
 import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.core.util.StringKeyObjectValueIgnoreCaseMultivaluedMap;
+import org.junit.Test;
+
+import org.neo4j.logging.NullLogProvider;
+import org.neo4j.server.database.Database;
+import org.neo4j.server.rest.management.AdvertisableService;
+import org.neo4j.server.rest.management.console.ConsoleService;
+import org.neo4j.server.rest.management.repr.ServerRootRepresentation;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.mock;
 
 public class JaxRsResponse extends Response
 {
@@ -120,4 +133,20 @@ public MediaType getType() {
     }
 
 
+    public static class ServerRootRepresentationTest
+    {
+        @Test
+        public void shouldProvideAListOfServiceUris() throws Exception
+        {
+            ConsoleService consoleService = new ConsoleService( null, mock( Database.class ), NullLogProvider.getInstance(), null );
+            ServerRootRepresentation srr = new ServerRootRepresentation( new URI( "http://example.org:9999" ),
+                    Collections.<AdvertisableService>singletonList( consoleService ) );
+            Map<String, Map<String, String>> map = srr.serialize();
+
+            assertNotNull( map.get( "services" ) );
+
+            assertThat( map.get( "services" )
+                    .get( consoleService.getName() ), containsString( consoleService.getServerPath() ) );
+        }
+    }
 }
diff --git a/community/server/src/test/java/org/neo4j/server/rest/JmxServiceDocIT.java b/community/server/src/test/java/org/neo4j/server/rest/JmxServiceDocIT.java
index d3f1589ffdc7e..edc7a1189a4c8 100644
--- a/community/server/src/test/java/org/neo4j/server/rest/JmxServiceDocIT.java
+++ b/community/server/src/test/java/org/neo4j/server/rest/JmxServiceDocIT.java
@@ -19,11 +19,11 @@
  */
 package org.neo4j.server.rest;
 
+import java.io.IOException;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.io.IOException;
-
 import org.neo4j.server.helpers.FunctionalTestHelper;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -41,7 +41,7 @@ public static void setupServer() throws IOException
     }
 
     @Test
-    public void shouldRespondWithTheWebAdminClientSettings() throws Exception {
+    public void shouldRespondWithJMXResources() throws Exception {
         String url = functionalTestHelper.managementUri() + "/server/jmx";
         JaxRsResponse resp = RestRequest.req().get(url);
         String json = resp.getEntity();
diff --git a/community/server/src/test/java/org/neo4j/server/rest/ManageNodeDocIT.java b/community/server/src/test/java/org/neo4j/server/rest/ManageNodeDocIT.java
index 71ef2192516dc..6ee1baebbac7a 100644
--- a/community/server/src/test/java/org/neo4j/server/rest/ManageNodeDocIT.java
+++ b/community/server/src/test/java/org/neo4j/server/rest/ManageNodeDocIT.java
@@ -19,29 +19,81 @@
  */
 package org.neo4j.server.rest;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.Callable;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+
+import org.hamcrest.MatcherAssert;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 
+import org.neo4j.helpers.FakeClock;
+import org.neo4j.helpers.UTF8;
+import org.neo4j.kernel.GraphDatabaseDependencies;
+import org.neo4j.kernel.configuration.Config;
+import org.neo4j.kernel.configuration.Settings;
 import org.neo4j.kernel.impl.annotations.Documented;
+import org.neo4j.kernel.impl.factory.GraphDatabaseFacade;
+import org.neo4j.kernel.internal.KernelData;
+import org.neo4j.kernel.monitoring.Monitors;
+import org.neo4j.logging.LogProvider;
+import org.neo4j.logging.NullLogProvider;
 import org.neo4j.metatest.TestJavaTestDocsGenerator;
+import org.neo4j.server.CommunityNeoServer;
+import org.neo4j.server.NeoServer;
+import org.neo4j.server.configuration.ServerSettings;
+import org.neo4j.server.database.Database;
+import org.neo4j.server.database.WrappedDatabase;
+import org.neo4j.server.helpers.CommunityServerBuilder;
 import org.neo4j.server.helpers.FunctionalTestHelper;
 import org.neo4j.server.rest.domain.GraphDbHelper;
 import org.neo4j.server.rest.domain.JsonHelper;
+import org.neo4j.server.rest.domain.JsonParseException;
+import org.neo4j.server.rest.management.JmxService;
+import org.neo4j.server.rest.management.RootService;
+import org.neo4j.server.rest.management.VersionAndEditionService;
+import org.neo4j.server.rest.management.console.ConsoleService;
+import org.neo4j.server.rest.management.console.ConsoleSessionFactory;
+import org.neo4j.server.rest.management.console.ScriptSession;
+import org.neo4j.server.rest.management.console.ShellSession;
+import org.neo4j.server.rest.repr.OutputFormat;
+import org.neo4j.server.rest.repr.formats.JsonFormat;
+import org.neo4j.shell.ShellSettings;
+import org.neo4j.test.TestData;
+import org.neo4j.test.TestGraphDatabaseFactory;
+import org.neo4j.test.server.EntityOutputFormat;
+import org.neo4j.test.server.ExclusiveServerTestBase;
+import org.neo4j.test.server.HTTP;
+
+import static java.lang.System.lineSeparator;
 
 import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasKey;
+import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import static org.neo4j.test.SuppressOutput.suppressAll;
 
 public class ManageNodeDocIT extends AbstractRestFunctionalDocTestBase
 {
@@ -294,4 +346,337 @@ private JaxRsResponse sendDeleteRequestToServer(final long id) throws Exception
     {
         return RestRequest.req().delete(functionalTestHelper.dataUri() + "node/" + id);
     }
+
+    /*
+        Note that when running this test from within an IDE, the version field will be an empty string. This is because the
+        code that generates the version identifier is written by Maven as part of the build process(!). The tests will pass
+        both in the IDE (where the empty string will be correctly compared).
+         */
+    public static class CommunityVersionAndEditionServiceDocIT extends ExclusiveServerTestBase
+    {
+        private static NeoServer server;
+        private static FunctionalTestHelper functionalTestHelper;
+
+        @ClassRule
+        public static TemporaryFolder staticFolder = new TemporaryFolder();
+
+        public
+        @Rule
+        TestData<RESTDocsGenerator> gen = TestData.producedThrough( RESTDocsGenerator.PRODUCER );
+        private static FakeClock clock;
+
+        @Before
+        public void setUp()
+        {
+            gen.get().setSection( "dev/rest-api/database-version" );
+        }
+
+        @BeforeClass
+        public static void setupServer() throws Exception
+        {
+            clock = new FakeClock();
+            server = CommunityServerBuilder.server()
+                    .usingDataDir( staticFolder.getRoot().getAbsolutePath() )
+                    .withClock( clock )
+                    .build();
+
+            suppressAll().call( new Callable<Void>()
+            {
+                @Override
+                public Void call() throws Exception
+                {
+                    server.start();
+                    return null;
+                }
+            } );
+            functionalTestHelper = new FunctionalTestHelper( server );
+        }
+
+        @Before
+        public void setupTheDatabase() throws Exception
+        {
+            // do nothing, we don't care about the database contents here
+        }
+
+        @AfterClass
+        public static void stopServer() throws Exception
+        {
+            suppressAll().call( new Callable<Void>()
+            {
+                @Override
+                public Void call() throws Exception
+                {
+                    server.stop();
+                    return null;
+                }
+            } );
+        }
+
+        @Test
+        public void shouldReportCommunityEdition() throws Exception
+        {
+            // Given
+            String releaseVersion = server.getDatabase().getGraph().getDependencyResolver().resolveDependency( KernelData
+                    .class ).version().getReleaseVersion();
+
+            // When
+            HTTP.Response res =
+                    HTTP.GET( functionalTestHelper.managementUri() + "/" + VersionAndEditionService.SERVER_PATH );
+
+            // Then
+            assertEquals( 200, res.status() );
+            assertThat( res.get( "edition" ).asText(), equalTo( "community" ) );
+            assertThat( res.get( "version" ).asText(), equalTo( releaseVersion ) );
+        }
+    }
+
+    public static class ConfigureEnabledManagementConsolesDocIT extends ExclusiveServerTestBase
+    {
+        private NeoServer server;
+
+        @After
+        public void stopTheServer()
+        {
+            server.stop();
+        }
+
+        @Test
+        public void shouldBeAbleToExplicitlySetConsolesToEnabled() throws Exception
+        {
+            server = CommunityServerBuilder.server().withProperty( ServerSettings.console_module_engines.name(), "" )
+                    .usingDataDir( folder.directory( name.getMethodName() ).getAbsolutePath() )
+                    .build();
+            server.start();
+
+            assertThat( exec( "ls", "shell" ).getStatus(), is( 400 ) );
+        }
+
+        @Test
+        public void shellConsoleShouldBeEnabledByDefault() throws Exception
+        {
+            server = CommunityServerBuilder.server().usingDataDir( folder.directory( name.getMethodName() ).getAbsolutePath() ).build();
+            server.start();
+
+            assertThat( exec( "ls", "shell" ).getStatus(), is( 200 ) );
+        }
+
+        private JaxRsResponse exec( String command, String engine )
+        {
+            return RestRequest.req().post( server.baseUri() + "db/manage/server/console", "{" +
+                    "\"engine\":\"" + engine + "\"," +
+                    "\"command\":\"" + command + "\\n\"}" );
+        }
+    }
+
+    public static class ConsoleServiceDocTest
+    {
+        private final URI uri = URI.create( "http://peteriscool.com:6666/" );
+
+        @Test
+        public void correctRepresentation() throws URISyntaxException
+        {
+            ConsoleService consoleService = new ConsoleService( new ShellOnlyConsoleSessionFactory(), mock( Database.class ),
+                    NullLogProvider.getInstance(), new OutputFormat( new JsonFormat(), uri, null ) );
+
+            Response consoleResponse = consoleService.getServiceDefinition();
+
+            assertEquals( 200, consoleResponse.getStatus() );
+            String response = decode( consoleResponse );
+            MatcherAssert.assertThat( response, containsString( "resources" ) );
+            MatcherAssert.assertThat( response, containsString( uri.toString() ) );
+        }
+
+        @Test
+        public void advertisesAvailableConsoleEngines() throws URISyntaxException
+        {
+            ConsoleService consoleServiceWithJustShellEngine = new ConsoleService( new ShellOnlyConsoleSessionFactory(),
+                    mock( Database.class ), NullLogProvider.getInstance(), new OutputFormat( new JsonFormat(), uri, null ) );
+
+            String response = decode( consoleServiceWithJustShellEngine.getServiceDefinition());
+
+            MatcherAssert.assertThat( response, containsString( "\"engines\" : [ \"shell\" ]" ) );
+
+        }
+
+        private String decode( final Response response )
+        {
+            return UTF8.decode( (byte[]) response.getEntity() );
+        }
+
+        private static class ShellOnlyConsoleSessionFactory implements ConsoleSessionFactory
+        {
+            @Override
+            public ScriptSession createSession( String engineName, Database database, LogProvider logProvider )
+            {
+                return null;
+            }
+
+            @Override
+            public Iterable<String> supportedEngines()
+            {
+                return Collections.singletonList( "shell" );
+            }
+        }
+    }
+
+    public static class JmxServiceDocTest
+    {
+        public JmxService jmxService;
+        private final URI uri = URI.create( "http://peteriscool.com:6666/" );
+
+        @Test
+        public void correctRepresentation() throws URISyntaxException
+        {
+            Response resp = jmxService.getServiceDefinition();
+
+            assertEquals( 200, resp.getStatus() );
+
+            String json = UTF8.decode( (byte[]) resp.getEntity() );
+            MatcherAssert.assertThat( json, containsString( "resources" ) );
+            MatcherAssert.assertThat( json, containsString( uri.toString() ) );
+            MatcherAssert.assertThat( json, containsString( "jmx/domain/{domain}/{objectName}" ) );
+        }
+
+        @Test
+        public void shouldListDomainsCorrectly() throws Exception
+        {
+            Response resp = jmxService.listDomains();
+
+            assertEquals( 200, resp.getStatus() );
+        }
+
+        @Test
+        public void testwork() throws Exception
+        {
+            jmxService.queryBeans( "[\"*:*\"]" );
+        }
+
+        @Before
+        public void setUp() throws Exception
+        {
+            this.jmxService = new JmxService( new OutputFormat( new JsonFormat(), uri, null ), null );
+        }
+
+    }
+
+    public static class Neo4jShellConsoleSessionDocTest implements ConsoleSessionFactory
+    {
+        private ConsoleService consoleService;
+        private Database database;
+        private final URI uri = URI.create( "http://peteriscool.com:6666/" );
+
+        @Before
+        public void setUp() throws Exception
+        {
+            this.database = new WrappedDatabase( (GraphDatabaseFacade) new TestGraphDatabaseFactory().
+                    newImpermanentDatabaseBuilder().
+                    setConfig( ShellSettings.remote_shell_enabled, Settings.TRUE ).
+                    newGraphDatabase() );
+            this.consoleService = new ConsoleService(
+                    this,
+                    database,
+                    NullLogProvider.getInstance(),
+                    new OutputFormat( new JsonFormat(), uri, null ) );
+        }
+
+        @After
+        public void shutdownDatabase()
+        {
+            this.database.getGraph().shutdown();
+        }
+
+        @Override
+        public ScriptSession createSession( String engineName, Database database, LogProvider logProvider )
+        {
+            return new ShellSession( database.getGraph() );
+        }
+
+        @Test
+        public void doesntMangleNewlines() throws Exception
+        {
+            Response response = consoleService.exec( new JsonFormat(),
+                    "{ \"command\" : \"create (n) return n;\", \"engine\":\"shell\" }" );
+
+
+            assertEquals( 200, response.getStatus() );
+            String result = decode( response ).get( 0 );
+
+            String expected = "+-----------+" + lineSeparator()
+                    + "| n         |" + lineSeparator()
+                    + "+-----------+" + lineSeparator()
+                    + "| Node[0]{} |" + lineSeparator()
+                    + "+-----------+" + lineSeparator()
+                    + "1 row";
+
+            MatcherAssert.assertThat( result, containsString( expected ) );
+        }
+
+        private List<String> decode( final Response response ) throws JsonParseException
+        {
+            return (List<String>) JsonHelper.readJson( UTF8.decode( (byte[]) response.getEntity() ) );
+        }
+
+        @Override
+        public Iterable<String> supportedEngines()
+        {
+            return new ArrayList<String>()
+            {{
+                add( "shell" );
+            }};
+        }
+    }
+
+    public static class RootServiceDocTest
+    {
+        @Test
+        public void shouldAdvertiseServicesWhenAsked() throws Exception
+        {
+            UriInfo uriInfo = mock( UriInfo.class );
+            URI uri = new URI( "http://example.org:7474/" );
+            when( uriInfo.getBaseUri() ).thenReturn( uri );
+
+            RootService svc = new RootService( new CommunityNeoServer( Config.empty(),
+                    GraphDatabaseDependencies.newDependencies().userLogProvider( NullLogProvider.getInstance() ).monitors( new Monitors() ),
+                    NullLogProvider.getInstance() ) );
+
+            EntityOutputFormat output = new EntityOutputFormat( new JsonFormat(), null, null );
+            Response serviceDefinition = svc.getServiceDefinition( uriInfo, output );
+
+            assertEquals( 200, serviceDefinition.getStatus() );
+            Map<String, Object> result = (Map<String, Object>) output.getResultAsMap().get( "services" );
+
+            assertThat( result.get( "console" )
+                    .toString(), containsString( String.format( "%sserver/console", uri.toString() ) ) );
+            assertThat( result.get( "jmx" )
+                    .toString(), containsString( String.format( "%sserver/jmx", uri.toString() ) ) );
+        }
+    }
+
+    public static class VersionAndEditionServiceTest
+    {
+        @Test
+        public void shouldReturnReadableStringForServiceName() throws Exception
+        {
+            // given
+            VersionAndEditionService service = new VersionAndEditionService( mock( CommunityNeoServer.class ) );
+
+            // when
+            String serviceName = service.getName();
+            // then
+            assertEquals( "version", serviceName );
+        }
+
+        @Test
+        public void shouldReturnSensiblePathWhereServiceIsHosted() throws Exception
+        {
+            // given
+            VersionAndEditionService service = new VersionAndEditionService( mock( CommunityNeoServer.class ) );
+
+            // when
+            String serverPath = service.getServerPath();
+
+            // then
+            assertEquals( "server/version", serverPath );
+        }
+    }
 }
diff --git a/community/server/src/test/java/org/neo4j/server/rest/RedirectorDocIT.java b/community/server/src/test/java/org/neo4j/server/rest/RedirectorDocIT.java
index 9b770c5762d04..3f1014d79a806 100644
--- a/community/server/src/test/java/org/neo4j/server/rest/RedirectorDocIT.java
+++ b/community/server/src/test/java/org/neo4j/server/rest/RedirectorDocIT.java
@@ -28,7 +28,7 @@
 public class RedirectorDocIT extends AbstractRestFunctionalTestBase
 {
     @Test
-    public void shouldRedirectRootToWebadmin() throws Exception {
+    public void shouldRedirectRootToBrowser() throws Exception {
         JaxRsResponse response = new RestRequest(server().baseUri()).get();
 
         assertThat(response.getStatus(), is(not(404)));
@@ -36,7 +36,7 @@ public void shouldRedirectRootToWebadmin() throws Exception {
 
     @Test
     public void shouldNotRedirectTheRestOfTheWorld() throws Exception {
-        JaxRsResponse response = new RestRequest(server().baseUri()).get("a/different/relative/webadmin/data/uri/");
+        JaxRsResponse response = new RestRequest(server().baseUri()).get("a/different/relative/data/uri/");
 
         assertThat(response.getStatus(), is(404));
     }
diff --git a/community/server/src/test/java/org/neo4j/server/rest/dbms/AuthorizationFilterTest.java b/community/server/src/test/java/org/neo4j/server/rest/dbms/AuthorizationFilterTest.java
index 7b9307014f711..6348874ced38b 100644
--- a/community/server/src/test/java/org/neo4j/server/rest/dbms/AuthorizationFilterTest.java
+++ b/community/server/src/test/java/org/neo4j/server/rest/dbms/AuthorizationFilterTest.java
@@ -19,10 +19,6 @@
  */
 package org.neo4j.server.rest.dbms;
 
-import org.apache.commons.codec.binary.Base64;
-import org.junit.Before;
-import org.junit.Test;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -34,11 +30,16 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.core.HttpHeaders;
 
+import org.apache.commons.codec.binary.Base64;
+import org.junit.Before;
+import org.junit.Test;
+
 import org.neo4j.logging.AssertableLogProvider;
 import org.neo4j.server.security.auth.AuthManager;
 import org.neo4j.server.security.auth.AuthenticationResult;
 
 import static javax.servlet.http.HttpServletRequest.BASIC_AUTH;
+
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Matchers.eq;
@@ -48,6 +49,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
+
 import static org.neo4j.logging.AssertableLogProvider.inLog;
 
 public class AuthorizationFilterTest
@@ -103,17 +105,16 @@ public void shouldWhitelistMatchingUris() throws Exception
     {
         // Given
         final AuthorizationFilter filter = new AuthorizationFilter( () -> authManager, logProvider,
-                Pattern.compile( "/" ), Pattern.compile( "/webadmin.*" ), Pattern.compile( "/browser.*" ) );
+                Pattern.compile( "/" ), Pattern.compile( "/browser.*" ) );
         when( servletRequest.getMethod() ).thenReturn( "GET" );
-        when( servletRequest.getContextPath() ).thenReturn( "/", "/webadmin/index.html", "/browser/index.html" );
+        when( servletRequest.getContextPath() ).thenReturn( "/", "/browser/index.html" );
 
         // When
         filter.doFilter( servletRequest, servletResponse, filterChain );
         filter.doFilter( servletRequest, servletResponse, filterChain );
-        filter.doFilter( servletRequest, servletResponse, filterChain );
 
         // Then
-        verify( filterChain, times( 3 ) ).doFilter( same( servletRequest ), same( servletResponse ) );
+        verify( filterChain, times( 2 ) ).doFilter( same( servletRequest ), same( servletResponse ) );
     }
 
     @Test
diff --git a/community/server/src/test/java/org/neo4j/server/security/auth/AuthorizationWhitelistIT.java b/community/server/src/test/java/org/neo4j/server/security/auth/AuthorizationWhitelistIT.java
index b470192b87447..6a9361ef9df50 100644
--- a/community/server/src/test/java/org/neo4j/server/security/auth/AuthorizationWhitelistIT.java
+++ b/community/server/src/test/java/org/neo4j/server/security/auth/AuthorizationWhitelistIT.java
@@ -54,7 +54,7 @@ public void shouldWhitelistBrowser() throws Exception
     }
 
     @Test
-    public void shouldNotWhitelistWebadminConsole() throws Exception
+    public void shouldNotWhitelistConsoleService() throws Exception
     {
         // Given
         server = CommunityServerBuilder.server().withProperty( GraphDatabaseSettings.auth_enabled.name(), "true" ).build();
@@ -62,7 +62,7 @@ public void shouldNotWhitelistWebadminConsole() throws Exception
         // When
         server.start();
 
-        // Then I should be able to access the webadmin
+        // Then I should be able to access the console service
         HTTP.Response response = HTTP.GET( server.baseUri().resolve( "db/manage/server/console" ).toString() );
         assertThat( response.status(), equalTo( 401 ) );
     }
diff --git a/community/server/src/test/java/org/neo4j/server/webadmin/rest/CommunityVersionAndEditionServiceDocIT.java b/community/server/src/test/java/org/neo4j/server/webadmin/rest/CommunityVersionAndEditionServiceDocIT.java
deleted file mode 100644
index cd03ffbcff46b..0000000000000
--- a/community/server/src/test/java/org/neo4j/server/webadmin/rest/CommunityVersionAndEditionServiceDocIT.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * 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 <http://www.gnu.org/licenses/>.
- */
-package org.neo4j.server.webadmin.rest;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
-import java.util.concurrent.Callable;
-
-import org.neo4j.helpers.FakeClock;
-import org.neo4j.kernel.internal.KernelData;
-import org.neo4j.server.NeoServer;
-import org.neo4j.server.helpers.CommunityServerBuilder;
-import org.neo4j.server.helpers.FunctionalTestHelper;
-import org.neo4j.server.rest.RESTDocsGenerator;
-import org.neo4j.server.rest.management.VersionAndEditionService;
-import org.neo4j.test.TestData;
-import org.neo4j.test.server.ExclusiveServerTestBase;
-import org.neo4j.test.server.HTTP;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.neo4j.test.SuppressOutput.suppressAll;
-
-/*
-Note that when running this test from within an IDE, the version field will be an empty string. This is because the
-code that generates the version identifier is written by Maven as part of the build process(!). The tests will pass
-both in the IDE (where the empty string will be correctly compared).
- */
-public class CommunityVersionAndEditionServiceDocIT extends ExclusiveServerTestBase
-{
-    private static NeoServer server;
-    private static FunctionalTestHelper functionalTestHelper;
-
-    @ClassRule
-    public static TemporaryFolder staticFolder = new TemporaryFolder();
-
-    public
-    @Rule
-    TestData<RESTDocsGenerator> gen = TestData.producedThrough( RESTDocsGenerator.PRODUCER );
-    private static FakeClock clock;
-
-    @Before
-    public void setUp()
-    {
-        gen.get().setSection( "dev/rest-api/database-version" );
-    }
-
-    @BeforeClass
-    public static void setupServer() throws Exception
-    {
-        clock = new FakeClock();
-        server = CommunityServerBuilder.server()
-                .usingDataDir( staticFolder.getRoot().getAbsolutePath() )
-                .withClock( clock )
-                .build();
-
-        suppressAll().call( new Callable<Void>()
-        {
-            @Override
-            public Void call() throws Exception
-            {
-                server.start();
-                return null;
-            }
-        } );
-        functionalTestHelper = new FunctionalTestHelper( server );
-    }
-
-    @Before
-    public void setupTheDatabase() throws Exception
-    {
-        // do nothing, we don't care about the database contents here
-    }
-
-    @AfterClass
-    public static void stopServer() throws Exception
-    {
-        suppressAll().call( new Callable<Void>()
-        {
-            @Override
-            public Void call() throws Exception
-            {
-                server.stop();
-                return null;
-            }
-        } );
-    }
-
-    @Test
-    public void shouldReportCommunityEdition() throws Exception
-    {
-        // Given
-        String releaseVersion = server.getDatabase().getGraph().getDependencyResolver().resolveDependency( KernelData
-                .class ).version().getReleaseVersion();
-
-        // When
-        HTTP.Response res =
-                HTTP.GET( functionalTestHelper.managementUri() + "/" + VersionAndEditionService.SERVER_PATH );
-
-        // Then
-        assertEquals( 200, res.status() );
-        assertThat( res.get( "edition" ).asText(), equalTo( "community" ) );
-        assertThat( res.get( "version" ).asText(), equalTo( releaseVersion ) );
-    }
-}
diff --git a/community/server/src/test/java/org/neo4j/server/webadmin/rest/ConfigureEnabledManagementConsolesDocIT.java b/community/server/src/test/java/org/neo4j/server/webadmin/rest/ConfigureEnabledManagementConsolesDocIT.java
deleted file mode 100644
index 9865cd4172977..0000000000000
--- a/community/server/src/test/java/org/neo4j/server/webadmin/rest/ConfigureEnabledManagementConsolesDocIT.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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 <http://www.gnu.org/licenses/>.
- */
-package org.neo4j.server.webadmin.rest;
-
-import org.junit.After;
-import org.junit.Test;
-
-import org.neo4j.server.NeoServer;
-import org.neo4j.server.configuration.ServerSettings;
-import org.neo4j.server.rest.JaxRsResponse;
-import org.neo4j.server.rest.RestRequest;
-import org.neo4j.test.server.ExclusiveServerTestBase;
-
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-import static org.neo4j.server.helpers.CommunityServerBuilder.server;
-
-public class ConfigureEnabledManagementConsolesDocIT extends ExclusiveServerTestBase
-{
-    private NeoServer server;
-
-    @After
-    public void stopTheServer()
-    {
-        server.stop();
-    }
-
-    @Test
-    public void shouldBeAbleToExplicitlySetConsolesToEnabled() throws Exception
-    {
-        server = server().withProperty( ServerSettings.console_module_engines.name(), "" )
-                .usingDataDir( folder.directory( name.getMethodName() ).getAbsolutePath() )
-                .build();
-        server.start();
-
-        assertThat( exec( "ls", "shell" ).getStatus(), is( 400 ) );
-    }
-
-    @Test
-    public void shellConsoleShouldBeEnabledByDefault() throws Exception
-    {
-        server = server().usingDataDir( folder.directory( name.getMethodName() ).getAbsolutePath() ).build();
-        server.start();
-
-        assertThat( exec( "ls", "shell" ).getStatus(), is( 200 ) );
-    }
-
-    private JaxRsResponse exec( String command, String engine )
-    {
-        return RestRequest.req().post( server.baseUri() + "db/manage/server/console", "{" +
-                "\"engine\":\"" + engine + "\"," +
-                "\"command\":\"" + command + "\\n\"}" );
-    }
-}
diff --git a/community/server/src/test/java/org/neo4j/server/webadmin/rest/ConsoleServiceDocTest.java b/community/server/src/test/java/org/neo4j/server/webadmin/rest/ConsoleServiceDocTest.java
deleted file mode 100644
index cab1b8bb8125e..0000000000000
--- a/community/server/src/test/java/org/neo4j/server/webadmin/rest/ConsoleServiceDocTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * 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 <http://www.gnu.org/licenses/>.
- */
-package org.neo4j.server.webadmin.rest;
-
-import org.junit.Test;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Collections;
-import javax.ws.rs.core.Response;
-
-import org.neo4j.helpers.UTF8;
-import org.neo4j.logging.LogProvider;
-import org.neo4j.logging.NullLogProvider;
-import org.neo4j.server.database.Database;
-import org.neo4j.server.rest.management.console.ConsoleService;
-import org.neo4j.server.rest.repr.OutputFormat;
-import org.neo4j.server.rest.repr.formats.JsonFormat;
-import org.neo4j.server.rest.management.console.ConsoleSessionFactory;
-import org.neo4j.server.rest.management.console.ScriptSession;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-
-public class ConsoleServiceDocTest
-{
-    private final URI uri = URI.create( "http://peteriscool.com:6666/" );
-
-    @Test
-    public void correctRepresentation() throws URISyntaxException
-    {
-        ConsoleService consoleService = new ConsoleService( new ShellOnlyConsoleSessionFactory(), mock( Database.class ),
-                NullLogProvider.getInstance(), new OutputFormat( new JsonFormat(), uri, null ) );
-
-        Response consoleResponse = consoleService.getServiceDefinition();
-
-        assertEquals( 200, consoleResponse.getStatus() );
-        String response = decode( consoleResponse );
-        assertThat( response, containsString( "resources" ) );
-        assertThat( response, containsString( uri.toString() ) );
-    }
-
-    @Test
-    public void advertisesAvailableConsoleEngines() throws URISyntaxException
-    {
-        ConsoleService consoleServiceWithJustShellEngine = new ConsoleService( new ShellOnlyConsoleSessionFactory(),
-                mock( Database.class ), NullLogProvider.getInstance(), new OutputFormat( new JsonFormat(), uri, null ) );
-
-        String response = decode( consoleServiceWithJustShellEngine.getServiceDefinition());
-
-        assertThat( response, containsString( "\"engines\" : [ \"shell\" ]" ) );
-
-    }
-
-    private String decode( final Response response )
-    {
-        return UTF8.decode( (byte[]) response.getEntity() );
-    }
-
-    private static class ShellOnlyConsoleSessionFactory implements ConsoleSessionFactory
-    {
-        @Override
-        public ScriptSession createSession( String engineName, Database database, LogProvider logProvider )
-        {
-            return null;
-        }
-
-        @Override
-        public Iterable<String> supportedEngines()
-        {
-            return Collections.singletonList( "shell" );
-        }
-    }
-}
diff --git a/community/server/src/test/java/org/neo4j/server/webadmin/rest/JmxServiceDocTest.java b/community/server/src/test/java/org/neo4j/server/webadmin/rest/JmxServiceDocTest.java
deleted file mode 100644
index bd331c3363395..0000000000000
--- a/community/server/src/test/java/org/neo4j/server/webadmin/rest/JmxServiceDocTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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 <http://www.gnu.org/licenses/>.
- */
-package org.neo4j.server.webadmin.rest;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import javax.ws.rs.core.Response;
-
-import org.neo4j.helpers.UTF8;
-import org.neo4j.server.rest.management.JmxService;
-import org.neo4j.server.rest.repr.OutputFormat;
-import org.neo4j.server.rest.repr.formats.JsonFormat;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertEquals;
-
-public class JmxServiceDocTest
-{
-    public JmxService jmxService;
-    private final URI uri = URI.create( "http://peteriscool.com:6666/" );
-
-    @Test
-    public void correctRepresentation() throws URISyntaxException
-    {
-        Response resp = jmxService.getServiceDefinition();
-
-        assertEquals( 200, resp.getStatus() );
-
-        String json = UTF8.decode( (byte[]) resp.getEntity() );
-        assertThat( json, containsString( "resources" ) );
-        assertThat( json, containsString( uri.toString() ) );
-        assertThat( json, containsString( "jmx/domain/{domain}/{objectName}" ) );
-    }
-
-    @Test
-    public void shouldListDomainsCorrectly() throws Exception
-    {
-        Response resp = jmxService.listDomains();
-
-        assertEquals( 200, resp.getStatus() );
-    }
-
-    @Test
-    public void testwork() throws Exception
-    {
-        jmxService.queryBeans( "[\"*:*\"]" );
-    }
-
-    @Before
-    public void setUp() throws Exception
-    {
-        this.jmxService = new JmxService( new OutputFormat( new JsonFormat(), uri, null ), null );
-    }
-
-}
diff --git a/community/server/src/test/java/org/neo4j/server/webadmin/rest/Neo4jShellConsoleSessionDocTest.java b/community/server/src/test/java/org/neo4j/server/webadmin/rest/Neo4jShellConsoleSessionDocTest.java
deleted file mode 100644
index eee252ba17c18..0000000000000
--- a/community/server/src/test/java/org/neo4j/server/webadmin/rest/Neo4jShellConsoleSessionDocTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * 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 <http://www.gnu.org/licenses/>.
- */
-package org.neo4j.server.webadmin.rest;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-import javax.ws.rs.core.Response;
-
-import org.neo4j.helpers.UTF8;
-import org.neo4j.kernel.configuration.Settings;
-import org.neo4j.kernel.impl.factory.GraphDatabaseFacade;
-import org.neo4j.logging.LogProvider;
-import org.neo4j.logging.NullLogProvider;
-import org.neo4j.server.database.Database;
-import org.neo4j.server.database.WrappedDatabase;
-import org.neo4j.server.rest.domain.JsonHelper;
-import org.neo4j.server.rest.domain.JsonParseException;
-import org.neo4j.server.rest.management.console.ConsoleService;
-import org.neo4j.server.rest.management.console.ShellSession;
-import org.neo4j.server.rest.repr.OutputFormat;
-import org.neo4j.server.rest.repr.formats.JsonFormat;
-import org.neo4j.server.rest.management.console.ConsoleSessionFactory;
-import org.neo4j.server.rest.management.console.ScriptSession;
-import org.neo4j.shell.ShellSettings;
-import org.neo4j.test.TestGraphDatabaseFactory;
-
-import static java.lang.System.lineSeparator;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertEquals;
-
-public class Neo4jShellConsoleSessionDocTest implements ConsoleSessionFactory
-{
-    private ConsoleService consoleService;
-    private Database database;
-    private final URI uri = URI.create( "http://peteriscool.com:6666/" );
-
-    @Before
-    public void setUp() throws Exception
-    {
-        this.database = new WrappedDatabase( (GraphDatabaseFacade) new TestGraphDatabaseFactory().
-                newImpermanentDatabaseBuilder().
-                setConfig( ShellSettings.remote_shell_enabled, Settings.TRUE ).
-                newGraphDatabase() );
-        this.consoleService = new ConsoleService(
-                this,
-                database,
-                NullLogProvider.getInstance(),
-                new OutputFormat( new JsonFormat(), uri, null ) );
-    }
-
-    @After
-    public void shutdownDatabase()
-    {
-        this.database.getGraph().shutdown();
-    }
-
-    @Override
-    public ScriptSession createSession( String engineName, Database database, LogProvider logProvider )
-    {
-        return new ShellSession( database.getGraph() );
-    }
-
-    @Test
-    public void doesntMangleNewlines() throws Exception
-    {
-        Response response = consoleService.exec( new JsonFormat(),
-                "{ \"command\" : \"create (n) return n;\", \"engine\":\"shell\" }" );
-
-
-        assertEquals( 200, response.getStatus() );
-        String result = decode( response ).get( 0 );
-
-        String expected = "+-----------+" + lineSeparator()
-                + "| n         |" + lineSeparator()
-                + "+-----------+" + lineSeparator()
-                + "| Node[0]{} |" + lineSeparator()
-                + "+-----------+" + lineSeparator()
-                + "1 row";
-
-        assertThat( result, containsString( expected ) );
-    }
-
-    private List<String> decode( final Response response ) throws JsonParseException
-    {
-        return (List<String>) JsonHelper.readJson( UTF8.decode( (byte[]) response.getEntity() ) );
-    }
-
-    @Override
-    public Iterable<String> supportedEngines()
-    {
-        return new ArrayList<String>()
-        {{
-            add( "shell" );
-        }};
-    }
-}
diff --git a/community/server/src/test/java/org/neo4j/server/webadmin/rest/RootServiceDocTest.java b/community/server/src/test/java/org/neo4j/server/webadmin/rest/RootServiceDocTest.java
deleted file mode 100644
index 89131d6884291..0000000000000
--- a/community/server/src/test/java/org/neo4j/server/webadmin/rest/RootServiceDocTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * 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 <http://www.gnu.org/licenses/>.
- */
-package org.neo4j.server.webadmin.rest;
-
-import org.junit.Test;
-
-import java.net.URI;
-import java.util.Map;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
-import org.neo4j.kernel.GraphDatabaseDependencies;
-import org.neo4j.kernel.configuration.Config;
-import org.neo4j.kernel.monitoring.Monitors;
-import org.neo4j.logging.NullLogProvider;
-import org.neo4j.server.CommunityNeoServer;
-import org.neo4j.server.rest.management.RootService;
-import org.neo4j.server.rest.repr.formats.JsonFormat;
-import org.neo4j.test.server.EntityOutputFormat;
-
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class RootServiceDocTest
-{
-    @Test
-    public void shouldAdvertiseServicesWhenAsked() throws Exception
-    {
-        UriInfo uriInfo = mock( UriInfo.class );
-        URI uri = new URI( "http://example.org:7474/" );
-        when( uriInfo.getBaseUri() ).thenReturn( uri );
-
-        RootService svc = new RootService( new CommunityNeoServer( Config.empty(),
-                GraphDatabaseDependencies.newDependencies().userLogProvider( NullLogProvider.getInstance() ).monitors( new Monitors() ),
-                NullLogProvider.getInstance() ) );
-
-        EntityOutputFormat output = new EntityOutputFormat( new JsonFormat(), null, null );
-        Response serviceDefinition = svc.getServiceDefinition( uriInfo, output );
-
-        assertEquals( 200, serviceDefinition.getStatus() );
-        Map<String, Object> result = (Map<String, Object>) output.getResultAsMap().get( "services" );
-
-        assertThat( result.get( "console" )
-                .toString(), containsString( String.format( "%sserver/console", uri.toString() ) ) );
-        assertThat( result.get( "jmx" )
-                .toString(), containsString( String.format( "%sserver/jmx", uri.toString() ) ) );
-    }
-}
diff --git a/community/server/src/test/java/org/neo4j/server/webadmin/rest/VersionAndEditionServiceTest.java b/community/server/src/test/java/org/neo4j/server/webadmin/rest/VersionAndEditionServiceTest.java
deleted file mode 100644
index ba5e86c5d7b58..0000000000000
--- a/community/server/src/test/java/org/neo4j/server/webadmin/rest/VersionAndEditionServiceTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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 <http://www.gnu.org/licenses/>.
- */
-package org.neo4j.server.webadmin.rest;
-
-import org.junit.Test;
-
-import org.neo4j.server.CommunityNeoServer;
-import org.neo4j.server.rest.management.VersionAndEditionService;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-
-public class VersionAndEditionServiceTest
-{
-    @Test
-    public void shouldReturnReadableStringForServiceName() throws Exception
-    {
-        // given
-        VersionAndEditionService service = new VersionAndEditionService( mock( CommunityNeoServer.class ) );
-
-        // when
-        String serviceName = service.getName();
-        // then
-        assertEquals( "version", serviceName );
-    }
-
-    @Test
-    public void shouldReturnSensiblePathWhereServiceIsHosted() throws Exception
-    {
-        // given
-        VersionAndEditionService service = new VersionAndEditionService( mock( CommunityNeoServer.class ) );
-
-        // when
-        String serverPath = service.getServerPath();
-
-        // then
-        assertEquals( "server/version", serverPath );
-    }
-}
-
-
diff --git a/community/server/src/test/java/org/neo4j/server/webadmin/rest/representations/ServerRootRepresentationTest.java b/community/server/src/test/java/org/neo4j/server/webadmin/rest/representations/ServerRootRepresentationTest.java
deleted file mode 100644
index fdefb2395d636..0000000000000
--- a/community/server/src/test/java/org/neo4j/server/webadmin/rest/representations/ServerRootRepresentationTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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 <http://www.gnu.org/licenses/>.
- */
-package org.neo4j.server.webadmin.rest.representations;
-
-import java.net.URI;
-import java.util.Collections;
-import java.util.Map;
-
-import org.junit.Test;
-
-import org.neo4j.logging.NullLogProvider;
-import org.neo4j.server.database.Database;
-import org.neo4j.server.rest.management.AdvertisableService;
-import org.neo4j.server.rest.management.console.ConsoleService;
-import org.neo4j.server.rest.management.repr.ServerRootRepresentation;
-
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.mock;
-
-public class ServerRootRepresentationTest
-{
-    @Test
-    public void shouldProvideAListOfServiceUris() throws Exception
-    {
-        ConsoleService consoleService = new ConsoleService( null, mock( Database.class ), NullLogProvider.getInstance(), null );
-        ServerRootRepresentation srr = new ServerRootRepresentation( new URI( "http://example.org:9999" ),
-                Collections.<AdvertisableService>singletonList( consoleService ) );
-        Map<String, Map<String, String>> map = srr.serialize();
-
-        assertNotNull( map.get( "services" ) );
-
-        assertThat( map.get( "services" )
-                .get( consoleService.getName() ), containsString( consoleService.getServerPath() ) );
-    }
-}
diff --git a/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseNeoServer.java b/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseNeoServer.java
index b93e5a42001c4..26a5b061176eb 100644
--- a/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseNeoServer.java
+++ b/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseNeoServer.java
@@ -41,8 +41,8 @@
 import org.neo4j.server.enterprise.modules.JMXManagementModule;
 import org.neo4j.server.modules.ServerModule;
 import org.neo4j.server.rest.management.AdvertisableService;
-import org.neo4j.server.webadmin.rest.DatabaseRoleInfoServerModule;
-import org.neo4j.server.webadmin.rest.MasterInfoService;
+import org.neo4j.server.rest.DatabaseRoleInfoServerModule;
+import org.neo4j.server.rest.MasterInfoService;
 
 import static java.util.Arrays.asList;
 
diff --git a/enterprise/server-enterprise/src/main/java/org/neo4j/server/webadmin/rest/CoreDatabaseAvailabilityDiscoveryRepresentation.java b/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/CoreDatabaseAvailabilityDiscoveryRepresentation.java
similarity index 97%
rename from enterprise/server-enterprise/src/main/java/org/neo4j/server/webadmin/rest/CoreDatabaseAvailabilityDiscoveryRepresentation.java
rename to enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/CoreDatabaseAvailabilityDiscoveryRepresentation.java
index e05b73a0ea549..3a18bd3b358b2 100644
--- a/enterprise/server-enterprise/src/main/java/org/neo4j/server/webadmin/rest/CoreDatabaseAvailabilityDiscoveryRepresentation.java
+++ b/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/CoreDatabaseAvailabilityDiscoveryRepresentation.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.server.webadmin.rest;
+package org.neo4j.server.rest;
 
 import org.neo4j.server.rest.repr.MappingRepresentation;
 import org.neo4j.server.rest.repr.MappingSerializer;
diff --git a/enterprise/server-enterprise/src/main/java/org/neo4j/server/webadmin/rest/CoreDatabaseAvailabilityService.java b/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/CoreDatabaseAvailabilityService.java
similarity index 98%
rename from enterprise/server-enterprise/src/main/java/org/neo4j/server/webadmin/rest/CoreDatabaseAvailabilityService.java
rename to enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/CoreDatabaseAvailabilityService.java
index 9affac950bb71..bbf8233796aa2 100644
--- a/enterprise/server-enterprise/src/main/java/org/neo4j/server/webadmin/rest/CoreDatabaseAvailabilityService.java
+++ b/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/CoreDatabaseAvailabilityService.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.server.webadmin.rest;
+package org.neo4j.server.rest;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
diff --git a/enterprise/server-enterprise/src/main/java/org/neo4j/server/webadmin/rest/DatabaseRoleInfoServerModule.java b/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/DatabaseRoleInfoServerModule.java
similarity index 98%
rename from enterprise/server-enterprise/src/main/java/org/neo4j/server/webadmin/rest/DatabaseRoleInfoServerModule.java
rename to enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/DatabaseRoleInfoServerModule.java
index cded891c91668..30c1d8dd9964d 100644
--- a/enterprise/server-enterprise/src/main/java/org/neo4j/server/webadmin/rest/DatabaseRoleInfoServerModule.java
+++ b/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/DatabaseRoleInfoServerModule.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.server.webadmin.rest;
+package org.neo4j.server.rest;
 
 import java.net.URI;
 import java.util.List;
diff --git a/enterprise/server-enterprise/src/main/java/org/neo4j/server/webadmin/rest/HaDiscoveryRepresentation.java b/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/HaDiscoveryRepresentation.java
similarity index 97%
rename from enterprise/server-enterprise/src/main/java/org/neo4j/server/webadmin/rest/HaDiscoveryRepresentation.java
rename to enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/HaDiscoveryRepresentation.java
index ebc2d99c249f9..9c86098c83f43 100644
--- a/enterprise/server-enterprise/src/main/java/org/neo4j/server/webadmin/rest/HaDiscoveryRepresentation.java
+++ b/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/HaDiscoveryRepresentation.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.server.webadmin.rest;
+package org.neo4j.server.rest;
 
 import org.neo4j.server.rest.repr.MappingRepresentation;
 import org.neo4j.server.rest.repr.MappingSerializer;
diff --git a/enterprise/server-enterprise/src/main/java/org/neo4j/server/webadmin/rest/MasterInfoService.java b/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/MasterInfoService.java
similarity index 99%
rename from enterprise/server-enterprise/src/main/java/org/neo4j/server/webadmin/rest/MasterInfoService.java
rename to enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/MasterInfoService.java
index 0e42136dc6122..85a1d2bf0ea94 100644
--- a/enterprise/server-enterprise/src/main/java/org/neo4j/server/webadmin/rest/MasterInfoService.java
+++ b/enterprise/server-enterprise/src/main/java/org/neo4j/server/rest/MasterInfoService.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.server.webadmin.rest;
+package org.neo4j.server.rest;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/StandaloneHaInfoFunctionalTest.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/StandaloneHaInfoFunctionalTest.java
index 3b799970126b5..4c742ac222f4b 100644
--- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/StandaloneHaInfoFunctionalTest.java
+++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/StandaloneHaInfoFunctionalTest.java
@@ -21,9 +21,9 @@
 
 import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
 import static org.junit.Assert.assertEquals;
-import static org.neo4j.server.webadmin.rest.MasterInfoService.BASE_PATH;
-import static org.neo4j.server.webadmin.rest.MasterInfoService.IS_MASTER_PATH;
-import static org.neo4j.server.webadmin.rest.MasterInfoService.IS_SLAVE_PATH;
+import static org.neo4j.server.rest.MasterInfoService.BASE_PATH;
+import static org.neo4j.server.rest.MasterInfoService.IS_MASTER_PATH;
+import static org.neo4j.server.rest.MasterInfoService.IS_SLAVE_PATH;
 import static org.neo4j.test.server.ha.EnterpriseServerHelper.createNonPersistentServer;
 
 import java.io.IOException;
diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/webadmin/rest/EnterpriseVersionAndEditionServiceIT.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/EnterpriseVersionAndEditionServiceIT.java
similarity index 98%
rename from enterprise/server-enterprise/src/test/java/org/neo4j/server/webadmin/rest/EnterpriseVersionAndEditionServiceIT.java
rename to enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/EnterpriseVersionAndEditionServiceIT.java
index 69e78dc3f78e9..fcb82db2ce6e4 100644
--- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/webadmin/rest/EnterpriseVersionAndEditionServiceIT.java
+++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/EnterpriseVersionAndEditionServiceIT.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.server.webadmin.rest;
+package org.neo4j.server.rest;
 
 import org.junit.AfterClass;
 import org.junit.Before;
diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/webadmin/rest/MasterInfoServiceTest.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/MasterInfoServiceTest.java
similarity index 99%
rename from enterprise/server-enterprise/src/test/java/org/neo4j/server/webadmin/rest/MasterInfoServiceTest.java
rename to enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/MasterInfoServiceTest.java
index a29f512440a28..58b7a2aee247b 100644
--- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/webadmin/rest/MasterInfoServiceTest.java
+++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/MasterInfoServiceTest.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.server.webadmin.rest;
+package org.neo4j.server.rest;
 
 import javax.ws.rs.core.Response;
 
diff --git a/manual/contents/src/tools/index.asciidoc b/manual/contents/src/tools/index.asciidoc
index 8f08ba727bcc4..7a0799041078c 100644
--- a/manual/contents/src/tools/index.asciidoc
+++ b/manual/contents/src/tools/index.asciidoc
@@ -13,9 +13,5 @@ include::{importdir}/neo4j-import-tool-docs-jar/ops/import-tool.asciidoc[]
 
 :leveloffset: 1
 
-include::webadmin.asciidoc[]
-
-:leveloffset: 1
-
 include::{importdir}/neo4j-shell-docs-jar/dev/shell.asciidoc[]
 
diff --git a/manual/contents/src/tools/webadmin.asciidoc b/manual/contents/src/tools/webadmin.asciidoc
deleted file mode 100644
index 0258580e813ab..0000000000000
--- a/manual/contents/src/tools/webadmin.asciidoc
+++ /dev/null
@@ -1,10 +0,0 @@
-[[tools-webadmin]]
-= Web Interface =
-
-The Neo4j Web Interface is the primary user interface for Neo4j.
-
-The tool is available at http://127.0.0.1:7474/ after you have installed the <<server-installation,Neo4j Server>>.
-
-See the tool itself for more information!
-
-
diff --git a/manual/cypher/cypher-docs/src/docs/dev/tutorials/cypher.asciidoc b/manual/cypher/cypher-docs/src/docs/dev/tutorials/cypher.asciidoc
index 4e0009be238aa..ea1c20b243622 100644
--- a/manual/cypher/cypher-docs/src/docs/dev/tutorials/cypher.asciidoc
+++ b/manual/cypher/cypher-docs/src/docs/dev/tutorials/cypher.asciidoc
@@ -7,8 +7,8 @@ In the online edition of this manual, all queries in this section can be execute
 
 Otherwise, first get the Neo4j server running to try things out locally.
 Instructions are found in <<server-installation>>.
-With the server running, you can choose to issue Cypher queries from either the web interface or the Neo4j shell.
-See <<tools-webadmin>> or <<shell>>.
+With the server running, you can choose to issue Cypher queries from either the Neo4j Browser or the Neo4j shell.
+See <<shell>>.
 
 :leveloffset: 2
 
diff --git a/packaging/standalone/document.properties b/packaging/standalone/document.properties
index db7dc6b5ebbbe..2feb7c47e683b 100644
--- a/packaging/standalone/document.properties
+++ b/packaging/standalone/document.properties
@@ -4,5 +4,3 @@ shell.fullname=Neo4j Shell
 shell.shortname=neo4j-shell
 libs.fullname=Neo4j Libraries
 libs.shortname=neo4j-libs
-webadmin.fullname=Neo4j Web Administration
-webadmin.shortname=Webadmin
diff --git a/packaging/standalone/pom.xml b/packaging/standalone/pom.xml
index 5831ff16ee757..ce71c8733b365 100644
--- a/packaging/standalone/pom.xml
+++ b/packaging/standalone/pom.xml
@@ -54,7 +54,7 @@
 
     <dbms.security.tls_certificate_file>conf/ssl/snakeoil.cert</dbms.security.tls_certificate_file>
     <dbms.security.tls_key_file>conf/ssl/snakeoil.key</dbms.security.tls_key_file>
-    <org.neo4j.webservice.packages>org.neo4j.rest.web,org.neo4j.webadmin,org.neo4j.webadmin.backup,org.neo4j.webadmin.console,org.neo4j.webadmin.domain,org.neo4j.webadmin.parser,org.neo4j.webadmin.properties,org.neo4j.webadmin.resources,org.neo4j.webadmin.rest,org.neo4j.webadmin.rrd,org.neo4j.webadmin.task,org.neo4j.webadmin.utils</org.neo4j.webservice.packages>
+    <org.neo4j.webservice.packages>org.neo4j.rest.web</org.neo4j.webservice.packages>
 
     <!-- Runtime properties. These are used to bootstrap the server. All other configuration should happen through a configuration file. Each of these should have a sensible default, so that the server can operate without them defined. -->
     <neo4j.home>${project.build.directory}/neo4j</neo4j.home>