From e43045cd1db827e544c0b0f771615781d44b44f1 Mon Sep 17 00:00:00 2001
From: Mark Peace <mark.peace@neotechnology.com>
Date: Fri, 4 Mar 2016 11:27:03 +0000
Subject: [PATCH] Cleanup around webadmin removal

---
 community/server/pom.xml                      | 127 ------------------
 .../server/src/main/assemblies/static-web.xml |  60 ---------
 .../neo4j/server/modules/WebAdminModule.java  |   3 -
 .../java/org/neo4j/server/NeoServerDocIT.java |   2 +-
 .../org/neo4j/server/ServerConfigDocIT.java   |   7 +-
 .../server/helpers/FunctionalTestHelper.java  |  17 +--
 .../server/rest/DiscoveryServiceDocIT.java    |   2 +-
 .../test/resources/SpecRunner.htmlTemplate    |  49 -------
 community/server/tools/webadmin-develop       |  66 ---------
 enterprise/server-enterprise/pom.xml          |  35 -----
 packaging/.gitignore                          |   1 -
 packaging/neo4j-desktop/pom.xml               |   7 -
 packaging/standalone/pom.xml                  |   6 -
 13 files changed, 10 insertions(+), 372 deletions(-)
 delete mode 100644 community/server/src/main/assemblies/static-web.xml
 delete mode 100644 community/server/src/test/resources/SpecRunner.htmlTemplate
 delete mode 100755 community/server/tools/webadmin-develop

diff --git a/community/server/pom.xml b/community/server/pom.xml
index ff74a7b9e7ba1..e87ddccf0dad5 100644
--- a/community/server/pom.xml
+++ b/community/server/pom.xml
@@ -337,38 +337,6 @@
   </dependencies>
 
   <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <excludes>
-          <exclude>webadmin-html/index.html</exclude>
-        </excludes>
-        <filtering>false</filtering>
-      </resource>
-
-      <resource>
-        <directory>src/main/resources/</directory>
-        <includes>
-          <include>webadmin-html/index.html</include>
-        </includes>
-        <filtering>true</filtering>
-      </resource>
-
-      <resource>
-        <directory>${project.build.directory}/generated-sources</directory>
-      </resource>
-      <resource>
-        <directory>${basedir}</directory>
-        <targetPath>META-INF</targetPath>
-        <includes>
-          <include>NOTICE.txt</include>
-          <include>LICENSE.txt</include>
-          <include>CHANGES.txt</include>
-          <include>LICENSES.txt</include>
-        </includes>
-      </resource>
-    </resources>
-
     <plugins>
 
       <!-- Development execution -->
@@ -398,19 +366,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <executions>
-          <execution>
-            <id>static-web</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <attach>true</attach>
-              <descriptors>
-                <descriptor>src/main/assemblies/static-web.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
           <execution>
             <id>sources</id>
             <phase>package</phase>
@@ -454,11 +409,6 @@
             <include>src/**/*.scala</include>
             <include>src/**/*.xml</include>
           </includes>
-          <excludes>
-            <exclude>**/lib/*.js</exclude>
-            <exclude>**/lib/**/*.js</exclude>
-            <exclude>**/webadmin-html/**</exclude>
-          </excludes>
           <mapping>
             <scala>JAVADOC_STYLE</scala>
           </mapping>
@@ -480,7 +430,6 @@
                 </manifest>
               </archive>
               <excludes>
-                <exclude>webadmin-html/**</exclude>
                 <exclude>lib/**</exclude>
               </excludes>
             </configuration>
@@ -713,82 +662,6 @@
       </activation>
     </profile>
 
-    <profile>
-      <id>neodev</id>
-      <!-- Expands the number of things skipped by the neodev profile defined in parent-central pom. This is meant to be used by maven exec, it does not guarantee producing working artifacts. -->
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>static-web</id>
-                <phase>none</phase>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <profile>
-      <id>skip-brew</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>com.voltvoodoo</groupId>
-            <artifactId>brew</artifactId>
-            <executions>
-              <execution>
-                <id>compile-webadmin</id>
-                <phase>none</phase>
-              </execution>
-              <execution>
-                <id>minify-webadmin</id>
-                <phase>none</phase>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>com.github.searls</groupId>
-            <artifactId>jasmine-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>webadmin-specs</id>
-                <phase>none</phase>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <!-- Firefox is default implementation, set in properties at the top of this file. -->
-    <profile>
-      <id>chrome-mac</id>
-      <properties>
-        <webdriver.implementation>Chrome</webdriver.implementation>
-      </properties>
-    </profile>
-    <profile>
-      <id>sauce-labs-firefox-windows</id>
-      <properties>
-        <webdriver.implementation>SauceLabsFirefoxWindows</webdriver.implementation>
-      </properties>
-    </profile>
-    <profile>
-      <id>sauce-labs-chrome-windows</id>
-      <properties>
-        <webdriver.implementation>SauceLabsChromeWindows</webdriver.implementation>
-      </properties>
-    </profile>
-    <profile>
-      <id>sauce-labs-internet-explorer-windows</id>
-      <properties>
-        <webdriver.implementation>SauceLabsInternetExplorerWindows</webdriver.implementation>
-      </properties>
-    </profile>
-
     <profile>
       <id>initial-build</id>
       <repositories>
diff --git a/community/server/src/main/assemblies/static-web.xml b/community/server/src/main/assemblies/static-web.xml
deleted file mode 100644
index 588af7bab4358..0000000000000
--- a/community/server/src/main/assemblies/static-web.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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/>.
-
--->
-<assembly>
-  <id>static-web</id>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <formats>
-    <format>jar</format>
-  </formats>
-  <fileSets>
-    <fileSet>
-      <!-- Filtered files (eg. text files) -->
-      <directory>${project.build.outputDirectory}/webadmin-html</directory>
-      <outputDirectory>/webadmin-html</outputDirectory>
-      <filtered>true</filtered>
-      <includes>
-        <include>**/*.js</include>
-        <include>**/*.html</include>
-        <include>**/*.css</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <!-- Non-Filtered files (eg. binary files) -->
-      <directory>${project.build.outputDirectory}/webadmin-html</directory>
-      <outputDirectory>/webadmin-html</outputDirectory>
-      <excludes>
-      	<exclude>**/*.js</exclude>
-        <exclude>**/*.html</exclude>
-        <exclude>**/*.css</exclude>
-      </excludes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}</directory>
-      <outputDirectory>/META-INF/</outputDirectory>
-      <includes>
-        <include>LICENSE.txt</include>
-        <include>NOTICE.txt</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/community/server/src/main/java/org/neo4j/server/modules/WebAdminModule.java b/community/server/src/main/java/org/neo4j/server/modules/WebAdminModule.java
index b83dc8e18cdf4..52c164117ff2f 100644
--- a/community/server/src/main/java/org/neo4j/server/modules/WebAdminModule.java
+++ b/community/server/src/main/java/org/neo4j/server/modules/WebAdminModule.java
@@ -30,9 +30,6 @@
 
 public class WebAdminModule implements ServerModule
 {
-    private static final String DEFAULT_WEB_ADMIN_PATH = "/webadmin";
-    private static final String DEFAULT_WEB_ADMIN_STATIC_WEB_CONTENT_LOCATION = "webadmin-html";
-
     private final WebServer webServer;
     private Config config;
 
diff --git a/community/server/src/test/java/org/neo4j/server/NeoServerDocIT.java b/community/server/src/test/java/org/neo4j/server/NeoServerDocIT.java
index 6be467952c73c..8770a6b2107d8 100644
--- a/community/server/src/test/java/org/neo4j/server/NeoServerDocIT.java
+++ b/community/server/src/test/java/org/neo4j/server/NeoServerDocIT.java
@@ -41,7 +41,7 @@ public void whenServerIsStartedItshouldStartASingleDatabase() throws Exception
     }
 
     @Test
-    public void shouldRedirectRootToWebadmin() throws Exception
+    public void shouldRedirectRootToBrowser() throws Exception
     {
         assertFalse( server().baseUri()
                 .toString()
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 b0e4e4b3c5d2a..f2e18eeba5e48 100644
--- a/community/server/src/test/java/org/neo4j/server/ServerConfigDocIT.java
+++ b/community/server/src/test/java/org/neo4j/server/ServerConfigDocIT.java
@@ -70,8 +70,8 @@ public void shouldPickUpPortFromConfig() throws Exception
     @Test
     public void shouldPickupRelativeUrisForWebAdminAndWebAdminRest() throws IOException
     {
-        String webAdminDataUri = "/a/different/webadmin/data/uri/";
-        String webAdminManagementUri = "/a/different/webadmin/management/uri/";
+        String webAdminDataUri = "/a/different/data/uri/";
+        String webAdminManagementUri = "/a/different/management/uri/";
 
         server = server().withRelativeWebDataAdminUriPath( webAdminDataUri )
                 .usingDataDir( folder.directory( name.getMethodName() ).getAbsolutePath() )
@@ -142,7 +142,7 @@ public void shouldEnableWebadminConsoleByDefault() throws IOException
     }
 
     @Test
-    public void shouldDisableWebadminWhenAskedTo() throws IOException
+    public void shouldDisableWebadminConsoleWhenAskedTo() throws IOException
     {
         // Given
         server = server().withProperty( ServerSettings.webadmin_enabled.name(), "false" )
@@ -151,7 +151,6 @@ public void shouldDisableWebadminWhenAskedTo() throws IOException
         server.start();
 
         // When & then
-        assertEquals( 404, new RestRequest().get( "http://localhost:7474/webadmin" ).getStatus() );
         assertEquals( 404, new RestRequest().get( "http://localhost:7474/db/manage/server/console" ).getStatus() );
     }
 
diff --git a/community/server/src/test/java/org/neo4j/server/helpers/FunctionalTestHelper.java b/community/server/src/test/java/org/neo4j/server/helpers/FunctionalTestHelper.java
index 25c5481b741bd..033df4dc0fef0 100644
--- a/community/server/src/test/java/org/neo4j/server/helpers/FunctionalTestHelper.java
+++ b/community/server/src/test/java/org/neo4j/server/helpers/FunctionalTestHelper.java
@@ -19,16 +19,16 @@
  */
 package org.neo4j.server.helpers;
 
-import com.sun.jersey.api.client.Client;
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeMatcher;
-
 import java.net.URI;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.sun.jersey.api.client.Client;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+
 import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.server.NeoServer;
 import org.neo4j.server.rest.JaxRsResponse;
@@ -236,13 +236,6 @@ public GraphDatabaseAPI getDatabase()
         return server.getDatabase().getGraph();
     }
 
-    public String webAdminUri()
-    {
-        // the trailing slash prevents a 302 redirect
-        return server.baseUri()
-                .toString() + "webadmin" + "/";
-    }
-
     public JaxRsResponse get(String path) {
         return request.get(path);
     }
diff --git a/community/server/src/test/java/org/neo4j/server/rest/DiscoveryServiceDocIT.java b/community/server/src/test/java/org/neo4j/server/rest/DiscoveryServiceDocIT.java
index fe3d298df2146..145351139255b 100644
--- a/community/server/src/test/java/org/neo4j/server/rest/DiscoveryServiceDocIT.java
+++ b/community/server/src/test/java/org/neo4j/server/rest/DiscoveryServiceDocIT.java
@@ -78,7 +78,7 @@ public void shouldHaveJsonDataInResponse() throws Exception
     }
 
     @Test
-    public void shouldRedirectToWebadminOnHtmlRequest() throws Exception
+    public void shouldRedirectOnHtmlRequest() throws Exception
     {
         Client nonRedirectingClient = Client.create();
         nonRedirectingClient.setFollowRedirects( false );
diff --git a/community/server/src/test/resources/SpecRunner.htmlTemplate b/community/server/src/test/resources/SpecRunner.htmlTemplate
deleted file mode 100644
index f03f1299f4139..0000000000000
--- a/community/server/src/test/resources/SpecRunner.htmlTemplate
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=$sourceEncoding$">
-    <title>Jasmine Spec Runner</title>
-    $cssDependencies$
-    $javascriptDependencies$
-    <script type="text/javascript" src="../../target/classes/webadmin-html/js/require.js"></script>
-</head>
-<body>
-    <script type="text/javascript">
-    
-        if(window.location.href.indexOf("ManualSpecRunner.html") !== -1) 
-        {
-            document.body.appendChild(document.createTextNode("Warning: opening this HTML file directly from the file system is deprecated. You should instead try running `mvn jasmine:bdd` from the command line, and then visit `http://localhost:8234` in your browser. "))
-        }
-
-        var specs = $specs$;
-        
-        window.reporter = new jasmine.$reporter$();
-        
-        require.config({
-            baseUrl: '../../',
-            paths: {
-                // Root namespaces
-                "neo4j"   : "target/classes/webadmin-html/js/neo4j",
-                "ribcage" : "target/classes/webadmin-html/js/ribcage",
-                "lib"     : "target/classes/webadmin-html/js/lib",
-                
-                // Files without namespaces
-                "order"   : "target/classes/webadmin-html/js/order",
-                "feature"   : "target/classes/webadmin-html/js/feature",
-                "implementations": "target/classes/webadmin-html/js/lib/amd/impl-map"
-            },
-        });
-        
-        // Debugging
-        if(typeof(reporter) == "undefined") {
-            throw new Error("'reporter' is undefined, tried to set it to a new jasmine.$reporter$. Value of that is '" + jasmine.$reporter$ + "'.");
-        }
-
-        require(specs, function() 
-        {    
-            jasmine.getEnv().addReporter(reporter);
-            jasmine.getEnv().execute();
-        });
-    </script>
-</body>
-</html>
diff --git a/community/server/tools/webadmin-develop b/community/server/tools/webadmin-develop
deleted file mode 100755
index 23d476fa2c574..0000000000000
--- a/community/server/tools/webadmin-develop
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-SERVER_LOG="./target/server.log"
-BREW_LOG="./target/brew.log"
-SERVER_PID=0
-BREW_PID=0
-
-function startServer() 
-{
-  echo "Compiling and booting server, saving output in '$SERVER_LOG'.."
-  
-  mvn compile exec:java -Pneodev,skip-brew 1> $SERVER_LOG 2> $SERVER_LOG 0> $SERVER_LOG &
-  SERVER_PID=$!
-
-  lastLine=""
-  expected='0.0.0:7474'
-  bad='Failed to start Neo Server on port'
-  until [[ "$lastLine" == *"$expected"* ]]; do
-
-    lastLine=$(tail -n 1 $SERVER_LOG)
-    
-    if [[ "$lastLine" == *"$bad"* ]]; then
-      echo "Starting server failed, please see $SERVER_LOG"
-      exit 1
-    fi
-  
-    sleep 1
-  done
-
-  echo "Server started."
-}
-
-function autoCompileWebadmin() 
-{
-  echo "Booting coffeescript autocompiler.."
-
-  mvn compile -Dbrew.watch=true -Pneodev &
-  BREW_PID=$!
-  
-}
-
-function infiniteSleep() 
-{
-  while(true); do
-    sleep 1;
-  done;
-}
-
-function onExit()
-{
-  echo "Stopping coffeescript compiler.."
-  kill $BREW_PID
-
-  echo "Stopping the server.."
-  kill $SERVER_PID
-}
-
-# 
-# Main
-#
-
-trap onExit EXIT
-
-startServer;
-autoCompileWebadmin;
-infiniteSleep;
diff --git a/enterprise/server-enterprise/pom.xml b/enterprise/server-enterprise/pom.xml
index 458db95c8c79d..e0b93d967a56b 100644
--- a/enterprise/server-enterprise/pom.xml
+++ b/enterprise/server-enterprise/pom.xml
@@ -212,7 +212,6 @@
                 </manifest>
               </archive>
               <excludes>
-                <exclude>webadmin-html/**</exclude>
                 <exclude>lib/**</exclude>
               </excludes>
             </configuration>
@@ -300,40 +299,6 @@
       </build>
     </profile>
 
-    <profile>
-      <!-- Temporarily disconnected from the rest of the build
-      because "brew" is not in maven central. To use this, mvn install
-       -->
-      <id>webadmin-build</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>com.voltvoodoo</groupId>
-            <artifactId>brew</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <executions>
-              <execution>
-                <id>build-webadmin</id>
-                <goals>
-                  <goal>compile-haml</goal>
-                  <goal>compile-coffeescript</goal>
-                  <goal>optimize</goal>
-                </goals>
-              </execution>
-            </executions>
-
-            <configuration>
-              <module>webadmin</module>
-              <coffeeOutputDir>${basedir}/src/main/resources/webadmin-html/js</coffeeOutputDir>
-              <hamlOutputDir>${basedir}/src/main/resources/webadmin-html/js</hamlOutputDir>
-              <optimizeSourceDir>${basedir}/src/main/resources/webadmin-html/js</optimizeSourceDir>
-              <optimizeOutputDir>${basedir}/src/main/resources/webadmin-html/js</optimizeOutputDir>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
     <!-- Firefox is default implementation, set in properties at the top of this file. -->
     <profile>
       <id>htmlunit</id>
diff --git a/packaging/.gitignore b/packaging/.gitignore
index 25746e59b70b9..2b083588b53f2 100644
--- a/packaging/.gitignore
+++ b/packaging/.gitignore
@@ -11,7 +11,6 @@ target
 *.iml
 .idea
 .DS_Store
-server/src/main/resources/webadmin-html/webadmin.js
 /bin
 .gradle
 /installer-windows/src/main/resources/installer/installer-cache/
\ No newline at end of file
diff --git a/packaging/neo4j-desktop/pom.xml b/packaging/neo4j-desktop/pom.xml
index 4108964e04125..4d0718f1caa98 100644
--- a/packaging/neo4j-desktop/pom.xml
+++ b/packaging/neo4j-desktop/pom.xml
@@ -29,13 +29,6 @@
       <artifactId>neo4j-server</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.neo4j.app</groupId>
-      <artifactId>neo4j-server</artifactId>
-      <version>${project.version}</version>
-      <classifier>static-web</classifier>
-    </dependency>
-
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/packaging/standalone/pom.xml b/packaging/standalone/pom.xml
index 614b66c5d1ee5..e27aea936e131 100644
--- a/packaging/standalone/pom.xml
+++ b/packaging/standalone/pom.xml
@@ -315,12 +315,6 @@
       <artifactId>windows-service-wrapper</artifactId>
       <version>${windows-wrapper.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.neo4j.app</groupId>
-      <artifactId>neo4j-server</artifactId>
-      <version>${neo4j.version}</version>
-      <classifier>static-web</classifier>
-    </dependency>
     <dependency>
       <groupId>org.neo4j</groupId>
       <artifactId>neo4j-import-tool</artifactId>