Move JMXManagementModule to enterprise.

neo4j · Jan 21, 2016 · fd89ae9 · fd89ae9
1 parent bf7ca6e
commit fd89ae9
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 11 deletions.
diff --git a/advanced/server-advanced/pom.xml b/advanced/server-advanced/pom.xml
@@ -188,6 +188,11 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.neo4j.app</groupId>
+      <artifactId>neo4j-server-enterprise</artifactId>
+      <version>3.0.0-SNAPSHOT</version>
+    </dependency>
 
   </dependencies>
 

diff --git a/advanced/server-advanced/src/main/java/org/neo4j/server/advanced/AdvancedNeoServer.java b/advanced/server-advanced/src/main/java/org/neo4j/server/advanced/AdvancedNeoServer.java
@@ -26,7 +26,7 @@
 import org.neo4j.kernel.impl.factory.CommunityFacadeFactory;
 import org.neo4j.logging.LogProvider;
 import org.neo4j.server.CommunityNeoServer;
-import org.neo4j.server.advanced.modules.JMXManagementModule;
+import org.neo4j.server.enterprise.modules.JMXManagementModule;
 import org.neo4j.server.database.Database;
 import org.neo4j.server.modules.ServerModule;
 

diff --git a/...rise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseNeoServer.java b/...rise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseNeoServer.java
@@ -39,6 +39,7 @@
 import org.neo4j.server.configuration.ServerSettings;
 import org.neo4j.server.database.Database;
 import org.neo4j.server.database.LifecycleManagingDatabase.GraphFactory;
+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;
@@ -138,9 +139,8 @@ protected static Database.Factory createDbFactory( Config config )
     @Override
     protected Iterable<ServerModule> createServerModules()
     {
-        return mix(
-                asList( (ServerModule) new DatabaseRoleInfoServerModule( webServer, getConfig(),
-                        logProvider ) ), super.createServerModules() );
+        return mix( asList( new DatabaseRoleInfoServerModule( webServer, getConfig(), logProvider ),
+                new JMXManagementModule( this ) ), super.createServerModules() );
     }
 
     @Override

diff --git a/...server/advanced/jmx/ServerManagement.java → ...rver/enterprise/jmx/ServerManagement.java b/...server/advanced/jmx/ServerManagement.java → ...rver/enterprise/jmx/ServerManagement.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.advanced.jmx;
+package org.neo4j.server.enterprise.jmx;
 
 import org.neo4j.kernel.impl.logging.LogService;
 import org.neo4j.logging.Log;

diff --git a/...r/advanced/jmx/ServerManagementMBean.java → ...enterprise/jmx/ServerManagementMBean.java b/...r/advanced/jmx/ServerManagementMBean.java → ...enterprise/jmx/ServerManagementMBean.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.advanced.jmx;
+package org.neo4j.server.enterprise.jmx;
 
 
 public interface ServerManagementMBean {

diff --git a/...advanced/modules/JMXManagementModule.java → ...terprise/modules/JMXManagementModule.java b/...advanced/modules/JMXManagementModule.java → ...terprise/modules/JMXManagementModule.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.advanced.modules;
+package org.neo4j.server.enterprise.modules;
 
 import java.lang.management.ManagementFactory;
 
@@ -27,7 +27,7 @@
 import javax.management.ObjectName;
 
 import org.neo4j.server.NeoServer;
-import org.neo4j.server.advanced.jmx.ServerManagement;
+import org.neo4j.server.enterprise.jmx.ServerManagement;
 import org.neo4j.server.modules.ServerModule;
 
 public class JMXManagementModule implements ServerModule

diff --git a/...er/advanced/jmx/ServerManagementTest.java → .../enterprise/jmx/ServerManagementTest.java b/...er/advanced/jmx/ServerManagementTest.java → .../enterprise/jmx/ServerManagementTest.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.advanced.jmx;
+package org.neo4j.server.enterprise.jmx;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -29,7 +29,7 @@
 import org.neo4j.logging.NullLogProvider;
 import org.neo4j.server.NeoServer;
 import org.neo4j.server.advanced.AdvancedNeoServer;
-import org.neo4j.server.advanced.helpers.AdvancedServerBuilder;
+import org.neo4j.server.enterprise.helpers.EnterpriseServerBuilder;
 import org.neo4j.server.configuration.ServerConfigFactory;
 import org.neo4j.server.configuration.ServerSettings;
 import org.neo4j.test.CleanupRule;
@@ -57,7 +57,7 @@ public void shouldBeAbleToRestartServer() throws Exception
         String dbDirectory2 = baseDir.directory( "db2" ).getAbsolutePath();
 
         Config config = ServerConfigFactory.loadConfig( null,
-                AdvancedServerBuilder
+                EnterpriseServerBuilder
                         .server()
                         .withDefaultDatabaseTuning()
                         .usingDatabaseDir( dbDirectory1 )