Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2011-03-06 23:21:25 -0500
committerGreg Wilkins2011-03-06 23:21:25 -0500
commitbdc1aa6c241a12cd54d5f7dacbd78e03e744eddf (patch)
tree327e4b8d9c033f6f638acef438810ca4ef8b0e13 /jetty-deploy/src/main
parentf3f84e7d2addd365569790cef970f2f86cfac1ee (diff)
downloadorg.eclipse.jetty.project-bdc1aa6c241a12cd54d5f7dacbd78e03e744eddf.tar.gz
org.eclipse.jetty.project-bdc1aa6c241a12cd54d5f7dacbd78e03e744eddf.tar.xz
org.eclipse.jetty.project-bdc1aa6c241a12cd54d5f7dacbd78e03e744eddf.zip
338819 backed out for release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2860 7e9141cc-0065-0410-87d8-b60c137991c4
Diffstat (limited to 'jetty-deploy/src/main')
-rw-r--r--jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java23
-rw-r--r--jetty-deploy/src/main/java/org/eclipse/jetty/deploy/jmx/DeploymentManagerMBean.java22
-rw-r--r--jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/jmx/DeploymentManager-mbean.properties12
-rw-r--r--jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/jmx/WebAppDeployer-mbean.properties2
4 files changed, 9 insertions, 50 deletions
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java
index 5e83a08364..1e2c0acfb4 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java
@@ -35,6 +35,7 @@ import org.eclipse.jetty.deploy.graph.Path;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.eclipse.jetty.util.AttributesMap;
+import org.eclipse.jetty.util.component.AbstractLifeCycle;
import org.eclipse.jetty.util.component.AggregateLifeCycle;
import org.eclipse.jetty.util.log.Log;
@@ -434,10 +435,10 @@ public class DeploymentManager extends AggregateLifeCycle
public void requestAppGoal(App app, String nodeName)
{
AppEntry appentry = findAppByOriginId(app.getOriginId());
- if (appentry == null)
- {
- throw new IllegalStateException("App not being tracked by Deployment Manager: " + app);
- }
+ if (appentry == null)
+ {
+ throw new IllegalStateException("App not being tracked by Deployment Manager: " + app);
+ }
requestAppGoal(appentry,nodeName);
}
@@ -454,10 +455,6 @@ public class DeploymentManager extends AggregateLifeCycle
private void requestAppGoal(AppEntry appentry, String nodeName)
{
Node destinationNode = _lifecycle.getNodeByName(nodeName);
- if (destinationNode == null)
- {
- throw new IllegalStateException("Node not present in Deployment Manager: " + nodeName);
- }
// Compute lifecycle steps
Path path = _lifecycle.getPath(appentry.lifecyleNode,destinationNode);
if (path.isEmpty())
@@ -566,14 +563,4 @@ public class DeploymentManager extends AggregateLifeCycle
{
this._useStandardBindings = useStandardBindings;
}
-
- public Collection<Node> getNodes()
- {
- return _lifecycle.getNodes();
- }
-
- public Collection<App> getApps(String nodeName)
- {
- return getApps(_lifecycle.getNodeByName(nodeName));
- }
}
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
index 3bd5362494..3a219215f6 100644
--- 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
@@ -7,7 +7,6 @@ import java.util.List;
import org.eclipse.jetty.deploy.App;
import org.eclipse.jetty.deploy.AppProvider;
import org.eclipse.jetty.deploy.DeploymentManager;
-import org.eclipse.jetty.deploy.graph.Node;
import org.eclipse.jetty.jmx.ObjectMBean;
import org.eclipse.jetty.server.handler.ContextHandler;
@@ -21,14 +20,6 @@ public class DeploymentManagerMBean extends ObjectMBean
_manager=(DeploymentManager)managedObject;
}
- public Collection<String> getNodes()
- {
- List<String> nodes = new ArrayList<String>();
- for (Node node: _manager.getNodes())
- nodes.add(node.getName());
- return nodes;
- }
-
public Collection<String> getApps()
{
List<String> apps=new ArrayList<String>();
@@ -37,14 +28,6 @@ public class DeploymentManagerMBean extends ObjectMBean
return apps;
}
- public Collection<String> getApps(String nodeName)
- {
- List<String> apps=new ArrayList<String>();
- for (App app: _manager.getApps(nodeName))
- apps.add(app.getOriginId());
- return apps;
- }
-
public Collection<ContextHandler> getContexts() throws Exception
{
List<ContextHandler> apps=new ArrayList<ContextHandler>();
@@ -57,9 +40,4 @@ public class DeploymentManagerMBean extends ObjectMBean
{
return _manager.getAppProviders();
}
-
- public void requestAppGoal(String appId, String nodeName)
- {
- _manager.requestAppGoal(appId, nodeName);
- }
}
diff --git a/jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/jmx/DeploymentManager-mbean.properties b/jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/jmx/DeploymentManager-mbean.properties
index 4149820d53..726c236b1a 100644
--- a/jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/jmx/DeploymentManager-mbean.properties
+++ b/jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/jmx/DeploymentManager-mbean.properties
@@ -1,10 +1,4 @@
DeploymentManager: Deployment Manager
-nodes:MBean: App LifeCycle Nodes
-apps:MBean: Deployed Apps
-contexts:MMBean: Deployed Contexts
-appProviders:MMBean: Application Providers
-getApps(java.lang.String):MBean:ACTION: List apps that are located at specified App LifeCycle node
-getApps(java.lang.String)[0]:nodeName: Name of the App LifeCycle node
-requestAppGoal(java.lang.String,java.lang.String) ACTION: Request the app to be moved to the specified App LifeCycle node
-requestAppGoal(java.lang.String,java.lang.String)[0]:appId:App identifier
-requestAppGoal(java.lang.String,java.lang.String)[1]:nodeName:Name of the App LifeCycle node \ No newline at end of file
+apps:MBean:Deployed Apps
+contexts:MMBean:Deployed Contexts
+appProviders:MMBean:Application Providers \ No newline at end of file
diff --git a/jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/jmx/WebAppDeployer-mbean.properties b/jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/jmx/WebAppDeployer-mbean.properties
index 2815ae6ee4..a1304e1e7a 100644
--- a/jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/jmx/WebAppDeployer-mbean.properties
+++ b/jetty-deploy/src/main/resources/org/eclipse/jetty/deploy/jmx/WebAppDeployer-mbean.properties
@@ -1,6 +1,6 @@
WebAppDeployer: Deployer for startup deployment of webapps
contexts: MObject: The ContextHandlerCollection to which the deployer deploys
-allowDuplicates: Object:RO: Whether or not duplicate deployments are allowed
+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

Back to the top