2007-01-14 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* javax/management/AttributeValueExp.java: New file.
	* javax/management/QueryEval.java: Likewise.
	* javax/management/StringValueExp.java: Likewise.

3 files changed, 409 insertions, 0 deletions

diff --git a/javax/management/AttributeValueExp.java b/javax/management/AttributeValueExp.java
new file mode 100644
index 000000000..9fc0a5df9
--- /dev/null
+++ b/javax/management/AttributeValueExp.java
@@ -0,0 +1,181 @@
+/* AttributeValueExp.java -- Represents attributes to be passed to queries.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.management;
+
+/**
+ * Represents an attribute value being used as an argument
+ * to a relational constraint.
+ *
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5
+ */
+public class AttributeValueExp
+  implements ValueExp
+{
+
+  /**
+   * Compatible with JDK 1.5
+   */
+  private static final long serialVersionUID = -776802504653916338L;
+
+  /**
+   * The name of the attribute.
+   */
+  private String attr;
+
+  /**
+   * Constructs a new {@link AttributeValueExp}.
+   *
+   * @deprecated An instance created with a <code>null</code>
+   *             attribute name can not be used in a query.
+   */
+  @Deprecated public AttributeValueExp()
+  {
+  }
+
+  /**
+   * Constructs a new {@link AttributeValueExp} using the
+   * specified attribute.
+   *
+   * @param attr the name of the attribute whose value
+   *             will be used for this expression.
+   */
+  public AttributeValueExp(String attr)
+  {
+    this.attr = attr;
+  }
+
+  /**
+   * Applies the {@link AttributeValueExp} to the specified
+   * management bean by obtaining the attribute value from
+   * the {@link MBeanServer} and using it to create a
+   * {@link StringValueExp}.
+   *
+   * @param name the {@link ObjectName} of the bean to obtain
+   *             the value from.
+   * @return a {@link StringValueExp} containing the result.
+   * @throws BadStringOperationException if an invalid string
+   *                                     operation is used by
+   *                                     the value expression.
+   * @throws BadBinaryOpValueExpException if an invalid expression
+   *                                      is used by the value expression.
+   * @throws BadAttributeValueExpException if an invalid attribute
+   *                                       is used by the value expression.
+   * @throws InvalidApplicationException if the value expression is applied
+   *                                     to the wrong type of bean.
+   */
+  public ValueExp apply(ObjectName name)
+    throws BadStringOperationException, BadBinaryOpValueExpException,
+	   BadAttributeValueExpException, InvalidApplicationException
+  {
+    Object val = getAttribute(name);
+    if (val == null || !(val instanceof String))
+      throw new BadAttributeValueExpException(val);
+    return new StringValueExp((String) val);
+  }
+
+  /**
+   * Returns the value of the attribute by calling the
+   * {@link MBeanServer#getAttribute(ObjectName)} method of
+   * the server returned by {@link QueryEval#getMBeanServer()}.
+   * If an exception occurs, <code>null</code> is returned.
+   *
+   * @param name the {@link ObjectName} of the bean to obtain
+   *             the value from.
+   * @return a {@link StringValueExp} containing the result.
+   */
+  protected Object getAttribute(ObjectName name)
+  {
+    try
+      {
+	return QueryEval.getMBeanServer().getAttribute(name, attr);
+      }
+    catch (NullPointerException e)
+      {
+	return null;
+      }
+    catch (MBeanException e)
+      {
+	return null;
+      }
+    catch (AttributeNotFoundException e)
+      {
+	return null;
+      }
+    catch (InstanceNotFoundException e)
+      {
+	return null;
+      }
+    catch (ReflectionException e)
+      {
+	return null;
+      }
+  }
+
+  /**
+   * Returns the attribute name.
+   *
+   * @return the attribute name.
+   */
+  public String getAttributeName()
+  {
+    return attr;
+  }
+
+  /**
+   * Sets the {@link MBeanServer} on which the query
+   * will be performed.
+   *
+   * @param server the new server.
+   */
+  public void setMBeanServer(MBeanServer server)
+  {
+    /* This seems to do nothing any more */
+  }
+
+  /**
+   * Returns the attribute name, quoted.
+   *
+   * @return the quoted attribute name.
+   */
+  public String toString()
+  {
+    return "'" + attr + "'";
+  }
+
+}
diff --git a/javax/management/QueryEval.java b/javax/management/QueryEval.java
new file mode 100644
index 000000000..375270ae9
--- /dev/null
+++ b/javax/management/QueryEval.java
@@ -0,0 +1,95 @@
+/* QueryEval.java -- An evaluation context for a MBean server query.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.management;
+
+import java.io.Serializable;
+
+/**
+ * Represents the evaluation context of a {@link MBeanServer}
+ * query by retaining the server used on a thread-by-thread
+ * basis.
+ *
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5
+ */
+public class QueryEval
+  implements Serializable
+{
+
+  /**
+   * Compatible with JDK 1.5
+   */
+  private static final long serialVersionUID = 2675899265640874796L;
+
+  /**
+   * Stores the server used, on a 
+   * thread-by-thread basis.
+   */
+  private static InheritableThreadLocal<MBeanServer> server =
+    new InheritableThreadLocal<MBeanServer>();
+
+  /**
+   * Returns the {@link MBeanServer} last supplied to the
+   * {@link #setMBeanServer(MBeanServer)} method.  If this method
+   * has not been called for this thread, then the value will be
+   * inherited from any parent thread on which the method has
+   * been called.  If the method has never been called, then
+   * <code>null</code> is returned.
+   *
+   * @return the server.
+   * @see #setMBeanServer(MBeanServer)
+   */
+  public static MBeanServer getMBeanServer()
+  {
+    return server.get();
+  }
+
+  /**
+   * Sets the {@link MBeanServer} on which the query will be
+   * performed.  This value is inherited automatically by
+   * child threads.  This method is only non-static for historical
+   * reasons; it makes no use of instance-related values. 
+   *
+   * @param svr the server to use.
+   */
+  public void setMBeanServer(MBeanServer svr)
+  {
+    server.set(svr);
+  }
+
+}
diff --git a/javax/management/StringValueExp.java b/javax/management/StringValueExp.java
new file mode 100644
index 000000000..f3ce00b53
--- /dev/null
+++ b/javax/management/StringValueExp.java
@@ -0,0 +1,133 @@
+/* StringValueExp.java -- Represents strings to be passed to queries.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.management;
+
+/**
+ * Represents a string being used as an argument
+ * to a relational constraint.
+ *
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5
+ */
+public class StringValueExp
+  implements ValueExp
+{
+
+  /**
+   * Compatible with JDK 1.5
+   */
+  private static final long serialVersionUID = -3256390509806284044L;
+
+  /**
+   * The string value.
+   */
+  private String val;
+
+  /**
+   * Constructs a new {@link StringValueExp}.
+   */
+  public StringValueExp()
+  {
+  }
+
+  /**
+   * Constructs a new {@link StringValueExp} using the
+   * specified value.
+   *
+   * @param val the string value used for this expression.
+   */
+  public StringValueExp(String val)
+  {
+    this.val = val;
+  }
+
+  /**
+   * Applies the {@link StringValueExp} to the specified
+   * management bean by simply returning the value.
+   *
+   * @param name the {@link ObjectName} of the bean.
+   * @return the {@link StringValueExp} itself.
+   * @throws BadStringOperationException if an invalid string
+   *                                     operation is used by
+   *                                     the value expression.
+   * @throws BadBinaryOpValueExpException if an invalid expression
+   *                                      is used by the value expression.
+   * @throws BadAttributeValueExpException if an invalid attribute
+   *                                       is used by the value expression.
+   * @throws InvalidApplicationException if the value expression is applied
+   *                                     to the wrong type of bean.
+   */
+  public ValueExp apply(ObjectName name)
+    throws BadStringOperationException, BadBinaryOpValueExpException,
+	   BadAttributeValueExpException, InvalidApplicationException
+  {
+    return this;
+  }
+
+  /**
+   * Returns the value.
+   *
+   * @return the value.
+   */
+  public String getValue()
+  {
+    return val;
+  }
+
+  /**
+   * Sets the {@link MBeanServer} on which the query
+   * will be performed.
+   *
+   * @param server the new server.
+   */
+  public void setMBeanServer(MBeanServer server)
+  {
+    /* This seems to do nothing any more */
+  }
+
+  /**
+   * Returns the value in quotes.
+   *
+   * @return the value (quoted).
+   */
+  public String toString()
+  {
+    return "'" + val + "'";
+  }
+
+}