Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2011-01-06 13:04:58 -0500
committerGreg Wilkins2011-01-06 13:04:58 -0500
commit881e5998601c47d928fca88a5ff7a67339a8e1a7 (patch)
treee5a8ba8ceac059f5c3e9693268b6524019205a63
parentdb7d2afe822948ca2da378b45ec8dcee7dc097bc (diff)
downloadorg.eclipse.jetty.project-881e5998601c47d928fca88a5ff7a67339a8e1a7.tar.gz
org.eclipse.jetty.project-881e5998601c47d928fca88a5ff7a67339a8e1a7.tar.xz
org.eclipse.jetty.project-881e5998601c47d928fca88a5ff7a67339a8e1a7.zip
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
-rw-r--r--VERSION.txt1
-rw-r--r--jetty-deploy/pom.xml2
-rw-r--r--jetty-deploy/src/main/config/etc/jetty-webapps.xml2
-rw-r--r--jetty-deploy/src/main/java/org/eclipse/jetty/deploy/jmx/DeploymentManagerMBean.java18
-rw-r--r--jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/deploy/jmx/ContextDeployer-mbean.properties (renamed from jetty-jmx/src/main/resources/org/eclipse/jetty/deploy/jmx/ContextDeployer-mbean.properties)0
-rw-r--r--jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/deploy/jmx/WebAppDeployer-mbean.properties (renamed from jetty-jmx/src/main/resources/org/eclipse/jetty/deploy/jmx/WebAppDeployer-mbean.properties)0
-rw-r--r--jetty-jmx/pom.xml2
-rw-r--r--jetty-jmx/src/test/java/org/eclipse/jetty/jmx/ObjectMBeanTest.java10
-rw-r--r--jetty-jmx/src/test/resources/org/eclipse/jetty/com/acme/jmx/Derived-mbean.properties (renamed from jetty-jmx/src/test/resources/com/acme/jmx/Derived-mbean.properties)0
-rw-r--r--jetty-osgi/example-jetty-osgi/pom.xml110
-rw-r--r--jetty-osgi/example-jetty-osgi/src/configuration/config.ini16
-rw-r--r--jetty-osgi/jetty-osgi-boot/pom.xml4
-rw-r--r--jetty-osgi/pom.xml8
-rw-r--r--jetty-osgi/test-jetty-osgi/pom.xml6
-rw-r--r--jetty-server/pom.xml6
-rw-r--r--jetty-server/src/main/java/org/eclipse/jetty/server/handler/jmx/ContextHandlerMBean.java (renamed from jetty-jmx/src/main/java/org/eclipse/jetty/server/handler/jmx/ContextHandlerMBean.java)0
-rw-r--r--jetty-server/src/main/java/org/eclipse/jetty/server/jmx/ServerMBean.java (renamed from jetty-jmx/src/main/java/org/eclipse/jetty/server/jmx/ServerMBean.java)0
-rw-r--r--jetty-server/src/main/resources/org/eclipse/jetty/server/handler/jmx/AbstractHandler-mbean.properties (renamed from jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/jmx/AbstractHandler-mbean.properties)0
-rw-r--r--jetty-server/src/main/resources/org/eclipse/jetty/server/handler/jmx/ContextHandler-mbean.properties (renamed from jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/jmx/ContextHandler-mbean.properties)0
-rw-r--r--jetty-server/src/main/resources/org/eclipse/jetty/server/handler/jmx/ContextHandlerCollection-mbean.properties (renamed from jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/jmx/ContextHandlerCollection-mbean.properties)0
-rw-r--r--jetty-server/src/main/resources/org/eclipse/jetty/server/handler/jmx/HandlerCollection-mbean.properties (renamed from jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/jmx/HandlerCollection-mbean.properties)0
-rw-r--r--jetty-server/src/main/resources/org/eclipse/jetty/server/handler/jmx/HandlerWrapper-mbean.properties (renamed from jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/jmx/HandlerWrapper-mbean.properties)0
-rw-r--r--jetty-server/src/main/resources/org/eclipse/jetty/server/handler/jmx/StatisticsHandler-mbean.properties (renamed from jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/jmx/StatisticsHandler-mbean.properties)0
-rw-r--r--jetty-server/src/main/resources/org/eclipse/jetty/server/jmx/AbstractConnector-mbean.properties (renamed from jetty-jmx/src/main/resources/org/eclipse/jetty/server/jmx/AbstractConnector-mbean.properties)0
-rw-r--r--jetty-server/src/main/resources/org/eclipse/jetty/server/jmx/Connector-mbean.properties (renamed from jetty-jmx/src/main/resources/org/eclipse/jetty/server/jmx/Connector-mbean.properties)0
-rw-r--r--jetty-server/src/main/resources/org/eclipse/jetty/server/jmx/Handler-mbean.properties (renamed from jetty-jmx/src/main/resources/org/eclipse/jetty/server/jmx/Handler-mbean.properties)0
-rw-r--r--jetty-server/src/main/resources/org/eclipse/jetty/server/jmx/HandlerContainer-mbean.properties (renamed from jetty-jmx/src/main/resources/org/eclipse/jetty/server/jmx/HandlerContainer-mbean.properties)0
-rw-r--r--jetty-server/src/main/resources/org/eclipse/jetty/server/jmx/NCSARequestLog-mbean.properties (renamed from jetty-jmx/src/main/resources/org/eclipse/jetty/server/jmx/NCSARequestLog-mbean.properties)0
-rw-r--r--jetty-server/src/main/resources/org/eclipse/jetty/server/jmx/Server-mbean.properties (renamed from jetty-jmx/src/main/resources/org/eclipse/jetty/server/jmx/Server-mbean.properties)0
-rw-r--r--jetty-server/src/main/resources/org/eclipse/jetty/server/nio/jmx/SelectChannelConnector-mbean.properties (renamed from jetty-jmx/src/main/resources/org/eclipse/jetty/server/nio/jmx/SelectChannelConnector-mbean.properties)0
-rw-r--r--jetty-server/src/main/resources/org/eclipse/jetty/server/session/jmx/AbstractSessionManager-mbean.properties (renamed from jetty-jmx/src/main/resources/org/eclipse/jetty/server/session/jmx/AbstractSessionManager-mbean.properties)0
-rw-r--r--jetty-servlet/pom.xml6
-rw-r--r--jetty-servlet/src/main/java/org/eclipse/jetty/servlet/jmx/HolderMBean.java (renamed from jetty-jmx/src/main/java/org/eclipse/jetty/servlet/jmx/HolderMBean.java)0
-rw-r--r--jetty-servlet/src/main/resources/org/eclipse/jetty/servlet/jmx/FilterMapping-mbean.properties (renamed from jetty-jmx/src/main/resources/org/eclipse/jetty/servlet/jmx/FilterMapping-mbean.properties)0
-rw-r--r--jetty-servlet/src/main/resources/org/eclipse/jetty/servlet/jmx/Holder-mbean.properties (renamed from jetty-jmx/src/main/resources/org/eclipse/jetty/servlet/jmx/Holder-mbean.properties)0
-rw-r--r--jetty-servlet/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletContextHandler-mbean.properties (renamed from jetty-jmx/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletContextHandler-mbean.properties)0
-rw-r--r--jetty-servlet/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletHandler-mbean.properties (renamed from jetty-jmx/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletHandler-mbean.properties)0
-rw-r--r--jetty-servlet/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletHolder-mbean.properties (renamed from jetty-jmx/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletHolder-mbean.properties)0
-rw-r--r--jetty-servlet/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletMapping-mbean.properties (renamed from jetty-jmx/src/main/resources/org/eclipse/jetty/servlet/jmx/ServletMapping-mbean.properties)0
-rw-r--r--jetty-servlets/src/main/resources/org/eclipse/jetty/servlets/jmx/DoSFilter-mbean.properties (renamed from jetty-jmx/src/main/resources/org/eclipse/jetty/servlets/jmx/DoSFilter-mbean.properties)0
-rw-r--r--jetty-servlets/src/main/resources/org/eclipse/jetty/servlets/jmx/QoSFilter-mbean.properties (renamed from jetty-jmx/src/main/resources/org/eclipse/jetty/servlets/jmx/QoSFilter-mbean.properties)0
-rw-r--r--jetty-webapp/pom.xml6
-rw-r--r--jetty-webapp/src/main/java/org/eclipse/jetty/webapp/jmx/WebAppContextMBean.java (renamed from jetty-jmx/src/main/java/org/eclipse/jetty/webapp/jmx/WebAppContextMBean.java)0
-rw-r--r--jetty-webapp/src/main/resources/org/eclipse/jetty/webapp/jmx/WebAppContext-mbean.properties (renamed from jetty-jmx/src/main/resources/org/eclipse/jetty/webapp/jmx/WebAppContext-mbean.properties)0
-rw-r--r--pom.xml2
45 files changed, 57 insertions, 142 deletions
diff --git a/VERSION.txt b/VERSION.txt
index 2c08cb3520..0f0f43c46b 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 d3ac277132..1aa98a55b9 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 367c726508..3e1b1669b5 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 0000000000..66a1762d90
--- /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
index 335a5ee661..335a5ee661 100644
--- 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
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
index a1304e1e7a..a1304e1e7a 100644
--- 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
diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml
index 0c81046528..86d0d0df4d 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 132ff3b06a..4b1d09f79d 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
index 8ebd577bde..8ebd577bde 100644
--- 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
diff --git a/jetty-osgi/example-jetty-osgi/pom.xml b/jetty-osgi/example-jetty-osgi/pom.xml
deleted file mode 100644
index b19900ac44..0000000000
--- 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 bd8a432eef..0000000000
--- 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 ed3908bbf0..575dd065f0 100644
--- a/jetty-osgi/jetty-osgi-boot/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot/pom.xml
@@ -23,6 +23,10 @@
<artifactId>jetty-deploy</artifactId>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jmx</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.eclipse</groupId>
<artifactId>osgi</artifactId>
</dependency>
diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml
index cafa77ca7b..5efa7b8243 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>
@@ -79,6 +78,11 @@
</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>
<version>${project.version}</version>
</dependency>
diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml
index 4bca4c17ef..ca15a519a8 100644
--- a/jetty-osgi/test-jetty-osgi/pom.xml
+++ b/jetty-osgi/test-jetty-osgi/pom.xml
@@ -78,6 +78,12 @@
</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>
<version>${project.version}</version>
<scope>runtime</scope>
diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml
index 5ebde4fa9c..e8ba5a1d06 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
index 76dbe9baee..76dbe9baee 100644
--- 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
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
index 051c26e427..051c26e427 100644
--- 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
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
index 4377dafd46..4377dafd46 100644
--- 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
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
index f3e2c2a5cb..f3e2c2a5cb 100644
--- 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
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
index 4ab1fef7cc..4ab1fef7cc 100644
--- 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
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
index 37152f504d..37152f504d 100644
--- 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
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
index 3395f64950..3395f64950 100644
--- 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
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
index 295f4de4af..295f4de4af 100644
--- 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
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
index fd7667217d..fd7667217d 100644
--- 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
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
index e0fa9fa45f..e0fa9fa45f 100644
--- 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
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
index eea633f934..eea633f934 100644
--- 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
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
index 374e020897..374e020897 100644
--- 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
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
index 0c0e3400ff..0c0e3400ff 100644
--- 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
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
index a633f3e995..a633f3e995 100644
--- 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
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
index dbe718d5b0..dbe718d5b0 100644
--- 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
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
index 385f28a420..385f28a420 100644
--- 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
diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml
index 826210518a..2c162c5567 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
index 8f8ce165c8..8f8ce165c8 100644
--- 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
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
index afcbe2f032..afcbe2f032 100644
--- 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
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
index e45e145b39..e45e145b39 100644
--- 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
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
index 2c1a05adb4..2c1a05adb4 100644
--- 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
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
index 9326c1906d..9326c1906d 100644
--- 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
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
index 38445467d3..38445467d3 100644
--- 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
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
index efe07ff433..efe07ff433 100644
--- 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
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
index 6a1f31aa49..6a1f31aa49 100644
--- 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
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
index c781d638aa..c781d638aa 100644
--- 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
diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml
index e16fde4561..f8d98f33e9 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
index 7af1a05ce1..7af1a05ce1 100644
--- 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
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
index 5a09672bff..5a09672bff 100644
--- 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
diff --git a/pom.xml b/pom.xml
index d97c0cb241..a05c1c6161 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>

Back to the top