[jboss-cvs] JBossAS SVN: r102068 - in projects/mc-tools/mcinspector/trunk/src: main/resources and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 8 11:00:24 EST 2010
Author: kabir.khan at jboss.com
Date: 2010-03-08 11:00:22 -0500 (Mon, 08 Mar 2010)
New Revision: 102068
Modified:
projects/mc-tools/mcinspector/trunk/src/main/java/org/jboss/microcontainer/mcinspector/command/impl/AbstractInspectorCommand.java
projects/mc-tools/mcinspector/trunk/src/main/java/org/jboss/microcontainer/mcinspector/command/impl/BeanCommand.java
projects/mc-tools/mcinspector/trunk/src/main/java/org/jboss/microcontainer/mcinspector/command/impl/ChangeCommand.java
projects/mc-tools/mcinspector/trunk/src/main/java/org/jboss/microcontainer/mcinspector/command/impl/ListCommand.java
projects/mc-tools/mcinspector/trunk/src/main/resources/mcinspector.sh
projects/mc-tools/mcinspector/trunk/src/test/java/org/jboss/test/microcontainer/mcinspector/kernel/test/BeanTestCase.java
Log:
Better handling of null dependentStates in dependency items + update script to use mcinspector.jar
Modified: projects/mc-tools/mcinspector/trunk/src/main/java/org/jboss/microcontainer/mcinspector/command/impl/AbstractInspectorCommand.java
===================================================================
--- projects/mc-tools/mcinspector/trunk/src/main/java/org/jboss/microcontainer/mcinspector/command/impl/AbstractInspectorCommand.java 2010-03-08 15:39:49 UTC (rev 102067)
+++ projects/mc-tools/mcinspector/trunk/src/main/java/org/jboss/microcontainer/mcinspector/command/impl/AbstractInspectorCommand.java 2010-03-08 16:00:22 UTC (rev 102068)
@@ -21,6 +21,7 @@
*/
package org.jboss.microcontainer.mcinspector.command.impl;
+import org.jboss.dependency.spi.ControllerState;
import org.jboss.logging.Logger;
import org.jboss.microcontainer.mcinspector.command.InspectorCommand;
@@ -60,4 +61,16 @@
{
return helpDetail;
}
+
+ protected String formatState(ControllerState state)
+ {
+ return state.getStateString().toUpperCase();
+ }
+
+ protected String formatDependentState(ControllerState state)
+ {
+ if (state == null)
+ return formatState(ControllerState.INSTALLED);
+ return formatState(state);
+ }
}
Modified: projects/mc-tools/mcinspector/trunk/src/main/java/org/jboss/microcontainer/mcinspector/command/impl/BeanCommand.java
===================================================================
--- projects/mc-tools/mcinspector/trunk/src/main/java/org/jboss/microcontainer/mcinspector/command/impl/BeanCommand.java 2010-03-08 15:39:49 UTC (rev 102067)
+++ projects/mc-tools/mcinspector/trunk/src/main/java/org/jboss/microcontainer/mcinspector/command/impl/BeanCommand.java 2010-03-08 16:00:22 UTC (rev 102068)
@@ -40,14 +40,26 @@
// FIXME HelpCommand constructor
super("bean",
"Inspect a particular bean.",
- "Gives detailed information about one or more beans.",
- getUsage(null));
+ "Gives detailed information about one or more beans using their name(s) as the parameter.",
+ getUsage(null),
+ "For found beans the following information is always shown:.",
+ " Bean name",
+ " Bean type",
+ " Controller Mode",
+ " Current state",
+ " Required state",
+ " Context type",
+ " Number of unresolved dependencies",
+ "Options: ",
+ "-d Show all resolved and unresolved dependencies",
+ "-u Show all unresolved dependencies"
+ );
}
private static String getUsage(String programName)
{
String s = programName == null ? "" : programName;
- return "Usage:" + s + " bean <context name> [<context name>]*";
+ return "Usage:" + s + " bean [-d | -u] <context name> [<context name>]*";
}
public CommandResult execute(CommandArguments args)
@@ -77,8 +89,8 @@
{
result.appendResultLine(" bean type=" + getType(context));
result.appendResultLine(" mode=" + context.getMode());
- result.appendResultLine(" state=" + context.getState().getStateString().toUpperCase());
- result.appendResultLine(" required state=" + context.getRequiredState().getStateString().toUpperCase());
+ result.appendResultLine(" state=" + formatState(context.getState()));
+ result.appendResultLine(" required state=" + formatState(context.getRequiredState()));
result.appendResultLine(" context type=" + context.getClass().getName());
result.appendResultLine(" unresolved dependencies=" + countUnresolvedDependencies(context));
}
@@ -115,10 +127,10 @@
{
if (all)
{
- result.appendResultLine(" Resolved dependencies:");
+ result.appendResultLine(" Resolved dependencies:");
outputDependencyItems(result, context, true);
}
- result.appendResultLine(" Unresolved dependencies:");
+ result.appendResultLine(" Unresolved dependencies:");
outputDependencyItems(result, context, false);
}
@@ -131,9 +143,9 @@
{
if (item.isResolved() == resolved)
{
- result.appendResultLine(" iDependOn=" + item.getIDependOn() +
- "; whenRequired=" + item.getWhenRequired().getStateString().toUpperCase() +
- "; dependentState=" + item.getDependentState().getStateString().toUpperCase());
+ result.appendResultLine(" iDependOn=" + item.getIDependOn() +
+ "; whenRequired=" + formatState(item.getWhenRequired()) +
+ "; dependentState=" + formatDependentState(item.getDependentState()));
}
}
}
Modified: projects/mc-tools/mcinspector/trunk/src/main/java/org/jboss/microcontainer/mcinspector/command/impl/ChangeCommand.java
===================================================================
--- projects/mc-tools/mcinspector/trunk/src/main/java/org/jboss/microcontainer/mcinspector/command/impl/ChangeCommand.java 2010-03-08 15:39:49 UTC (rev 102067)
+++ projects/mc-tools/mcinspector/trunk/src/main/java/org/jboss/microcontainer/mcinspector/command/impl/ChangeCommand.java 2010-03-08 16:00:22 UTC (rev 102068)
@@ -42,9 +42,9 @@
"Changes the state of the context.",
"Changes the state of the context if all the dependencies are satisfied.",
getUsage(null),
- "" +
+ "",
"Options:",
- "-f From state. If no from_state argument is used an attempt is made to move " +
+ "-f From state. If no from_state argument is used an attempt is made to move ",
" the context to the target state regardless of which state it is currently in.");
}
@@ -84,7 +84,7 @@
{
StringBuilder sb = new StringBuilder("Could not find a context called '" + name + "'");
if (fromState != null)
- sb.append(" in state '" + fromState.getStateString().toUpperCase() + "'");
+ sb.append(" in state '" + formatState(fromState) + "'");
sb.append(".");
return new CommandResult(sb.toString());
}
@@ -95,14 +95,14 @@
}
catch (Throwable e)
{
- log.error("Error changing state of " + context + " to " + toState.getStateString(), e);
+ log.error("Error changing state of " + context + " to " + formatState(toState), e);
throw new RuntimeException(e);
}
if (context.getMode() == ControllerMode.ASYNCHRONOUS)
- return new CommandResult("Asynchronously changing '" + name + "' to " + toState.getStateString().toUpperCase());
+ return new CommandResult("Asynchronously changing '" + name + "' to " + formatState(toState));
- return new CommandResult("Changed '" + name + "' to " + toState.getStateString().toUpperCase());
+ return new CommandResult("Changed '" + name + "' to " + formatState(toState));
}
private ControllerState getState(CommandArguments args, String stateString)
Modified: projects/mc-tools/mcinspector/trunk/src/main/java/org/jboss/microcontainer/mcinspector/command/impl/ListCommand.java
===================================================================
--- projects/mc-tools/mcinspector/trunk/src/main/java/org/jboss/microcontainer/mcinspector/command/impl/ListCommand.java 2010-03-08 15:39:49 UTC (rev 102067)
+++ projects/mc-tools/mcinspector/trunk/src/main/java/org/jboss/microcontainer/mcinspector/command/impl/ListCommand.java 2010-03-08 16:00:22 UTC (rev 102068)
@@ -43,13 +43,13 @@
"Lists all the available contexts.",
"Lists all the contexts in the controller.",
getUsage(null),
- "If no state arguments are passed in all states will be checked for contexts. Otherwise" +
+ "If no state arguments are passed in all states will be checked for contexts. Otherwise",
"only the passed in states will be checked",
"Options:",
- "-o Overview. Show all the states in the controller with the number of contexts in each" +
+ "-o Overview. Show all the states in the controller with the number of contexts in each",
" Normally only states with contexts will be shown",
"-e Error. Show only the contexts which are in the error state. Can not be used in combination with state arguments.",
- "-v Verbose. Show extra information for each context. Contexts with unresolved dependencies will" +
+ "-v Verbose. Show extra information for each context. Contexts with unresolved dependencies will",
" have a '*' after their name. Additional information is in the format (ControllerMode, Current state");
}
@@ -118,11 +118,11 @@
Set<ControllerContext> contexts = args.getKernel().getController().getContextsByState(state);
if (args.getCommandOption("o") != null)
{
- result.appendResultLine(state.getStateString() + ": " + contexts.size() + " contexts");
+ result.appendResultLine(formatState(state) + ": " + contexts.size() + " contexts");
}
else if (contexts.size() > 0)
{
- result.appendResultLine(state.getStateString() + ": ");
+ result.appendResultLine(formatState(state) + ": ");
for (ControllerContext context : contexts)
{
outputContext(result, context, isVerbose);
Modified: projects/mc-tools/mcinspector/trunk/src/main/resources/mcinspector.sh
===================================================================
--- projects/mc-tools/mcinspector/trunk/src/main/resources/mcinspector.sh 2010-03-08 15:39:49 UTC (rev 102067)
+++ projects/mc-tools/mcinspector/trunk/src/main/resources/mcinspector.sh 2010-03-08 16:00:22 UTC (rev 102068)
@@ -49,8 +49,8 @@
fi
# Setup the classpath
-#JBOSS_BOOT_CLASSPATH="$JBOSS_HOME/bin/twiddle.jar"
-JBOSS_BOOT_CLASSPATH=.
+JBOSS_BOOT_CLASSPATH="$JBOSS_HOME/bin/mcinspector.jar"
+#JBOSS_BOOT_CLASSPATH=.
if [ "x$JBOSS_CLASSPATH" = "x" ]; then
JBOSS_CLASSPATH="$JBOSS_BOOT_CLASSPATH"
Modified: projects/mc-tools/mcinspector/trunk/src/test/java/org/jboss/test/microcontainer/mcinspector/kernel/test/BeanTestCase.java
===================================================================
--- projects/mc-tools/mcinspector/trunk/src/test/java/org/jboss/test/microcontainer/mcinspector/kernel/test/BeanTestCase.java 2010-03-08 15:39:49 UTC (rev 102067)
+++ projects/mc-tools/mcinspector/trunk/src/test/java/org/jboss/test/microcontainer/mcinspector/kernel/test/BeanTestCase.java 2010-03-08 16:00:22 UTC (rev 102068)
@@ -248,7 +248,7 @@
assertNoBean(name);
BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(name, SimpleBean.class.getName());
- builder.addPropertyMetaData("property", builder.createInject("Test1", null, ControllerState.CONFIGURED, ControllerState.INSTALLED));
+ builder.addPropertyMetaData("property", builder.createInject("Test1", null, ControllerState.CONFIGURED, null));
builder.addPropertyMetaData("property1", builder.createInject("not_there", null, ControllerState.CONFIGURED, ControllerState.INSTALLED));
deploy(builder.getBeanMetaData());
More information about the jboss-cvs-commits
mailing list