[jboss-cvs] JBossAS SVN: r111480 - in branches/snmp4j-int: varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon May 30 13:00:08 EDT 2011
Author: thauser at redhat.com
Date: 2011-05-30 13:00:07 -0400 (Mon, 30 May 2011)
New Revision: 111480
Added:
branches/snmp4j-int/src/
Removed:
branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/config/attribute/ManagedRow.java
branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/config/attribute/ManagedTable.java
Modified:
branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/AttributeMappingsBinding.java
branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/RequestHandlerImpl.java
branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/config/attribute/MIBGenerator.java
branches/snmp4j-int/varia/src/resources/services/snmp/deploy/attributes.mib
branches/snmp4j-int/varia/src/resources/services/snmp/deploy/managers.xml
Log:
more stuff for v3
Modified: branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/AttributeMappingsBinding.java
===================================================================
--- branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/AttributeMappingsBinding.java 2011-05-30 14:20:09 UTC (rev 111479)
+++ branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/AttributeMappingsBinding.java 2011-05-30 17:00:07 UTC (rev 111480)
@@ -106,6 +106,7 @@
public Object newChild(ManagedBean mbean, UnmarshallingContext navigator,
String namespaceUri, String localName, Attributes attrs)
{
+
MappedAttribute attribute = null;
if ("attribute".equals(localName)) {
String oid = attrs.getValue("oid");
Modified: branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/RequestHandlerImpl.java
===================================================================
--- branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/RequestHandlerImpl.java 2011-05-30 14:20:09 UTC (rev 111479)
+++ branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/RequestHandlerImpl.java 2011-05-30 17:00:07 UTC (rev 111480)
@@ -61,8 +61,7 @@
/**
* Implement RequestHandler with mapping of snmp get/set requests
- * to JMX mbean attribute gets/sets. Currently only v1 / v2 PDUs are supported by the
- * agent service.
+ * to JMX mbean attribute gets/sets. Supports up to v3 of the SNMP spec.
*
* @author <a href="mailto:hwr at pilhuhn.de>">Heiko W. Rupp</a>
* @author <a href="mailto:dimitris at jboss.org">Dimitris Andreadis</a>
Modified: branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/config/attribute/MIBGenerator.java
===================================================================
--- branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/config/attribute/MIBGenerator.java 2011-05-30 14:20:09 UTC (rev 111479)
+++ branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/config/attribute/MIBGenerator.java 2011-05-30 17:00:07 UTC (rev 111480)
@@ -34,7 +34,7 @@
public class MIBGenerator {
String mibResName; // the name of the output MIB file
- ArrayList<MappedAttribute>(1) maList; // a list of all mapped attributes algamated from all attributes.xml
+ ArrayList<MappedAttribute>(10) maList; // a list of all mapped attributes algamated from all attributes.xml
//mutators
Deleted: branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/config/attribute/ManagedRow.java
===================================================================
--- branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/config/attribute/ManagedRow.java 2011-05-30 14:20:09 UTC (rev 111479)
+++ branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/config/attribute/ManagedRow.java 2011-05-30 17:00:07 UTC (rev 111480)
@@ -1,77 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jmx.adaptor.snmp.config.attribute;
-
-/**
- * This class denotes a Row contained in a table. This object has a list of associated "Instances" of data.
- * Essentially it is just a conceptual grouping of attributes.
- * This functionality can simplify retrieving certain attributes and organization of the MIB.
- * The name can be arbitrary. It is simply a label used for organization.
- *
- * Rows are never writable.
- *
- * @author <a href="mailto:hwr at pilhuhn.de">Heiko W. Rupp</a>
- * @version $Revision: 81038 $
- */
-public class ManagedRow
-{
- private String name;
- private String oidPrefix;
- private int size;
-
- public String getName()
- {
- return this.name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- // Table OID
- public String getPrefix()
- {
- return this.oidPrefix;
- }
-
- public void setPrefix(String oid)
- {
- this.oidPrefix = oid;
- }
-
- public int getSize(){
- return this.size;
- }
- public void setSize(int n){
- this.size = n;
- }
-
- public String toString()
- {
- StringBuffer buf = new StringBuffer();
- buf.append("[row name=").append(name);
- buf.append(", oid=").append(oidPrefix);
- buf.append("]");
- return buf.toString();
- }
-}
Deleted: branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/config/attribute/ManagedTable.java
===================================================================
--- branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/config/attribute/ManagedTable.java 2011-05-30 14:20:09 UTC (rev 111479)
+++ branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/config/attribute/ManagedTable.java 2011-05-30 17:00:07 UTC (rev 111480)
@@ -1,77 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jmx.adaptor.snmp.config.attribute;
-
-/**
- * This class denotes a Table of data.
- * Essentially it is just a conceptual grouping of attributes into a table.
- * This functionality can simplify retrieving certain attributes and organization of the MIB.
- * The name can be arbitrary. It is simply a label used for organization.
- *
- * Tables are never writable.
- *
- * @author <a href="mailto:hwr at pilhuhn.de">Heiko W. Rupp</a>
- * @version $Revision: 81038 $
- */
-public class ManagedTable
-{
- private String name;
- private String oidPrefix;
- private int size;
-
- public String getName()
- {
- return this.name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- // Table OID
- public String getPrefix()
- {
- return this.oidPrefix;
- }
-
- public void setPrefix(String oid)
- {
- this.oidPrefix = oid;
- }
-
- public int getSize(){
- return this.size;
- }
- public void setSize(int n){
- this.size = n;
- }
-
- public String toString()
- {
- StringBuffer buf = new StringBuffer();
- buf.append("[table name=").append(name);
- buf.append(", oid=").append(oidPrefix);
- buf.append("]");
- return buf.toString();
- }
-}
Modified: branches/snmp4j-int/varia/src/resources/services/snmp/deploy/attributes.mib
===================================================================
--- branches/snmp4j-int/varia/src/resources/services/snmp/deploy/attributes.mib 2011-05-30 14:20:09 UTC (rev 111479)
+++ branches/snmp4j-int/varia/src/resources/services/snmp/deploy/attributes.mib 2011-05-30 17:00:07 UTC (rev 111480)
@@ -18,55 +18,73 @@
activeThreadCount OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
+ STATUS mandatory
DESCRIPTION
"The number of active Threads in the system"
::= { system 1 } -- .1.2.3.4.1.1
+
freeMemory OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
+ STATUS mandatory
DESCRIPTION
"The free memory of the VM"
::= {system 2} -- .1.2.3.4.1.2
+
maxMemory OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
+ STATUS mandatory
DESCRIPTION
"The max memory of the VM"
::= {system 3} -- .1.2.3.4.1.3
+
threadPoolQueueSize OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
+ STATUS mandatory
DESCRIPTION
"The size of the thread pool queue"
::= {system 4 }
+
requestCount8080 OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
+ STATUS mandatory
DESCRIPTION
"Number of requests served on port 8080"
::= {system 5}
+
txCommitCount OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
+ STATUS mandatory
DESCRIPTION
"Number of commited transactions"
::= {system 6 }
+
txRollbackCount OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
+ STATUS mandatory
DESCRIPTION
"Number of transactions rolled back"
::= {system 7 }
+
txActiveCount OBJECT-TYPE
SYNTAX INTEGER
ACCESS read-only
+ STATUS mandatory
DESCRIPTION
"The number of currently active transactions"
::= {system 8 }
+
dbInUseCount OBJECT-TYPE
SYNTAX INTEGER
- ACCES read-only
+ ACCESS read-only
+ STATUS mandatory
DESCRIPTION
"The number of db connections currently in use"
::= { system 9 }
-END
\ No newline at end of file
+
+END
Modified: branches/snmp4j-int/varia/src/resources/services/snmp/deploy/managers.xml
===================================================================
--- branches/snmp4j-int/varia/src/resources/services/snmp/deploy/managers.xml 2011-05-30 14:20:09 UTC (rev 111479)
+++ branches/snmp4j-int/varia/src/resources/services/snmp/deploy/managers.xml 2011-05-30 17:00:07 UTC (rev 111480)
@@ -10,7 +10,7 @@
- the listening port
- the local binding address (optional)
- the local binding port (optional)
- - the SNMP version to use (1 or 2)
+ - the SNMP version to use (1 or 2 or 3)
More than one managers may be specified.
More information about the jboss-cvs-commits
mailing list