cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager JMXProxyServlet.java
pero2005/04/22 13:29:31
Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
JMXProxyServlet.java
Log:
add jmx get single attribute
Revision ChangesPath
1.8 +16 -1
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/JMXProxyServlet.java
Index: JMXProxyServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/JMXProxyServlet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JMXProxyServlet.java 23 Sep 2004 07:03:27 - 1.7
+++ JMXProxyServlet.java 22 Apr 2005 20:29:31 - 1.8
@@ -92,7 +92,12 @@
setAttribute( writer, qry, name, val );
return;
}
-
+qry=request.getParameter(get);
+if( qry!= null ) {
+String name=request.getParameter(att);
+getAttribute( writer, qry, name );
+return;
+}
qry=request.getParameter(qry);
if( qry == null ) {
qry = *:*;
@@ -102,6 +107,16 @@
}
+public void getAttribute(PrintWriter writer, String onameStr, String
att) {
+try {
+ObjectName oname = new ObjectName(onameStr);
+Object value = mBeanServer.getAttribute(oname, att);
+writer.println(OK - Attribute get ' + onameStr + ' - + att
+ = + value.toString() );
+} catch (Exception ex) {
+writer.println(Error - + ex.toString());
+}
+}
+
public void setAttribute( PrintWriter writer,
String onameStr, String att, String val )
{
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager JMXProxyServlet.java HTMLManagerServlet.java StatusManagerServlet.java ManagerServlet.java
remm2004/09/23 00:03:28
Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
JMXProxyServlet.java HTMLManagerServlet.java
StatusManagerServlet.java ManagerServlet.java
Log:
- Fix some deprecation warnings.
- Fix bug 31264: deploy should now behave correctly. Also move the writing of the
WAR inside the isServiced block, so that if the uploading
takes time, the auto deployer doesn't try to deploy it.
- Add any deployment operation inside a try/finally block so that serviced is set
back to false for the management operation, regardless of
what occurs. There shouldn't be any unexpected exceptions thrown out there, but
any problem would prevent further management of the
application.
Revision ChangesPath
1.7 +2 -6
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/JMXProxyServlet.java
Index: JMXProxyServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/JMXProxyServlet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JMXProxyServlet.java 27 Feb 2004 14:59:07 - 1.6
+++ JMXProxyServlet.java 23 Sep 2004 07:03:27 - 1.7
@@ -20,12 +20,9 @@
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.Enumeration;
import java.util.Iterator;
import java.util.Set;
-import java.util.Vector;
import javax.management.MBeanServer;
-import javax.management.ObjectInstance;
import javax.management.ObjectName;
import javax.management.MBeanInfo;
import javax.management.MBeanAttributeInfo;
@@ -35,7 +32,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.modeler.Registry;
-import org.apache.tomcat.util.compat.JdkCompat;
/**
* This servlet will dump JMX attributes in a simple format
@@ -59,8 +55,8 @@
*/
public void init() throws ServletException {
// Retrieve the MBean server
-registry=Registry.getRegistry();
-mBeanServer = Registry.getRegistry().getServer();
+registry = Registry.getRegistry(null, null);
+mBeanServer = Registry.getRegistry(null, null).getMBeanServer();
}
1.16 +8 -4
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
Index: HTMLManagerServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- HTMLManagerServlet.java 17 Sep 2004 19:50:20 - 1.15
+++ HTMLManagerServlet.java 23 Sep 2004 07:03:27 - 1.16
@@ -205,9 +205,13 @@
if (!isServiced(path)) {
addServiced(path);
-warUpload.write(file);
-check(path);
-removeServiced(path);
+try {
+warUpload.write(file);
+// Perform new deployment
+check(path);
+} finally {
+removeServiced(path);
+}
}
break;
}
1.15 +2 -2
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java
Index: StatusManagerServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- StatusManagerServlet.java 23 Jul 2004 22:46:08 - 1.14
+++ StatusManagerServlet.java 23 Sep 2004 07:03:27 - 1.15
@@ -108,7 +108,7 @@
public void init() throws ServletException {
// Retrieve the MBean server
-mBeanServer = Registry.getServer();
+mBeanServer = Registry.getRegistry(null, null).getMBeanServer();
// Set our properties from the initialization parameters
String value = null;
1.22 +57 -48
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java
Index: ManagerServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java,v
retrieving revision 1.21
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager JMXProxyServlet.java
remm2003/11/03 14:22:43
Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
JMXProxyServlet.java
Log:
- Make output compatible with Ant task.
- Bug 24250.
- Submitted by Peter Rossbach.
Revision ChangesPath
1.5 +20 -13
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/JMXProxyServlet.java
Index: JMXProxyServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/JMXProxyServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JMXProxyServlet.java 17 Apr 2003 19:45:46 - 1.4
+++ JMXProxyServlet.java 3 Nov 2003 22:22:43 - 1.5
@@ -128,7 +128,7 @@
String qryString= request.getQueryString();
if( mBeanServer==null ) {
-writer.println(Error: No mbean server);
+writer.println(Error - No mbean server);
return;
}
@@ -158,28 +158,35 @@
String type=registry.getType(oname, att);
Object valueObj=registry.convertValue(type, val );
mBeanServer.setAttribute( oname, new Attribute(att, valueObj));
-writer.println(Result: ok);
+writer.println(OK - Attribute set);
} catch( Exception ex ) {
-writer.println(Error: + ex.toString());
+writer.println(Error - + ex.toString());
}
}
public void listBeans( PrintWriter writer, String qry )
{
+
+Set names = null;
try {
-Set names=mBeanServer.queryNames(new ObjectName(qry), null);
-writer.println(MbeanCount: + names.size());
+names=mBeanServer.queryNames(new ObjectName(qry), null);
+writer.println(OK - Number of results: + names.size());
writer.println();
+} catch (Exception e) {
+writer.println(Error - + e.toString());
+return;
+}
-Iterator it=names.iterator();
-while( it.hasNext()) {
-ObjectName oname=(ObjectName)it.next();
+Iterator it=names.iterator();
+while( it.hasNext()) {
+ObjectName oname=(ObjectName)it.next();
+writer.println( Name: + oname.toString());
-writer.println( Name: + oname.toString());
+try {
MBeanInfo minfo=mBeanServer.getMBeanInfo(oname);
// can't be null - I thinl
String code=minfo.getClassName();
-if( org.apache.commons.modeler.BaseModelMBean.equals( code ) ) {
+if (org.apache.commons.modeler.BaseModelMBean.equals(code)) {
code=(String)mBeanServer.getAttribute(oname, modelerType);
}
writer.println(modelerType: + code);
@@ -209,10 +216,10 @@
String valueString=value.toString();
writer.println( attName + : + escape(valueString));
}
-writer.println();
+} catch (Exception e) {
+// Ignore
}
-} catch (Exception e) {
-e.printStackTrace();
+writer.println();
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
