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 /jetty-deploy
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
Diffstat (limited to 'jetty-deploy')
-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.properties9
-rw-r--r--jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/deploy/jmx/WebAppDeployer-mbean.properties14
5 files changed, 43 insertions, 2 deletions
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-deploy/src/main/resources/org/eclipse/jetty/deploy/deploy/jmx/ContextDeployer-mbean.properties b/jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/deploy/jmx/ContextDeployer-mbean.properties
new file mode 100644
index 0000000000..335a5ee661
--- /dev/null
+++ b/jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/deploy/jmx/ContextDeployer-mbean.properties
@@ -0,0 +1,9 @@
+ContextDeployer: Deployer for runtime deploy/undeploy of webapps
+contexts: MObject: The ContextHandlerCollection to which the deployer deploys
+scanInterval: Object: The interval in seconds between scans of the deploy directory
+configurationDir: Object:RO: The deploy directory
+setConfigurationDir(java.lang.String):ACTION:Set the deploy directory
+setConfigurationDir(java.lang.String)[0]:dir:The directory
+setConfigurationDir(java.io.File):ACTION:Set the deploy directory
+setConfigurationDir(java.io.File)[0]:file:The directory
+configurationManager: MObject:Source of property values for property name resolution in deployed config file
diff --git a/jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/deploy/jmx/WebAppDeployer-mbean.properties b/jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/deploy/jmx/WebAppDeployer-mbean.properties
new file mode 100644
index 0000000000..a1304e1e7a
--- /dev/null
+++ b/jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/deploy/jmx/WebAppDeployer-mbean.properties
@@ -0,0 +1,14 @@
+WebAppDeployer: Deployer for startup deployment of webapps
+contexts: MObject: The ContextHandlerCollection to which the deployer deploys
+allowDuplicates: Object:R0: Whether or not duplicate deployments are allowed
+setAllowDuplicates(boolean):ACTION: Whether or not duplicate deployments are allowed
+setAllowDuplicates(boolean)[0]:allowDuplicates: True allows duplicate webapps to be deployed while false does not
+defaultsDescriptor: Object: The webdefault.xml descriptor to use for all webapps deployed by the deployer
+configurationClasses: Object: The set of configuration classes to apply to the deployment of each webapp
+webAppDir: Object: The directory where the webapps are to be found to deploy
+extract: Object:RO: Whether or not to extract war files on deployment
+setExtract(boolean):ACTION:Set whether or not to extract war files
+setExtract(boolean)[0]:extract: True will extract war files while false will not
+parentLoaderPriority: Object:RO: Whether to use j2se classloading order or servlet spec classloading order
+setParentLoaderPriority(boolean):ACTION: Set which classloading paradigm to use
+setParentLoaderPriority(boolean)[0]:parentPriorityClassLoading: True uses j2se classloading order while false uses servlet spec order

Back to the top