From 881e5998601c47d928fca88a5ff7a67339a8e1a7 Mon Sep 17 00:00:00 2001
From: Greg Wilkins <greg@webtide.com>
Date: Thu, 6 Jan 2011 18:04:58 +0000
Subject: [PATCH] 333679 Refactored jetty-jmx. Moved mbeans to modules.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2629 7e9141cc-0065-0410-87d8-b60c137991c4
---
 VERSION.txt                                   |   1 +
 jetty-deploy/pom.xml                          |   2 +-
 .../src/main/config/etc/jetty-webapps.xml     |   2 +-
 .../deploy/jmx/DeploymentManagerMBean.java    |  18 +++
 .../jmx/ContextDeployer-mbean.properties      |   0
 .../jmx/WebAppDeployer-mbean.properties       |   0
 jetty-jmx/pom.xml                             |   2 +-
 .../eclipse/jetty/jmx/ObjectMBeanTest.java    |  10 --
 .../com/acme/jmx/Derived-mbean.properties     |   0
 jetty-osgi/example-jetty-osgi/pom.xml         | 110 ------------------
 .../src/configuration/config.ini              |  16 ---
 jetty-osgi/jetty-osgi-boot/pom.xml            |   4 +
 jetty-osgi/pom.xml                            |   8 +-
 jetty-osgi/test-jetty-osgi/pom.xml            |   6 +
 jetty-server/pom.xml                          |   6 +
 .../handler/jmx/ContextHandlerMBean.java      |   0
 .../eclipse/jetty/server/jmx/ServerMBean.java |   0
 .../jmx/AbstractHandler-mbean.properties      |   0
 .../jmx/ContextHandler-mbean.properties       |   0
 .../ContextHandlerCollection-mbean.properties |   0
 .../jmx/HandlerCollection-mbean.properties    |   0
 .../jmx/HandlerWrapper-mbean.properties       |   0
 .../jmx/StatisticsHandler-mbean.properties    |   0
 .../jmx/AbstractConnector-mbean.properties    |   0
 .../server/jmx/Connector-mbean.properties     |   0
 .../jetty/server/jmx/Handler-mbean.properties |   0
 .../jmx/HandlerContainer-mbean.properties     |   0
 .../jmx/NCSARequestLog-mbean.properties       |   0
 .../jetty/server/jmx/Server-mbean.properties  |   0
 .../SelectChannelConnector-mbean.properties   |   0
 .../AbstractSessionManager-mbean.properties   |   0
 jetty-servlet/pom.xml                         |   6 +
 .../jetty/servlet/jmx/HolderMBean.java        |   0
 .../jmx/FilterMapping-mbean.properties        |   0
 .../jetty/servlet/jmx/Holder-mbean.properties |   0
 .../ServletContextHandler-mbean.properties    |   0
 .../jmx/ServletHandler-mbean.properties       |   0
 .../jmx/ServletHolder-mbean.properties        |   0
 .../jmx/ServletMapping-mbean.properties       |   0
 .../servlets/jmx/DoSFilter-mbean.properties   |   0
 .../servlets/jmx/QoSFilter-mbean.properties   |   0
 jetty-webapp/pom.xml                          |   6 +
 .../jetty/webapp/jmx/WebAppContextMBean.java  |   0
 .../webapp/jmx/WebAppContext-mbean.properties |   0
 pom.xml                                       |   2 +-
 45 files changed, 57 insertions(+), 142 deletions(-)
 create mode 100644 jetty-deploy/src/main/java/org/eclipse/jetty/deploy/jmx/DeploymentManagerMBean.java
 rename {jetty-jmx/src/main/resources/org/eclipse/jetty => jetty-deploy/src/main/resources/org/eclipse/jetty/deploy}/deploy/jmx/ContextDeployer-mbean.properties (100%)
 rename {jetty-jmx/src/main/resources/org/eclipse/jetty => jetty-deploy/src/main/resources/org/eclipse/jetty/deploy}/deploy/jmx/WebAppDeployer-mbean.properties (100%)
 rename jetty-jmx/src/test/resources/{ => org/eclipse/jetty}/com/acme/jmx/Derived-mbean.properties (100%)
 delete mode 100644 jetty-osgi/example-jetty-osgi/pom.xml
 delete mode 100644 jetty-osgi/example-jetty-osgi/src/configuration/config.ini
 rename {jetty-jmx => jetty-server}/src/main/java/org/eclipse/jetty/server/handler/jmx/ContextHandlerMBean.java (100%)
 rename {jetty-jmx => jetty-server}/src/main/java/org/eclipse/jetty/server/jmx/ServerMBean.java (100%)
 rename {jetty-jmx => jetty-server}/src/main/resources/org/eclipse/jetty/server/handler/jmx/AbstractHandler-mbean.properties (100%)
 rename {jetty-jmx => jetty-server}/src/main/resources/org/eclipse/jetty/server/handler/jmx/ContextHandler-mbean.properties (100%)
 rename {jetty-jmx => jetty-server}/src/main/resources/org/eclipse/jetty/server/handler/jmx/ContextHandlerCollection-mbean.properties (100%)
 rename {jetty-jmx => jetty-server}/src/main/resources/org/eclipse/jetty/server/handler/jmx/HandlerCollection-mbean.properties (100%)
 rename {jetty-jmx => jetty-server}/src/main/resources/org/eclipse/jetty/server/handler/jmx/HandlerWrapper-mbean.properties (100%)
 rename {jetty-jmx => jetty-server}/src/main/resources/org/eclipse/jetty/server/handler/jmx/StatisticsHandler-mbean.properties (100%)
 rename {jetty-jmx => jetty-server}/src/main/resources/org/eclipse/jetty/server/jmx/AbstractConnector-mbean.properties (100%)
 rename {jetty-jmx => jetty-server}/src/main/resources/org/eclipse/jetty/server/jmx/Connector-mbean.properties (100%)
 rename {jetty-jmx => jetty-server}/src/main/resources/org/eclipse/jetty/server/jmx/Handler-mbean.properties (100%)
 rename {jetty-jmx => jetty-server}/src/main/resources/org/eclipse/jetty/server/jmx/HandlerContainer-mbean.properties (100%)
 rename {jetty-jmx => jetty-server}/src/main/resources/org/eclipse/jetty/server/jmx/NCSARequestLog-mbean.properties (100%)
 rename {jetty-jmx => jetty-server}/src/main/resources/org/eclipse/jetty/server/jmx/Server-mbean.properties (100%)
 rename {jetty-jmx => jetty-server}/src/main/resources/org/eclipse/jetty/server/nio/jmx/SelectChannelConnector-mbean.properties (100%)
 rename {jetty-jmx => jetty-server}/src/main/resources/org/eclipse/jetty/server/session/jmx/AbstractSessionManager-mbean.properties (100%)
 rename {jetty-jmx => jetty-servlet}/src/main/java/org/eclipse/jetty/servlet/jmx/HolderMBean.java (100%)
 rename {jetty-jmx => jetty-servlet}/src/main/resources/org/eclipse/jetty/servlet/jmx/FilterMapping-mbean.properties (100%)
 rename {jetty-jmx => jetty-servlet}/src/main/resources/org/eclipse/jetty/servlet/jmx/Holder-mbean.properties (100%)
 rename {jetty-jmx => jetty-servlet}/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletContextHandler-mbean.properties (100%)
 rename {jetty-jmx => jetty-servlet}/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletHandler-mbean.properties (100%)
 rename {jetty-jmx => jetty-servlet}/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletHolder-mbean.properties (100%)
 rename {jetty-jmx => jetty-servlet}/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletMapping-mbean.properties (100%)
 rename {jetty-jmx => jetty-servlets}/src/main/resources/org/eclipse/jetty/servlets/jmx/DoSFilter-mbean.properties (100%)
 rename {jetty-jmx => jetty-servlets}/src/main/resources/org/eclipse/jetty/servlets/jmx/QoSFilter-mbean.properties (100%)
 rename {jetty-jmx => jetty-webapp}/src/main/java/org/eclipse/jetty/webapp/jmx/WebAppContextMBean.java (100%)
 rename {jetty-jmx => jetty-webapp}/src/main/resources/org/eclipse/jetty/webapp/jmx/WebAppContext-mbean.properties (100%)

diff --git a/VERSION.txt b/VERSION.txt
index 2c08cb35200..0f0f43c46b6 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -8,6 +8,7 @@ jetty-7.3.0-SNAPSHOT
  + 332796 Annotations inheritance does not work with jetty7 
  + 332937 Added Destroyable interface and reworked dependent lifecycles, specially of JNDI
  + 320457 add SPNEGO support
+ + 333679 Refactored jetty-jmx. Moved mbeans to modules.
 
 jetty-7.2.2.v20101205 5 December 2010
  + JETTY-1308 327109 (re)fixed AJP handling of empty packets
diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml
index d3ac2771324..1aa98a55b93 100644
--- a/jetty-deploy/pom.xml
+++ b/jetty-deploy/pom.xml
@@ -79,7 +79,7 @@
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jmx</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
diff --git a/jetty-deploy/src/main/config/etc/jetty-webapps.xml b/jetty-deploy/src/main/config/etc/jetty-webapps.xml
index 367c726508c..3e1b1669b59 100644
--- a/jetty-deploy/src/main/config/etc/jetty-webapps.xml
+++ b/jetty-deploy/src/main/config/etc/jetty-webapps.xml
@@ -18,7 +18,7 @@
                 <Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set>
                 <Set name="scanInterval">1</Set>
                 <Set name="contextXmlDir"><Property name="jetty.home" default="." />/contexts</Set>
-		<Set name="extractWars">false</Set>
+		<Set name="extractWars">true</Set>
               </New>
             </Arg>
           </Call>
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/jmx/DeploymentManagerMBean.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/jmx/DeploymentManagerMBean.java
new file mode 100644
index 00000000000..66a1762d908
--- /dev/null
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/jmx/DeploymentManagerMBean.java
@@ -0,0 +1,18 @@
+package org.eclipse.jetty.deploy.jmx;
+
+import org.eclipse.jetty.deploy.DeploymentManager;
+import org.eclipse.jetty.jmx.ObjectMBean;
+
+public class DeploymentManagerMBean extends ObjectMBean
+{
+    private final DeploymentManager _manager;
+    
+    public DeploymentManagerMBean(Object managedObject)
+    {
+        super(managedObject);
+        _manager=(DeploymentManager)managedObject;
+    }
+    
+    
+
+}
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/deploy/jmx/ContextDeployer-mbean.properties b/jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/deploy/jmx/ContextDeployer-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/deploy/jmx/ContextDeployer-mbean.properties
rename to jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/deploy/jmx/ContextDeployer-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/deploy/jmx/WebAppDeployer-mbean.properties b/jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/deploy/jmx/WebAppDeployer-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/deploy/jmx/WebAppDeployer-mbean.properties
rename to jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/deploy/jmx/WebAppDeployer-mbean.properties
diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml
index 0c810465287..86d0d0df4d4 100644
--- a/jetty-jmx/pom.xml
+++ b/jetty-jmx/pom.xml
@@ -78,7 +78,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-webapp</artifactId>
+      <artifactId>jetty-util</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>
diff --git a/jetty-jmx/src/test/java/org/eclipse/jetty/jmx/ObjectMBeanTest.java b/jetty-jmx/src/test/java/org/eclipse/jetty/jmx/ObjectMBeanTest.java
index 132ff3b06ab..4b1d09f79d8 100644
--- a/jetty-jmx/src/test/java/org/eclipse/jetty/jmx/ObjectMBeanTest.java
+++ b/jetty-jmx/src/test/java/org/eclipse/jetty/jmx/ObjectMBeanTest.java
@@ -14,7 +14,6 @@
 package org.eclipse.jetty.jmx;
 
 import com.acme.Derived;
-import org.eclipse.jetty.server.Server;
 import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
@@ -28,13 +27,4 @@ public class ObjectMBeanTest
         ObjectMBean mbean = new ObjectMBean(derived);
         assertTrue(mbean.getMBeanInfo()!=null); // TODO do more than just run it
     }
-
-    @Test
-    public void testMbeanFor()
-    {
-        Derived derived = new Derived();
-        assertTrue(ObjectMBean.mbeanFor(derived)!=null); // TODO do more than just run it
-        Server server = new Server();
-        assertTrue(ObjectMBean.mbeanFor(server)!=null); // TODO do more than just run it
-    }
 }
diff --git a/jetty-jmx/src/test/resources/com/acme/jmx/Derived-mbean.properties b/jetty-jmx/src/test/resources/org/eclipse/jetty/com/acme/jmx/Derived-mbean.properties
similarity index 100%
rename from jetty-jmx/src/test/resources/com/acme/jmx/Derived-mbean.properties
rename to jetty-jmx/src/test/resources/org/eclipse/jetty/com/acme/jmx/Derived-mbean.properties
diff --git a/jetty-osgi/example-jetty-osgi/pom.xml b/jetty-osgi/example-jetty-osgi/pom.xml
deleted file mode 100644
index b19900ac44b..00000000000
--- a/jetty-osgi/example-jetty-osgi/pom.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.jetty.osgi</groupId>
-    <artifactId>jetty-osgi-project</artifactId>
-    <version>7.3.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>example-jetty-osgi</artifactId>
-  <name>Jetty :: OSGi :: Example</name>
-  <packaging>pom</packaging>
-  <properties>
-    <assembly.directory>target/osgi-example</assembly.directory>
-    <slf4j.version>1.5.11</slf4j.version>
-  </properties>
-   <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <tasks>
-                <property name="orbit.base.url" value="http://download.eclipse.org/tools/orbit/downloads/drops/R20090529135407/bundles" />
-                <mkdir dir="${assembly.directory}/plugins" />
-                <mkdir dir="${assembly.directory}/configuration" />
-                <get src="${orbit.base.url}/javax.servlet_2.5.0.v200806031605.jar" dest="${assembly.directory}/plugins/javax.servlet_2.5.0.v200806031605.jar" usetimestamp="true" verbose="true" />
-		<copy file="src/configuration/config.ini" todir="${assembly.directory}/configuration" />
-              </tasks>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.1</version>
-        <executions>
-          <execution>
-            <id>copy plugins</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${assembly.directory}/plugins</outputDirectory>
-	      <excludeArtifactIds>servlet-api,osgi</excludeArtifactIds>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.1</version>
-        <executions>
-          <execution>
-            <id>copy osgi</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${assembly.directory}</outputDirectory>
-	      <includeArtifactIds>osgi</includeArtifactIds>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>test-jetty-webapp</artifactId>
-      <type>war</type>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-webapp</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-deploy</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.osgi</groupId>
-      <artifactId>jetty-osgi-boot-warurl</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.osgi</groupId>
-      <artifactId>jetty-osgi-boot</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-    	<groupId>org.eclipse</groupId>
-    	<artifactId>osgi</artifactId>
-    </dependency>
-    <dependency>
-        <groupId>org.eclipse.osgi</groupId>
-        <artifactId>services</artifactId>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/jetty-osgi/example-jetty-osgi/src/configuration/config.ini b/jetty-osgi/example-jetty-osgi/src/configuration/config.ini
deleted file mode 100644
index bd8a432eefb..00000000000
--- a/jetty-osgi/example-jetty-osgi/src/configuration/config.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-osgi.bundles= \
-file:plugins/javax.servlet_2.5.0.v200806031605.jar, \
-file:plugins/jetty-webapp-7.0.2-SNAPSHOT.jar, \
-file:plugins/jetty-deploy-7.0.2-SNAPSHOT.jar, \
-file:plugins/jetty-servlet-7.0.2-SNAPSHOT.jar, \
-file:plugins/jetty-server-7.0.2-SNAPSHOT.jar, \
-file:plugins/jetty-security-7.0.2-SNAPSHOT.jar, \
-file:plugins/jetty-http-7.0.2-SNAPSHOT.jar, \
-file:plugins/jetty-continuation-7.0.2-SNAPSHOT.jar, \
-file:plugins/jetty-xml-7.0.2-SNAPSHOT.jar, \
-file:plugins/jetty-io-7.0.2-SNAPSHOT.jar, \
-file:plugins/jetty-util-7.0.2-SNAPSHOT.jar, \
-file:plugins/services-3.1.200-v20070605.jar, \
-file:plugins/jetty-osgi-boot-7.0.2-SNAPSHOT.jar@1:start, \
-file:plugins/jetty-osgi-boot-warurl-7.0.2-SNAPSHOT.jar@2:start
-
diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml
index ed3908bbf0f..575dd065f0a 100644
--- a/jetty-osgi/jetty-osgi-boot/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot/pom.xml
@@ -22,6 +22,10 @@
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-deploy</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-jmx</artifactId>
+    </dependency>
     <dependency>
     	<groupId>org.eclipse</groupId>
     	<artifactId>osgi</artifactId>
diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml
index cafa77ca7b0..5efa7b82436 100644
--- a/jetty-osgi/pom.xml
+++ b/jetty-osgi/pom.xml
@@ -24,8 +24,7 @@
     <module>jetty-osgi-boot-logback</module>
     <module>jetty-osgi-boot-warurl</module>
     <module>jetty-osgi-httpservice</module>
-    <module>test-jetty-osgi</module>
-    <!-- module>example-jetty-osgi</module -->
+    <!--module>test-jetty-osgi</module-->
   </modules>
   <build>
     <resources>
@@ -77,6 +76,11 @@
         <artifactId>jetty-util</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-jmx</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-webapp</artifactId>
diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml
index 4bca4c17efb..ca15a519a87 100644
--- a/jetty-osgi/test-jetty-osgi/pom.xml
+++ b/jetty-osgi/test-jetty-osgi/pom.xml
@@ -76,6 +76,12 @@
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-jmx</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml
index 5ebde4fa9c5..e8ba5a1d060 100644
--- a/jetty-server/pom.xml
+++ b/jetty-server/pom.xml
@@ -104,5 +104,11 @@
       <artifactId>jetty-http</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-jmx</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
 </project>
diff --git a/jetty-jmx/src/main/java/org/eclipse/jetty/server/handler/jmx/ContextHandlerMBean.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/jmx/ContextHandlerMBean.java
similarity index 100%
rename from jetty-jmx/src/main/java/org/eclipse/jetty/server/handler/jmx/ContextHandlerMBean.java
rename to jetty-server/src/main/java/org/eclipse/jetty/server/handler/jmx/ContextHandlerMBean.java
diff --git a/jetty-jmx/src/main/java/org/eclipse/jetty/server/jmx/ServerMBean.java b/jetty-server/src/main/java/org/eclipse/jetty/server/jmx/ServerMBean.java
similarity index 100%
rename from jetty-jmx/src/main/java/org/eclipse/jetty/server/jmx/ServerMBean.java
rename to jetty-server/src/main/java/org/eclipse/jetty/server/jmx/ServerMBean.java
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/jmx/AbstractHandler-mbean.properties b/jetty-server/src/main/resources/org/eclipse/jetty/server/handler/jmx/AbstractHandler-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/jmx/AbstractHandler-mbean.properties
rename to jetty-server/src/main/resources/org/eclipse/jetty/server/handler/jmx/AbstractHandler-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/jmx/ContextHandler-mbean.properties b/jetty-server/src/main/resources/org/eclipse/jetty/server/handler/jmx/ContextHandler-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/jmx/ContextHandler-mbean.properties
rename to jetty-server/src/main/resources/org/eclipse/jetty/server/handler/jmx/ContextHandler-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/jmx/ContextHandlerCollection-mbean.properties b/jetty-server/src/main/resources/org/eclipse/jetty/server/handler/jmx/ContextHandlerCollection-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/jmx/ContextHandlerCollection-mbean.properties
rename to jetty-server/src/main/resources/org/eclipse/jetty/server/handler/jmx/ContextHandlerCollection-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/jmx/HandlerCollection-mbean.properties b/jetty-server/src/main/resources/org/eclipse/jetty/server/handler/jmx/HandlerCollection-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/jmx/HandlerCollection-mbean.properties
rename to jetty-server/src/main/resources/org/eclipse/jetty/server/handler/jmx/HandlerCollection-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/jmx/HandlerWrapper-mbean.properties b/jetty-server/src/main/resources/org/eclipse/jetty/server/handler/jmx/HandlerWrapper-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/jmx/HandlerWrapper-mbean.properties
rename to jetty-server/src/main/resources/org/eclipse/jetty/server/handler/jmx/HandlerWrapper-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/jmx/StatisticsHandler-mbean.properties b/jetty-server/src/main/resources/org/eclipse/jetty/server/handler/jmx/StatisticsHandler-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/jmx/StatisticsHandler-mbean.properties
rename to jetty-server/src/main/resources/org/eclipse/jetty/server/handler/jmx/StatisticsHandler-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/server/jmx/AbstractConnector-mbean.properties b/jetty-server/src/main/resources/org/eclipse/jetty/server/jmx/AbstractConnector-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/server/jmx/AbstractConnector-mbean.properties
rename to jetty-server/src/main/resources/org/eclipse/jetty/server/jmx/AbstractConnector-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/server/jmx/Connector-mbean.properties b/jetty-server/src/main/resources/org/eclipse/jetty/server/jmx/Connector-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/server/jmx/Connector-mbean.properties
rename to jetty-server/src/main/resources/org/eclipse/jetty/server/jmx/Connector-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/server/jmx/Handler-mbean.properties b/jetty-server/src/main/resources/org/eclipse/jetty/server/jmx/Handler-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/server/jmx/Handler-mbean.properties
rename to jetty-server/src/main/resources/org/eclipse/jetty/server/jmx/Handler-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/server/jmx/HandlerContainer-mbean.properties b/jetty-server/src/main/resources/org/eclipse/jetty/server/jmx/HandlerContainer-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/server/jmx/HandlerContainer-mbean.properties
rename to jetty-server/src/main/resources/org/eclipse/jetty/server/jmx/HandlerContainer-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/server/jmx/NCSARequestLog-mbean.properties b/jetty-server/src/main/resources/org/eclipse/jetty/server/jmx/NCSARequestLog-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/server/jmx/NCSARequestLog-mbean.properties
rename to jetty-server/src/main/resources/org/eclipse/jetty/server/jmx/NCSARequestLog-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/server/jmx/Server-mbean.properties b/jetty-server/src/main/resources/org/eclipse/jetty/server/jmx/Server-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/server/jmx/Server-mbean.properties
rename to jetty-server/src/main/resources/org/eclipse/jetty/server/jmx/Server-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/server/nio/jmx/SelectChannelConnector-mbean.properties b/jetty-server/src/main/resources/org/eclipse/jetty/server/nio/jmx/SelectChannelConnector-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/server/nio/jmx/SelectChannelConnector-mbean.properties
rename to jetty-server/src/main/resources/org/eclipse/jetty/server/nio/jmx/SelectChannelConnector-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/server/session/jmx/AbstractSessionManager-mbean.properties b/jetty-server/src/main/resources/org/eclipse/jetty/server/session/jmx/AbstractSessionManager-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/server/session/jmx/AbstractSessionManager-mbean.properties
rename to jetty-server/src/main/resources/org/eclipse/jetty/server/session/jmx/AbstractSessionManager-mbean.properties
diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml
index 826210518aa..2c162c55670 100644
--- a/jetty-servlet/pom.xml
+++ b/jetty-servlet/pom.xml
@@ -68,5 +68,11 @@
       <artifactId>jetty-security</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-jmx</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
 </project>
diff --git a/jetty-jmx/src/main/java/org/eclipse/jetty/servlet/jmx/HolderMBean.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/jmx/HolderMBean.java
similarity index 100%
rename from jetty-jmx/src/main/java/org/eclipse/jetty/servlet/jmx/HolderMBean.java
rename to jetty-servlet/src/main/java/org/eclipse/jetty/servlet/jmx/HolderMBean.java
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/servlet/jmx/FilterMapping-mbean.properties b/jetty-servlet/src/main/resources/org/eclipse/jetty/servlet/jmx/FilterMapping-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/servlet/jmx/FilterMapping-mbean.properties
rename to jetty-servlet/src/main/resources/org/eclipse/jetty/servlet/jmx/FilterMapping-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/servlet/jmx/Holder-mbean.properties b/jetty-servlet/src/main/resources/org/eclipse/jetty/servlet/jmx/Holder-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/servlet/jmx/Holder-mbean.properties
rename to jetty-servlet/src/main/resources/org/eclipse/jetty/servlet/jmx/Holder-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletContextHandler-mbean.properties b/jetty-servlet/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletContextHandler-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletContextHandler-mbean.properties
rename to jetty-servlet/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletContextHandler-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletHandler-mbean.properties b/jetty-servlet/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletHandler-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletHandler-mbean.properties
rename to jetty-servlet/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletHandler-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletHolder-mbean.properties b/jetty-servlet/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletHolder-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletHolder-mbean.properties
rename to jetty-servlet/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletHolder-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletMapping-mbean.properties b/jetty-servlet/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletMapping-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletMapping-mbean.properties
rename to jetty-servlet/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletMapping-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/servlets/jmx/DoSFilter-mbean.properties b/jetty-servlets/src/main/resources/org/eclipse/jetty/servlets/jmx/DoSFilter-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/servlets/jmx/DoSFilter-mbean.properties
rename to jetty-servlets/src/main/resources/org/eclipse/jetty/servlets/jmx/DoSFilter-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/servlets/jmx/QoSFilter-mbean.properties b/jetty-servlets/src/main/resources/org/eclipse/jetty/servlets/jmx/QoSFilter-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/servlets/jmx/QoSFilter-mbean.properties
rename to jetty-servlets/src/main/resources/org/eclipse/jetty/servlets/jmx/QoSFilter-mbean.properties
diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml
index e16fde45615..f8d98f33e96 100644
--- a/jetty-webapp/pom.xml
+++ b/jetty-webapp/pom.xml
@@ -97,5 +97,11 @@
       <artifactId>jetty-servlet</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-jmx</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
 </project>
diff --git a/jetty-jmx/src/main/java/org/eclipse/jetty/webapp/jmx/WebAppContextMBean.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/jmx/WebAppContextMBean.java
similarity index 100%
rename from jetty-jmx/src/main/java/org/eclipse/jetty/webapp/jmx/WebAppContextMBean.java
rename to jetty-webapp/src/main/java/org/eclipse/jetty/webapp/jmx/WebAppContextMBean.java
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/webapp/jmx/WebAppContext-mbean.properties b/jetty-webapp/src/main/resources/org/eclipse/jetty/webapp/jmx/WebAppContext-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/webapp/jmx/WebAppContext-mbean.properties
rename to jetty-webapp/src/main/resources/org/eclipse/jetty/webapp/jmx/WebAppContext-mbean.properties
diff --git a/pom.xml b/pom.xml
index d97c0cb241f..a05c1c61610 100644
--- a/pom.xml
+++ b/pom.xml
@@ -272,6 +272,7 @@
    -->
   <modules>
     <module>jetty-util</module>
+    <module>jetty-jmx</module>
     <module>jetty-io</module>
     <module>jetty-http</module>
     <module>jetty-websocket</module>
@@ -287,7 +288,6 @@
     <module>jetty-jsp-2.1</module>
     <module>jetty-deploy</module>
     <module>jetty-ajp</module>
-    <module>jetty-jmx</module>
     <module>jetty-jndi</module>
     <module>jetty-annotations</module>
     <module>jetty-plus</module>