Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tweaking output of selected modules tree in --list-modules to be more clear

This commit is contained in:
Joakim Erdfelt 2014-11-20 16:23:39 -07:00
parent 8e9e29f887
commit 9ea0b74f73
2 changed files with 49 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
View File

@ -253,10 +253,10 @@ public class Main
// Dump Enabled Modules
System.out.println();
System.out.println("Jetty Active Module Tree:");
System.out.println("-------------------------");
System.out.println("Jetty Selected Module Ordering:");
System.out.println("-------------------------------");
Modules modules = args.getAllModules();
modules.dumpEnabledTree();
modules.dumpSelected();
}
/**
@ -316,8 +316,10 @@ public class Main
// 5) Lib & XML Expansion / Resolution
args.expandLibs(baseHome);
args.expandModules(baseHome,activeModules);
} catch(GraphException e) {
}
catch (GraphException e)
{
throw new UsageException(ERR_BAD_GRAPH,e);
}

47
jetty-start/src/main/java/org/eclipse/jetty/start/graph/Graph.java
View File

@ -114,7 +114,7 @@ public abstract class Graph<T extends Node<T>> implements Iterable<T>
for (String parentName : node.getParentNames())
{
T parent = get(parentName);
if (parent == null)
{
parent = resolveNode(parentName);
@ -182,7 +182,7 @@ public abstract class Graph<T extends Node<T>> implements Iterable<T>
return nodes.size();
}
public void dumpEnabledTree()
public void dumpSelectedTree()
{
List<T> ordered = new ArrayList<>();
ordered.addAll(nodes.values());
@ -196,7 +196,44 @@ public abstract class Graph<T extends Node<T>> implements Iterable<T>
{
// Show module name
String indent = toIndent(module.getDepth());
System.out.printf("%s + Module: %s [%s]%n",indent,module.getName(),module.isSelected()?"selected":"transitive");
boolean transitive = module.matches(OnlyTransitivePredicate.INSTANCE);
System.out.printf("%s + %s: %s [%s]%n",indent,toCap(nodeTerm),module.getName(),transitive?"transitive":"selected");
}
}
}
public void dumpSelected()
{
List<T> ordered = new ArrayList<>();
ordered.addAll(nodes.values());
Collections.sort(ordered,new NodeDepthComparator());
List<T> active = getEnabled();
for (T module : ordered)
{
if (active.contains(module))
{
// Show module name
boolean transitive = module.matches(OnlyTransitivePredicate.INSTANCE);
System.out.printf(" %3d) %-15s ",module.getDepth() + 1,module.getName());
if (transitive)
{
System.out.println("<transitive> ");
}
else
{
List<String> hows = new ArrayList<>();
for (Selection selection : module.getSelections())
{
if (selection.isExplicit())
{
hows.add(selection.getHow());
}
}
Collections.sort(hows);
System.out.println(Utils.join(hows,", "));
}
}
}
}
@ -234,7 +271,7 @@ public abstract class Graph<T extends Node<T>> implements Iterable<T>
}
/**
* Get the Nodes from the tree that match the provided predicat.
* Get the Nodes from the tree that match the provided predicate.
*
* @param predicate
* the way to match nodes
@ -304,7 +341,7 @@ public abstract class Graph<T extends Node<T>> implements Iterable<T>
public T register(T node)
{
StartLog.debug("Registering Node: [%s] %s", node.getName(), node);
StartLog.debug("Registering Node: [%s] %s",node.getName(),node);
nodes.put(node.getName(),node);
return node;
}