Rename webadmin module

neo4j · Mar 10, 2016 · e6b1691 · e6b1691
1 parent 5e2a17f
commit e6b1691
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 40 deletions.
diff --git a/community/server/pom.xml b/community/server/pom.xml
@@ -515,24 +515,6 @@
         <version>1.7</version>
         <!--$NO-MVN-MAN-VER$-->
         <executions>
-          <execution>
-            <phase>process-classes</phase>
-            <configuration>
-              <target>
-                <taskdef
-                    resource="net/sf/antcontrib/antcontrib.properties"
-                    classpathref="maven.plugin.classpath"/>
-
-                <!-- Inject version-specific things (codename, version etc.)
-                     into webadmin -->
-                <!--<ant antfile="src/build/webadmin-branding.ant.xml"/>-->
-
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
           <execution>
             <id>generate-source-based-documentation</id>
             <phase>process-classes</phase>

diff --git a/community/server/src/main/java/org/neo4j/server/CommunityNeoServer.java b/community/server/src/main/java/org/neo4j/server/CommunityNeoServer.java
@@ -39,7 +39,7 @@
 import org.neo4j.server.modules.SecurityRulesModule;
 import org.neo4j.server.modules.ServerModule;
 import org.neo4j.server.modules.ThirdPartyJAXRSModule;
-import org.neo4j.server.modules.WebAdminModule;
+import org.neo4j.server.modules.ConsoleModule;
 import org.neo4j.server.rest.management.AdvertisableService;
 import org.neo4j.server.rest.management.JmxService;
 import org.neo4j.server.rest.management.console.ConsoleService;
@@ -75,7 +75,7 @@ protected Iterable<ServerModule> createServerModules()
                 new RESTApiModule( webServer, database, getConfig(), getDependencyResolver(), logProvider ),
                 new ManagementApiModule( webServer, getConfig() ),
                 new ThirdPartyJAXRSModule( webServer, getConfig(), logProvider, this ),
-                new WebAdminModule( webServer, getConfig() ),
+                new ConsoleModule( webServer, getConfig() ),
                 new Neo4jBrowserModule( webServer ),
                 new AuthorizationModule( webServer, authManagerSupplier, logProvider, getConfig(), getUriWhitelist() ),
                 new SecurityRulesModule( webServer, getConfig(), logProvider ) );

diff --git a/.../neo4j/server/modules/WebAdminModule.java → ...g/neo4j/server/modules/ConsoleModule.java b/.../neo4j/server/modules/WebAdminModule.java → ...g/neo4j/server/modules/ConsoleModule.java
@@ -28,12 +28,12 @@
 import org.neo4j.server.rest.management.console.ConsoleService;
 import org.neo4j.server.web.WebServer;
 
-public class WebAdminModule implements ServerModule
+public class ConsoleModule implements ServerModule
 {
     private final WebServer webServer;
     private Config config;
 
-    public WebAdminModule( WebServer webServer, Config config )
+    public ConsoleModule( WebServer webServer, Config config )
     {
         this.webServer = webServer;
         this.config = config;

diff --git a/community/server/src/main/java/org/neo4j/server/rest/management/console/ConsoleService.java b/community/server/src/main/java/org/neo4j/server/rest/management/console/ConsoleService.java
@@ -45,8 +45,6 @@
 import org.neo4j.server.rest.repr.Representation;
 import org.neo4j.server.rest.repr.RepresentationType;
 import org.neo4j.server.rest.repr.ValueRepresentation;
-import org.neo4j.server.webadmin.console.ConsoleSessionFactory;
-import org.neo4j.server.webadmin.console.ScriptSession;
 import org.neo4j.server.rest.management.AdvertisableService;
 import org.neo4j.server.rest.management.repr.ConsoleServiceRepresentation;
 

diff --git a/...badmin/console/ConsoleSessionCreator.java → ...gement/console/ConsoleSessionCreator.java b/...badmin/console/ConsoleSessionCreator.java → ...gement/console/ConsoleSessionCreator.java
@@ -17,7 +17,7 @@
  * 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;
+package org.neo4j.server.rest.management.console;
 
 import javax.servlet.http.HttpServletRequest;
 

diff --git a/...badmin/console/ConsoleSessionFactory.java → ...gement/console/ConsoleSessionFactory.java b/...badmin/console/ConsoleSessionFactory.java → ...gement/console/ConsoleSessionFactory.java
@@ -17,7 +17,7 @@
  * 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;
+package org.neo4j.server.rest.management.console;
 
 import org.neo4j.logging.LogProvider;
 import org.neo4j.server.database.Database;

diff --git a/community/server/src/main/java/org/neo4j/server/rest/management/console/CypherSession.java b/community/server/src/main/java/org/neo4j/server/rest/management/console/CypherSession.java
@@ -30,7 +30,6 @@
 import org.neo4j.logging.Log;
 import org.neo4j.logging.LogProvider;
 import org.neo4j.server.database.CypherExecutor;
-import org.neo4j.server.webadmin.console.ScriptSession;
 
 public class CypherSession implements ScriptSession
 {

diff --git a/...y/server/src/main/java/org/neo4j/server/rest/management/console/CypherSessionCreator.java b/...y/server/src/main/java/org/neo4j/server/rest/management/console/CypherSessionCreator.java
@@ -24,8 +24,6 @@
 import org.neo4j.logging.LogProvider;
 import org.neo4j.server.database.CypherExecutor;
 import org.neo4j.server.database.Database;
-import org.neo4j.server.webadmin.console.ConsoleSessionCreator;
-import org.neo4j.server.webadmin.console.ScriptSession;
 
 public class CypherSessionCreator implements ConsoleSessionCreator
 {

diff --git a/...erver/webadmin/console/ScriptSession.java → ...est/management/console/ScriptSession.java b/...erver/webadmin/console/ScriptSession.java → ...est/management/console/ScriptSession.java
@@ -17,7 +17,7 @@
  * 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;
+package org.neo4j.server.rest.management.console;
 
 import org.neo4j.helpers.collection.Pair;
 

diff --git a/...ity/server/src/main/java/org/neo4j/server/rest/management/console/SessionFactoryImpl.java b/...ity/server/src/main/java/org/neo4j/server/rest/management/console/SessionFactoryImpl.java
@@ -31,9 +31,6 @@
 import org.neo4j.logging.LogProvider;
 import org.neo4j.server.database.CypherExecutor;
 import org.neo4j.server.database.Database;
-import org.neo4j.server.webadmin.console.ConsoleSessionCreator;
-import org.neo4j.server.webadmin.console.ConsoleSessionFactory;
-import org.neo4j.server.webadmin.console.ScriptSession;
 
 public class SessionFactoryImpl implements ConsoleSessionFactory
 {

diff --git a/community/server/src/main/java/org/neo4j/server/rest/management/console/ShellSession.java b/community/server/src/main/java/org/neo4j/server/rest/management/console/ShellSession.java
@@ -28,7 +28,6 @@
 import org.neo4j.kernel.extension.KernelExtensions;
 import org.neo4j.kernel.impl.logging.LogService;
 import org.neo4j.logging.Log;
-import org.neo4j.server.webadmin.console.ScriptSession;
 import org.neo4j.shell.ShellClient;
 import org.neo4j.shell.ShellException;
 import org.neo4j.shell.ShellServer;

diff --git a/...ty/server/src/main/java/org/neo4j/server/rest/management/console/ShellSessionCreator.java b/...ty/server/src/main/java/org/neo4j/server/rest/management/console/ShellSessionCreator.java
@@ -24,8 +24,6 @@
 import org.neo4j.logging.LogProvider;
 import org.neo4j.server.database.CypherExecutor;
 import org.neo4j.server.database.Database;
-import org.neo4j.server.webadmin.console.ConsoleSessionCreator;
-import org.neo4j.server.webadmin.console.ScriptSession;
 
 public class ShellSessionCreator implements ConsoleSessionCreator
 {

diff --git a/...er.webadmin.console.ConsoleSessionCreator → ....management.console.ConsoleSessionCreator b/...er.webadmin.console.ConsoleSessionCreator → ....management.console.ConsoleSessionCreator
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
@@ -33,8 +33,8 @@
 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.webadmin.console.ConsoleSessionFactory;
-import org.neo4j.server.webadmin.console.ScriptSession;
+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;

diff --git a/.../server/src/test/java/org/neo4j/server/webadmin/rest/Neo4jShellConsoleSessionDocTest.java b/.../server/src/test/java/org/neo4j/server/webadmin/rest/Neo4jShellConsoleSessionDocTest.java
@@ -41,8 +41,8 @@
 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.webadmin.console.ConsoleSessionFactory;
-import org.neo4j.server.webadmin.console.ScriptSession;
+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;