Remove references to webadmin

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.

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

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>

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( "/" )
     };
 

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

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>"

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" )

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 )

community/server/src/test/java/org/neo4j/server/webadmin/console/CypherSessionDocTest.java → 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;

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() ) );
+        }
+    }
 }

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();