You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2007/09/28 21:34:28 UTC
svn commit: r580468 [1/4] - in /geronimo/sandbox/monitoring: ./ mrc-client/
mrc-client/src/ mrc-client/src/main/ mrc-client/src/main/java/
mrc-client/src/main/java/org/ mrc-client/src/main/java/org/apache/
mrc-client/src/main/java/org/apache/geronimo/ ...
Author: jbohn
Date: Fri Sep 28 12:34:24 2007
New Revision: 580468
URL: http://svn.apache.org/viewvc?rev=580468&view=rev
Log:
GERONIMO-3441 initial check-in to sandbox of monitoring work by Erik Craig and Viet Nguyen
Added:
geronimo/sandbox/monitoring/
geronimo/sandbox/monitoring/LICENSE.txt (with props)
geronimo/sandbox/monitoring/NOTICE.txt (with props)
geronimo/sandbox/monitoring/mrc-client/
geronimo/sandbox/monitoring/mrc-client/.classpath
geronimo/sandbox/monitoring/mrc-client/.project
geronimo/sandbox/monitoring/mrc-client/LICENSE.txt (with props)
geronimo/sandbox/monitoring/mrc-client/NOTICE.txt (with props)
geronimo/sandbox/monitoring/mrc-client/README.txt (with props)
geronimo/sandbox/monitoring/mrc-client/pom.xml (with props)
geronimo/sandbox/monitoring/mrc-client/src/
geronimo/sandbox/monitoring/mrc-client/src/main/
geronimo/sandbox/monitoring/mrc-client/src/main/java/
geronimo/sandbox/monitoring/mrc-client/src/main/java/org/
geronimo/sandbox/monitoring/mrc-client/src/main/java/org/apache/
geronimo/sandbox/monitoring/mrc-client/src/main/java/org/apache/geronimo/
geronimo/sandbox/monitoring/mrc-client/src/main/java/org/apache/geronimo/console/
geronimo/sandbox/monitoring/mrc-client/src/main/java/org/apache/geronimo/console/stats/
geronimo/sandbox/monitoring/mrc-client/src/main/java/org/apache/geronimo/console/stats/GraphsBuilder.java (with props)
geronimo/sandbox/monitoring/mrc-client/src/main/java/org/apache/geronimo/console/stats/MRCConnector.java (with props)
geronimo/sandbox/monitoring/mrc-client/src/main/java/org/apache/geronimo/console/stats/StatsGraph.java (with props)
geronimo/sandbox/monitoring/mrc-client/src/main/java/org/apache/geronimo/console/stats/StatsPortlet.java (with props)
geronimo/sandbox/monitoring/mrc-client/src/main/webapp/
geronimo/sandbox/monitoring/mrc-client/src/main/webapp/WEB-INF/
geronimo/sandbox/monitoring/mrc-client/src/main/webapp/WEB-INF/geronimo-web.xml (with props)
geronimo/sandbox/monitoring/mrc-client/src/main/webapp/WEB-INF/portlet.xml (with props)
geronimo/sandbox/monitoring/mrc-client/src/main/webapp/WEB-INF/view/
geronimo/sandbox/monitoring/mrc-client/src/main/webapp/WEB-INF/view/statsHelp.jsp (with props)
geronimo/sandbox/monitoring/mrc-client/src/main/webapp/WEB-INF/view/statsMaximized.jsp (with props)
geronimo/sandbox/monitoring/mrc-client/src/main/webapp/WEB-INF/view/statsMbean.jsp (with props)
geronimo/sandbox/monitoring/mrc-client/src/main/webapp/WEB-INF/view/statsTimeframe.jsp (with props)
geronimo/sandbox/monitoring/mrc-client/src/main/webapp/WEB-INF/web.xml (with props)
geronimo/sandbox/monitoring/mrc-server/
geronimo/sandbox/monitoring/mrc-server/LICENSE.txt (with props)
geronimo/sandbox/monitoring/mrc-server/MRC.xml (with props)
geronimo/sandbox/monitoring/mrc-server/NOTICE.txt (with props)
geronimo/sandbox/monitoring/mrc-server/mrc-ear/
geronimo/sandbox/monitoring/mrc-server/mrc-ear/LICENSE.txt (with props)
geronimo/sandbox/monitoring/mrc-server/mrc-ear/NOTICE.txt (with props)
geronimo/sandbox/monitoring/mrc-server/mrc-ear/pom.xml (with props)
geronimo/sandbox/monitoring/mrc-server/mrc-ear/readme.txt (with props)
geronimo/sandbox/monitoring/mrc-server/mrc-ear/src/
geronimo/sandbox/monitoring/mrc-server/mrc-ear/src/main/
geronimo/sandbox/monitoring/mrc-server/mrc-ear/src/main/resources/
geronimo/sandbox/monitoring/mrc-server/mrc-ear/src/main/resources/META-INF/
geronimo/sandbox/monitoring/mrc-server/mrc-ear/src/main/resources/META-INF/geronimo-application.xml (with props)
geronimo/sandbox/monitoring/mrc-server/mrc-ejb/
geronimo/sandbox/monitoring/mrc-server/mrc-ejb/.classpath (with props)
geronimo/sandbox/monitoring/mrc-server/mrc-ejb/.project (with props)
geronimo/sandbox/monitoring/mrc-server/mrc-ejb/LICENSE.txt (with props)
geronimo/sandbox/monitoring/mrc-server/mrc-ejb/NOTICE.txt (with props)
geronimo/sandbox/monitoring/mrc-server/mrc-ejb/pom.xml (with props)
geronimo/sandbox/monitoring/mrc-server/mrc-ejb/readme.txt (with props)
geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/
geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/
geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/java/
geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/java/org/
geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/java/org/apache/
geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/java/org/apache/geronimo/
geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/java/org/apache/geronimo/monitor/
geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/java/org/apache/geronimo/monitor/MBeanHelper.java (with props)
geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/java/org/apache/geronimo/monitor/MasterRemoteControl.java (with props)
geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/java/org/apache/geronimo/monitor/SMP.java (with props)
geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/java/org/apache/geronimo/monitor/snapshot/
geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/java/org/apache/geronimo/monitor/snapshot/SnapshotConfigXMLBuilder.java (with props)
geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/java/org/apache/geronimo/monitor/snapshot/SnapshotThread.java (with props)
geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/java/org/apache/geronimo/monitor/snapshot/SnapshotXMLBuilder.java (with props)
geronimo/sandbox/monitoring/mrc-server/pom.xml (with props)
geronimo/sandbox/monitoring/mrc-server/readme.txt (with props)
geronimo/sandbox/monitoring/pom.xml (with props)
geronimo/sandbox/monitoring/readme.txt (with props)
Added: geronimo/sandbox/monitoring/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/LICENSE.txt?rev=580468&view=auto
==============================================================================
--- geronimo/sandbox/monitoring/LICENSE.txt (added)
+++ geronimo/sandbox/monitoring/LICENSE.txt Fri Sep 28 12:34:24 2007
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
Propchange: geronimo/sandbox/monitoring/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/monitoring/LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/monitoring/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/sandbox/monitoring/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/NOTICE.txt?rev=580468&view=auto
==============================================================================
--- geronimo/sandbox/monitoring/NOTICE.txt (added)
+++ geronimo/sandbox/monitoring/NOTICE.txt Fri Sep 28 12:34:24 2007
@@ -0,0 +1,5 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
Propchange: geronimo/sandbox/monitoring/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/monitoring/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/monitoring/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/sandbox/monitoring/mrc-client/.classpath
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-client/.classpath?rev=580468&view=auto
==============================================================================
--- geronimo/sandbox/monitoring/mrc-client/.classpath (added)
+++ geronimo/sandbox/monitoring/mrc-client/.classpath Fri Sep 28 12:34:24 2007
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="/home/ebcraig/.m2/repository/portlet-api/portlet-api/1.0/portlet-api-1.0.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: geronimo/sandbox/monitoring/mrc-client/.project
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-client/.project?rev=580468&view=auto
==============================================================================
--- geronimo/sandbox/monitoring/mrc-client/.project (added)
+++ geronimo/sandbox/monitoring/mrc-client/.project Fri Sep 28 12:34:24 2007
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>StatsPortlet</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: geronimo/sandbox/monitoring/mrc-client/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-client/LICENSE.txt?rev=580468&view=auto
==============================================================================
--- geronimo/sandbox/monitoring/mrc-client/LICENSE.txt (added)
+++ geronimo/sandbox/monitoring/mrc-client/LICENSE.txt Fri Sep 28 12:34:24 2007
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
Propchange: geronimo/sandbox/monitoring/mrc-client/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/monitoring/mrc-client/LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/monitoring/mrc-client/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/sandbox/monitoring/mrc-client/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-client/NOTICE.txt?rev=580468&view=auto
==============================================================================
--- geronimo/sandbox/monitoring/mrc-client/NOTICE.txt (added)
+++ geronimo/sandbox/monitoring/mrc-client/NOTICE.txt Fri Sep 28 12:34:24 2007
@@ -0,0 +1,5 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
Propchange: geronimo/sandbox/monitoring/mrc-client/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/monitoring/mrc-client/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/monitoring/mrc-client/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/sandbox/monitoring/mrc-client/README.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-client/README.txt?rev=580468&view=auto
==============================================================================
--- geronimo/sandbox/monitoring/mrc-client/README.txt (added)
+++ geronimo/sandbox/monitoring/mrc-client/README.txt Fri Sep 28 12:34:24 2007
@@ -0,0 +1,8 @@
+MRC-Client
+
+Depends on MRC-Server deployed, plugable adminstrative console from
+https://svn.apache.org/repos/asf/geronimo/plugins/console
+and the geronimo dojo plugin.
+
+To build, simply execute mvn install. A deployable war will be placed in the target directory.
+
Propchange: geronimo/sandbox/monitoring/mrc-client/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/monitoring/mrc-client/README.txt
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/monitoring/mrc-client/README.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/sandbox/monitoring/mrc-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-client/pom.xml?rev=580468&view=auto
==============================================================================
--- geronimo/sandbox/monitoring/mrc-client/pom.xml (added)
+++ geronimo/sandbox/monitoring/mrc-client/pom.xml Fri Sep 28 12:34:24 2007
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>mrc</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.geronimo.plugins.mrc</groupId>
+ <artifactId>mrc-client</artifactId>
+ <name>Geronimo Stats :: Client</name>
+ <packaging>war</packaging>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-naming</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>console-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-management</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.directwebremoting</groupId>
+ <artifactId>dwr</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-j2ee</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+
+ </dependencies>
+
+ <!-- Build configuration -->
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </build>
+
+
+</project>
Propchange: geronimo/sandbox/monitoring/mrc-client/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/monitoring/mrc-client/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/monitoring/mrc-client/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/sandbox/monitoring/mrc-client/src/main/java/org/apache/geronimo/console/stats/GraphsBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-client/src/main/java/org/apache/geronimo/console/stats/GraphsBuilder.java?rev=580468&view=auto
==============================================================================
--- geronimo/sandbox/monitoring/mrc-client/src/main/java/org/apache/geronimo/console/stats/GraphsBuilder.java (added)
+++ geronimo/sandbox/monitoring/mrc-client/src/main/java/org/apache/geronimo/console/stats/GraphsBuilder.java Fri Sep 28 12:34:24 2007
@@ -0,0 +1,578 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.console.stats;
+
+import java.text.DecimalFormat;
+import java.text.Format;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Vector;
+import java.util.Set;
+import java.util.HashSet;
+
+public class GraphsBuilder {
+
+ private String ServerIP = new String();
+ private HashMap<String, ArrayList<String>> DataNameList = new HashMap<String, ArrayList<String>>();
+ private int timeFrame;
+ private int snapCount;
+ private MRCConnector MRCConnection = new MRCConnector();
+
+ // constructor
+ GraphsBuilder(int serverID) {
+ // TODO: Database pull stuff may go here... based on server ID...
+ String username = "system";
+ String password = "manager";
+ ServerIP = "127.0.0.1";
+
+ try {
+
+ MRCConnection = new MRCConnector(ServerIP, username, password);
+ // TODO: Read config file to pull stuff we want graphed
+ DataNameList = MRCConnection.getDataNameList();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ }
+
+ /**
+ * @param mbServerConn:
+ * mbean connection to Geronimo instance
+ * @param snapCount:
+ * Number of points to graph from
+ * @param timeFrame:
+ * Duration (in minutes) to be represented with the snapCount
+ * @return List of strings to be dumped to page
+ * @throws Exception
+ */
+ public Vector<StatsGraph> BuildAllOnTimeFrame(int snapcount, int timeframe)
+ throws Exception {
+
+ timeFrame = timeframe;
+ snapCount = snapcount;
+ HashMap<String, Vector<Object>> DataList = new HashMap<String, Vector<Object>>();
+
+ // Run through the mbeans
+ for (Iterator<String> it = DataNameList.keySet().iterator(); it
+ .hasNext();) {
+ // get the mbean name
+ String mbeanName = (String) it.next();
+ ArrayList<String> stats = null;
+ // Verify that it's not times
+ if (!mbeanName.equals("times")) {
+ stats = DataNameList.get(mbeanName);
+ for (Iterator<String> itt = stats.iterator(); itt.hasNext();) {
+ String key = (String) itt.next();
+ // Place elements into the DataList
+ DataList.put(mbeanName + "+" + key, new Vector<Object>());
+ }
+ }
+ }
+
+ if ((timeFrame / 1440 == 30))
+ snapCount = 17;
+ else {
+ if (((timeFrame / 1440) <= 7) && ((timeFrame / 60) > 24)
+ && snapCount >= 14) {
+ if ((timeFrame / 1440) == 7)
+ snapCount = 16;
+ else
+ snapCount = 12;
+ }
+ }
+
+ Vector<Object> snapshot_date = new Vector<Object>();
+ Vector<Object> snapshot_time = new Vector<Object>();
+ ;
+ Vector<Object> PrettyTime = new Vector<Object>();
+
+ String prettyTimeFrame = new String();
+ DecimalFormat fmt = new DecimalFormat("0.##");
+ if (timeFrame / 60 > 24)
+ prettyTimeFrame = fmt.format((float) (timeFrame / 1440)) + " day";
+ else {
+ if (timeFrame > 60)
+ prettyTimeFrame = fmt.format((float) timeFrame / 60) + " hour";
+ else
+ prettyTimeFrame = fmt.format(timeFrame) + " minute";
+ }
+
+ try {
+ int skipCount = (int) ((timeFrame / (MRCConnector
+ .getSnapshotDuration() / 60000)))
+ / (snapCount - 2);
+ // TODO: Call the fetching thing here
+ ArrayList<HashMap<String, HashMap<String, Object>>> snapshotList = MRCConnection
+ .getSnapshots(snapCount, skipCount);
+
+ /*
+ * If there are not enough snapshots available to fill the requested
+ * number, insert some with values of 0 and the proper times.
+ */
+ while (snapshotList.size() < snapCount) {
+ // Temporary, always is first element (oldest)
+ HashMap<String, HashMap<String, Object>> mapTimeFix = snapshotList
+ .get(0);
+
+ // Temporary map, used to generate blank data to be added to the
+ // list at position 0
+ HashMap<String, HashMap<String, Object>> tempMap = new HashMap<String, HashMap<String, Object>>();
+
+ // Temporary submap, used to store 0 elements to be added to the
+ // tempmap
+ HashMap<String, Object> subMap = new HashMap<String, Object>();
+
+ // Calculate appropriate time, add it to the submap, then add
+ // that to the tempMap
+ subMap.put("snapshot_time", (Long)((Long)mapTimeFix.get("times").get("snapshot_time") - (MRCConnector.getSnapshotDuration() * skipCount)));
+ Format formatter = null;
+ formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date date = new Date((Long) subMap.get("snapshot_time"));
+ subMap.put("snapshot_date", formatter.format(date));
+ // Add the submap back to the tempmap
+ tempMap.put("times", new HashMap<String, Object>(subMap));
+
+ // Clear out the subMap for use again
+ subMap.clear();
+
+ // Run through the mbeans
+ for (Iterator<String> it = mapTimeFix.keySet().iterator(); it
+ .hasNext();) {
+ // get the mbean name
+ String mbeanName = (String) it.next();
+ HashMap<String, Object> stats = null;
+ // Verify that it's not times
+
+ if (mbeanName.equals(new String("times"))) {
+
+ } else {
+ stats = mapTimeFix.get(mbeanName);
+ // Run through the stats elements for the particular
+ // mbean
+ for (Iterator<String> itt = stats.keySet().iterator(); itt
+ .hasNext();) {
+ String key = (String) itt.next();
+ // Place faux data into the submap
+ subMap.put(key, new Long(0));
+ }
+ // Add the submap to the tempmap, and clear it
+ tempMap.put(mbeanName, new HashMap<String, Object>(subMap));
+ }
+ }
+ snapshotList.add(0, new HashMap<String, HashMap<String, Object>>(tempMap));
+ }
+
+ /*
+ * This is where we will be inserting data to fill 'gaps' in the
+ * snapshots The initial for-loop will travel from the most recent
+ * snapshot to the oldest, checking that the snapshot_time along the
+ * way all align with what they should be
+ */
+ for (int i = snapshotList.size() - 1; i > 0; i--) {
+ if (i > 0) {
+ HashMap<String, HashMap<String, Object>> mapTimeFix = snapshotList
+ .get(i);
+ HashMap<String, HashMap<String, Object>> mapTimeFix2 = snapshotList
+ .get(i - 1);
+ // here is where we will in missing data
+ while (((((Long) mapTimeFix.get("times").get(
+ "snapshot_time") / 1000) / 60)
+ - (((Long) mapTimeFix2.get("times").get(
+ "snapshot_time") / 1000) / 60) > (((MRCConnector
+ .getSnapshotDuration() / 1000) / 60) * skipCount))) {
+ HashMap<String, HashMap<String, Object>> tempMap = new HashMap<String, HashMap<String, Object>>();
+ HashMap<String, Object> subMap = new HashMap<String, Object>();
+
+ for (Iterator<String> it = mapTimeFix.keySet()
+ .iterator(); it.hasNext();) {
+ // get the mbean name
+ String mbeanName = (String) it.next();
+ HashMap<String, Object> stats = null;
+ // Verify that it's not times
+ if (!mbeanName.equals("times")) {
+ stats = mapTimeFix.get(mbeanName);
+ // Run through the stats elements for the
+ // particular
+ // mbean
+ for (Iterator<String> itt = stats.keySet()
+ .iterator(); itt.hasNext();) {
+ String key = (String) itt.next();
+ // Place faux data into the submap
+ subMap.put(key, new Long(0));
+ }
+ // Add the submap to the tempmap, and clear it
+ tempMap.put(mbeanName, new HashMap<String, Object>(subMap));
+ subMap.clear();
+ }
+ }
+
+ subMap.put("snapshot_time",new Long((Long) mapTimeFix.get("times").get("snapshot_time")- (MRCConnector.getSnapshotDuration() * skipCount)));
+ Format formatter = null;
+ formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date date = new Date((Long) subMap.get("snapshot_time"));
+ subMap.put("snapshot_date", formatter.format(date));
+ tempMap.put("times", new HashMap<String, Object>(subMap));
+ subMap.clear();
+ snapshotList.add(i, new HashMap<String, HashMap<String, Object>>(tempMap));
+ snapshotList.remove(0);
+ mapTimeFix = tempMap;
+ mapTimeFix2 = snapshotList.get(i - 1);
+ }
+ }
+ }
+
+ for (int i = 0; i < snapshotList.size(); i++) {
+ HashMap<String, HashMap<String, Object>> map = snapshotList
+ .get(i);
+ snapshot_date.add((String) map.get("times")
+ .get("snapshot_date"));
+ snapshot_time.add((Long) map.get("times").get("snapshot_time"));
+
+ for (Iterator<String> it = DataNameList.keySet().iterator(); it
+ .hasNext();) {
+ // get the mbean name
+ String mbeanName = (String) it.next();
+ ArrayList<String> stats = null;
+
+ // Verify that it's not times
+ if (!mbeanName.equals("times")) {
+ stats = DataNameList.get(mbeanName);
+ for (Iterator<String> itt = stats.iterator(); itt
+ .hasNext();) {
+ String key = (String) itt.next();
+ Vector<Object> vectorTemp = DataList.get(mbeanName
+ + "+" + key);
+ vectorTemp.add(map.get(mbeanName).get(key));
+ // Place elements into the DataList
+ DataList.put(mbeanName + "+" + key, vectorTemp);
+ }
+ }
+ }
+ PrettyTime.add((Long) map.get("times").get("snapshot_time") / 1000);
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ Vector<StatsGraph> GraphVector = new Vector<StatsGraph>();
+
+ for (Iterator<String> it = DataNameList.keySet().iterator(); it
+ .hasNext();) {
+ // get the mbean name
+ String mbeanName = (String) it.next();
+ ArrayList<String> stats = null;
+
+ // Verify that it's not times
+ if (!mbeanName.equals("times")) {
+ stats = DataNameList.get(mbeanName);
+ for (Iterator<String> itt = stats.iterator(); itt.hasNext();) {
+ String key = (String) itt.next();
+ String[] titleTest = mbeanName.split("=");
+ if (!(key.contains("Max") || key.contains("Min") || key
+ .contains("Current"))) {
+
+
+ GraphVector.add(new StatsGraph(titleTest[titleTest.length-1]+key, "127.0.0.1" + " - "
+ + titleTest[titleTest.length-1]+key + "/second - " + prettyTimeFrame, "", "",
+ DataList.get(mbeanName + "+" + key), '/',
+ PrettyTime, snapshot_time, (int) (MRCConnector
+ .getSnapshotDuration() / 1000),
+ timeFrame, "1176c2"));
+ }
+ if (key.contains("Current")) {
+ GraphVector.add(new StatsGraph(titleTest[titleTest.length-1]+key, "127.0.0.1" + " - "
+ + titleTest[titleTest.length-1]+key + " - " + prettyTimeFrame, "", "",
+ DataList.get(mbeanName + "+" + key),
+ snapshot_time, (int) (MRCConnector
+ .getSnapshotDuration() / 1000),
+ timeFrame, "1176c2"));
+
+ }
+ }
+ }
+ }
+
+ return GraphVector;
+ }
+
+ public Vector<StatsGraph> BuildOnMbean(int snapcount, int timeframe, String MBeanName)
+ throws Exception {
+
+ timeFrame = timeframe;
+ snapCount = snapcount;
+ HashMap<String, Vector<Object>> DataList = new HashMap<String, Vector<Object>>();
+
+// Run through the mbeans
+ for (Iterator<String> it = DataNameList.keySet().iterator(); it
+ .hasNext();) {
+ // get the mbean name
+ String mbeanName = (String) it.next();
+ ArrayList<String> stats = null;
+ // Verify that it's not times
+ if (mbeanName.contains(MBeanName)) {
+ stats = DataNameList.get(mbeanName);
+ for (Iterator<String> itt = stats.iterator(); itt.hasNext();) {
+ String key = (String) itt.next();
+ // Place elements into the DataList
+ DataList.put(mbeanName + "+" + key, new Vector<Object>());
+ }
+ }
+ }
+
+ if ((timeFrame / 1440 == 30))
+ snapCount = 17;
+ else {
+ if (((timeFrame / 1440) <= 7) && ((timeFrame / 60) > 24)
+ && snapCount >= 14) {
+ if ((timeFrame / 1440) == 7)
+ snapCount = 16;
+ else
+ snapCount = 12;
+ }
+ }
+
+ Vector<Object> snapshot_date = new Vector<Object>();
+ Vector<Object> snapshot_time = new Vector<Object>();
+ ;
+ Vector<Object> PrettyTime = new Vector<Object>();
+
+ String prettyTimeFrame = new String();
+ DecimalFormat fmt = new DecimalFormat("0.##");
+ if (timeFrame / 60 > 24)
+ prettyTimeFrame = fmt.format((float) (timeFrame / 1440)) + " day";
+ else {
+ if (timeFrame > 60)
+ prettyTimeFrame = fmt.format((float) timeFrame / 60) + " hour";
+ else
+ prettyTimeFrame = fmt.format(timeFrame) + " minute";
+ }
+
+ try {
+ int skipCount = (int) ((timeFrame / (MRCConnector
+ .getSnapshotDuration() / 60000)))
+ / (snapCount - 2);
+ // TODO: Call the fetching thing here
+ ArrayList<HashMap<String, HashMap<String, Object>>> snapshotList = MRCConnection
+ .getSnapshots(snapCount, skipCount);
+
+ /*
+ * If there are not enough snapshots available to fill the requested
+ * number, insert some with values of 0 and the proper times.
+ */
+ while (snapshotList.size() < snapCount) {
+ // Temporary, always is first element (oldest)
+ HashMap<String, HashMap<String, Object>> mapTimeFix = snapshotList
+ .get(0);
+
+ // Temporary map, used to generate blank data to be added to the
+ // list at position 0
+ HashMap<String, HashMap<String, Object>> tempMap = new HashMap<String, HashMap<String, Object>>();
+
+ // Temporary submap, used to store 0 elements to be added to the
+ // tempmap
+ HashMap<String, Object> subMap = new HashMap<String, Object>();
+
+ // Calculate appropriate time, add it to the submap, then add
+ // that to the tempMap
+ subMap.put("snapshot_time", (Long)((Long)mapTimeFix.get("times").get("snapshot_time") - (MRCConnector.getSnapshotDuration() * skipCount)));
+ Format formatter = null;
+ formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date date = new Date((Long) subMap.get("snapshot_time"));
+ subMap.put("snapshot_date", formatter.format(date));
+ // Add the submap back to the tempmap
+ tempMap.put("times", new HashMap<String, Object>(subMap));
+
+ // Clear out the subMap for use again
+ subMap.clear();
+
+ // Run through the mbeans
+ for (Iterator<String> it = mapTimeFix.keySet().iterator(); it
+ .hasNext();) {
+ // get the mbean name
+ String mbeanName = (String) it.next();
+ HashMap<String, Object> stats = null;
+ // Verify that it's not times
+
+ if (mbeanName.contains(MBeanName)) {
+ stats = mapTimeFix.get(mbeanName);
+ // Run through the stats elements for the particular
+ // mbean
+ for (Iterator<String> itt = stats.keySet().iterator(); itt
+ .hasNext();) {
+ String key = (String) itt.next();
+ // Place faux data into the submap
+ subMap.put(key, new Long(0));
+ }
+ // Add the submap to the tempmap, and clear it
+ tempMap.put(mbeanName, new HashMap<String, Object>(subMap));
+ }
+ }
+ snapshotList.add(0, new HashMap<String, HashMap<String, Object>>(tempMap));
+ }
+
+ /*
+ * This is where we will be inserting data to fill 'gaps' in the
+ * snapshots The initial for-loop will travel from the most recent
+ * snapshot to the oldest, checking that the snapshot_time along the
+ * way all align with what they should be
+ */
+ for (int i = snapshotList.size() - 1; i > 0; i--) {
+ if (i > 0) {
+ HashMap<String, HashMap<String, Object>> mapTimeFix = snapshotList
+ .get(i);
+ HashMap<String, HashMap<String, Object>> mapTimeFix2 = snapshotList
+ .get(i - 1);
+ // here is where we will in missing data
+ while (((((Long) mapTimeFix.get("times").get(
+ "snapshot_time") / 1000) / 60)
+ - (((Long) mapTimeFix2.get("times").get(
+ "snapshot_time") / 1000) / 60) > (((MRCConnector
+ .getSnapshotDuration() / 1000) / 60) * skipCount))) {
+ HashMap<String, HashMap<String, Object>> tempMap = new HashMap<String, HashMap<String, Object>>();
+ HashMap<String, Object> subMap = new HashMap<String, Object>();
+
+ for (Iterator<String> it = mapTimeFix.keySet()
+ .iterator(); it.hasNext();) {
+ // get the mbean name
+ String mbeanName = (String) it.next();
+ HashMap<String, Object> stats = null;
+ // Verify that it's not times
+ if (mbeanName.contains(MBeanName)) {
+ stats = mapTimeFix.get(mbeanName);
+ // Run through the stats elements for the
+ // particular
+ // mbean
+ for (Iterator<String> itt = stats.keySet()
+ .iterator(); itt.hasNext();) {
+ String key = (String) itt.next();
+ // Place faux data into the submap
+ subMap.put(key, new Long(0));
+ }
+ // Add the submap to the tempmap, and clear it
+ tempMap.put(mbeanName, new HashMap<String, Object>(subMap));
+ subMap.clear();
+ }
+ }
+
+ subMap.put("snapshot_time",new Long((Long) mapTimeFix.get("times").get("snapshot_time")- (MRCConnector.getSnapshotDuration() * skipCount)));
+ Format formatter = null;
+ formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date date = new Date((Long) subMap.get("snapshot_time"));
+ subMap.put("snapshot_date", formatter.format(date));
+ tempMap.put("times", new HashMap<String, Object>(subMap));
+ subMap.clear();
+ snapshotList.add(i, new HashMap<String, HashMap<String, Object>>(tempMap));
+ snapshotList.remove(0);
+ mapTimeFix = tempMap;
+ mapTimeFix2 = snapshotList.get(i - 1);
+ }
+ }
+ }
+
+ for (int i = 0; i < snapshotList.size(); i++) {
+ HashMap<String, HashMap<String, Object>> map = snapshotList
+ .get(i);
+ snapshot_date.add((String) map.get("times")
+ .get("snapshot_date"));
+ snapshot_time.add((Long) map.get("times").get("snapshot_time"));
+
+ for (Iterator<String> it = DataNameList.keySet().iterator(); it
+ .hasNext();) {
+ // get the mbean name
+ String mbeanName = (String) it.next();
+ ArrayList<String> stats = null;
+
+ // Verify that it's not times
+ if (mbeanName.contains(MBeanName)) {
+ stats = DataNameList.get(mbeanName);
+ for (Iterator<String> itt = stats.iterator(); itt
+ .hasNext();) {
+ String key = (String) itt.next();
+ Vector<Object> vectorTemp = DataList.get(mbeanName
+ + "+" + key);
+ vectorTemp.add(map.get(mbeanName).get(key));
+ // Place elements into the DataList
+ DataList.put(mbeanName + "+" + key, vectorTemp);
+ }
+ }
+ }
+ PrettyTime.add((Long) map.get("times").get("snapshot_time") / 1000);
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ Vector<StatsGraph> GraphVector = new Vector<StatsGraph>();
+
+ for (Iterator<String> it = DataNameList.keySet().iterator(); it
+ .hasNext();) {
+ // get the mbean name
+ String mbeanName = (String) it.next();
+ ArrayList<String> stats = null;
+
+ // Verify that it's not times
+ if (mbeanName.contains(MBeanName)) {
+ stats = DataNameList.get(mbeanName);
+ for (Iterator<String> itt = stats.iterator(); itt.hasNext();) {
+ String key = (String) itt.next();
+ String[] titleTest = mbeanName.split("=");
+ if (!(key.contains("Max") || key.contains("Min") || key
+ .contains("Current"))) {
+
+
+ GraphVector.add(new StatsGraph(titleTest[titleTest.length-1]+key, "127.0.0.1" + " - "
+ + titleTest[titleTest.length-1]+key + "/second - " + prettyTimeFrame, "", "",
+ DataList.get(mbeanName + "+" + key), '/',
+ PrettyTime, snapshot_time, (int) (MRCConnector
+ .getSnapshotDuration() / 1000),
+ timeFrame, "1176c2"));
+ }
+ if (key.contains("Current")) {
+ GraphVector.add(new StatsGraph(titleTest[titleTest.length-1]+key, "127.0.0.1" + " - "
+ + titleTest[titleTest.length-1]+key + " - " + prettyTimeFrame, "", "",
+ DataList.get(mbeanName + "+" + key),
+ snapshot_time, (int) (MRCConnector
+ .getSnapshotDuration() / 1000),
+ timeFrame, "1176c2"));
+
+ }
+ }
+ }
+ }
+
+ return GraphVector;
+ }
+
+ public Set<String> GetTrackedBeansPretty()
+ {
+ Set<String> trackedBeans = new HashSet<String>();
+ for (Iterator<String> it = DataNameList.keySet().iterator(); it.hasNext();) {
+ String mbeanName = it.next();
+ if (!mbeanName.equals("times")) {
+ String[] beanTemp = mbeanName.split("=");
+ trackedBeans.add(beanTemp[beanTemp.length-1]);
+ }
+ }
+ return trackedBeans;
+ }
+}
Propchange: geronimo/sandbox/monitoring/mrc-client/src/main/java/org/apache/geronimo/console/stats/GraphsBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/monitoring/mrc-client/src/main/java/org/apache/geronimo/console/stats/GraphsBuilder.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/monitoring/mrc-client/src/main/java/org/apache/geronimo/console/stats/GraphsBuilder.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/sandbox/monitoring/mrc-client/src/main/java/org/apache/geronimo/console/stats/MRCConnector.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-client/src/main/java/org/apache/geronimo/console/stats/MRCConnector.java?rev=580468&view=auto
==============================================================================
--- geronimo/sandbox/monitoring/mrc-client/src/main/java/org/apache/geronimo/console/stats/MRCConnector.java (added)
+++ geronimo/sandbox/monitoring/mrc-client/src/main/java/org/apache/geronimo/console/stats/MRCConnector.java Fri Sep 28 12:34:24 2007
@@ -0,0 +1,114 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.console.stats;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.management.remote.JMXConnector;
+import javax.management.remote.JMXConnectorFactory;
+import javax.management.remote.JMXServiceURL;
+
+public class MRCConnector {
+
+ private static final String PATH = "geronimo:ServiceModule=org.apache.geronimo.monitor/MRC/1.0/car,J2EEServer=geronimo,name=MasterRemoteControl,j2eeType=GBean";
+ private static MBeanServerConnection mbServerConn;
+ private static Long SnapshotDuration = new Long(0);
+ MRCConnector() {
+
+ }
+
+ /**
+ * @param ServerIP - IP address of mrc-server to connect to
+ * @param userName - Username for JMX connection to the host
+ * @param password - Password for JMX connection to the host
+ * @throws Exception - If the connection to mrc-server fails
+ */
+ MRCConnector(String ServerIP, String userName, String password)
+ throws Exception {
+ JMXServiceURL serviceURL = new JMXServiceURL(
+ "service:jmx:rmi:///jndi/rmi://" + ServerIP
+ + ":1099/JMXConnector");
+ Hashtable<String,Object> env = new Hashtable<String,Object>();
+ String[] credentials = new String[2];
+ credentials[0] = userName;
+ credentials[1] = password;
+ env.put(JMXConnector.CREDENTIALS, credentials);
+ JMXConnector connector = JMXConnectorFactory.connect(serviceURL, env);
+ mbServerConn = connector.getMBeanServerConnection();
+ }
+
+ /**
+ * @return - Returns an Long representing the current snapshot duration set on the server side
+ * @throws Exception - If the connection to the MRC-Server fails
+ */
+ public static Long getSnapshotDuration() throws Exception {
+ if (SnapshotDuration == 0) {
+ try {
+ SnapshotDuration = (Long) mbServerConn.invoke(new ObjectName(
+ PATH), "getSnapshotDuration", new Object[] {},
+ new String[] {});
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ return SnapshotDuration;
+ }
+
+ /**
+ * @return - Returns an ArrayList of String objects containing a listing of all statistics values being collected
+ * @throws Exception - If the connection to the MRC-Server fails
+ */
+ public HashMap<String, ArrayList<String>> getDataNameList() throws Exception {
+
+ HashMap<String, ArrayList<String>> DataNameList = new HashMap<String, ArrayList<String>>();
+ try {
+ DataNameList = (HashMap<String, ArrayList<String>>) mbServerConn.invoke(
+ new ObjectName(PATH), "getAllSnapshotStatAttributes",
+ new Object[] {}, new String[] {});
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ //Strip out snapshot_date and snapshot_time, we know these exist
+ for (Iterator<String> it = DataNameList.keySet().iterator(); it
+ .hasNext();) {
+ String mbeanName = it.next();
+ DataNameList.get(mbeanName).remove("snapshot_date");
+ DataNameList.get(mbeanName).remove("snapshot_time");
+ }
+ return DataNameList;
+ }
+
+ /**
+ * @param snapCount - Number of snapshots to request from the server
+ * @param skipCount - Every nth snapshot. A value of 1 will be every 1. A value of 2 will be every other.
+ * @return - Returns an ArrayList of Map objects.
+ * @throws Exception - If the connection to the MRC-Server fails
+ */
+ public ArrayList<HashMap<String, HashMap<String,Object>>> getSnapshots(int snapCount, int skipCount)
+ throws Exception {
+ ArrayList<HashMap<String, HashMap<String,Object>>> list = (ArrayList<HashMap<String, HashMap<String,Object>>>) mbServerConn.invoke(
+ new ObjectName(PATH), "fetchSnapshotData", new Object[] {
+ snapCount, skipCount}, new String[] {
+ "java.lang.Integer", "java.lang.Integer"});
+ return list;
+ }
+}
Propchange: geronimo/sandbox/monitoring/mrc-client/src/main/java/org/apache/geronimo/console/stats/MRCConnector.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/monitoring/mrc-client/src/main/java/org/apache/geronimo/console/stats/MRCConnector.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/monitoring/mrc-client/src/main/java/org/apache/geronimo/console/stats/MRCConnector.java
------------------------------------------------------------------------------
svn:mime-type = text/plain