svn commit: r731939 - in /geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/data: Graph.java Node.java

[dw...@apache.org]

Author: dwoods
Date: Tue Jan  6 05:49:50 2009
New Revision: 731939

URL: http://svn.apache.org/viewvc?rev=731939&view=rev
Log:
GERONIMO-4487 Can't disable/enable a server in monitoring portlet.  Thanks to Shawn Jiang for the patch.

Modified:
    geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/data/Graph.java
    geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/data/Node.java

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/data/Graph.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/data/Graph.java?rev=731939&r1=731938&r2=731939&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/data/Graph.java (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/data/Graph.java Tue Jan  6 05:49:50 2009
@@ -39,7 +39,12 @@
  * @version $Rev$ $Date$
  */
 @Entity(name = "graph")
-@NamedQuery(name = "allGraphs", query = "SELECT a FROM graph a")
+@NamedQueries(
+ { 
+    @NamedQuery(name = "allGraphs", query = "SELECT a FROM graph a"), 
+    @NamedQuery(name = "graphById", query = "SELECT g FROM graph g WHERE g.id = :id")
+ }
+ )
 public class Graph {
 
     @Id

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/data/Node.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/data/Node.java?rev=731939&r1=731938&r2=731939&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/data/Node.java (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/data/Node.java Tue Jan  6 05:49:50 2009
@@ -27,10 +27,17 @@
 import javax.persistence.Column;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 @Entity(name = "node")
-@NamedQuery(name = "allNodes", query = "SELECT a FROM node a")
+
+@NamedQueries(
+  {
+    @NamedQuery(name = "allNodes", query = "SELECT a FROM node a"),
+    @NamedQuery(name = "nodeByName", query = "SELECT n FROM node n WHERE n.name = :name")
+  }
+)
+
 public class Node {
     @Id
     private String name;