[jboss-cvs] JBossAS SVN: r111543 - branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 7 15:13:51 EDT 2011
Author: thauser at redhat.com
Date: 2011-06-07 15:13:51 -0400 (Tue, 07 Jun 2011)
New Revision: 111543
Modified:
branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/RequestHandler.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/agent/RequestHandlerSupport.java
branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/SnmpAgentService.java
branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/SnmpAgentServiceMBean.java
Log:
reverting boneheaded change (required MibResName LOL)
Modified: branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/RequestHandler.java
===================================================================
--- branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/RequestHandler.java 2011-06-07 17:08:32 UTC (rev 111542)
+++ branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/RequestHandler.java 2011-06-07 19:13:51 UTC (rev 111543)
@@ -45,7 +45,7 @@
* @param uptime the snmp agent uptime
* @throws Exception in case of initialization problem
*/
- public void initialize(String resourceName, MBeanServer server, Logger loggger, Clock uptime, String mibResName)
+ public void initialize(String resourceName, MBeanServer server, Logger loggger, Clock uptime)
throws Exception;
} // RequestHandler
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-06-07 17:08:32 UTC (rev 111542)
+++ branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/RequestHandlerImpl.java 2011-06-07 19:13:51 UTC (rev 111543)
@@ -40,7 +40,6 @@
import org.jboss.jmx.adaptor.snmp.config.attribute.AttributeMappings;
import org.jboss.jmx.adaptor.snmp.config.attribute.ManagedBean;
import org.jboss.jmx.adaptor.snmp.config.attribute.MappedAttribute;
-import org.jboss.jmx.adaptor.snmp.config.attribute.MIBGenerator;
import org.jboss.logging.Logger;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.Unmarshaller;
@@ -90,11 +89,6 @@
/** Has this RequestHandler instance been initialized? */
private boolean initialized = false;
-
- /** MIB Generator file name **/
- private String mibResName = null;
-
- private MIBGenerator mibGenerator = null;
// Constructors --------------------------------------------------
@@ -119,12 +113,11 @@
* @param log The logger we use
* @param uptime The uptime of the snmp-agent subsystem.
*/
- public void initialize(String resourceName, MBeanServer server, Logger log, Clock uptime, String mibResName)
+ public void initialize(String resourceName, MBeanServer server, Logger log, Clock uptime)
throws Exception
{
log.debug("initialize() with res=" + resourceName);
- this.mibResName = mibResName;
- super.initialize(resourceName, server, log, uptime, mibResName);
+ super.initialize(resourceName, server, log, uptime);
if (resourceName != null)
initializeBindings();
else
@@ -599,9 +592,6 @@
{
log.debug("Reading resource: '" + resourceName + "'");
- // arraylists for the MIB Generator, to query things like description and type
- ArrayList<MappedAttribute> maList = new ArrayList<MappedAttribute>();
-
ObjectModelFactory omf = new AttributeMappingsBinding();
InputStream is = null;
AttributeMappings mappings = null;
@@ -645,7 +635,6 @@
ManagedBean mmb = (ManagedBean)it.next();
String oidPrefix = mmb.getOidPrefix();
List attrs = mmb.getAttributes();
- //we need this info for the MIB Generator
Iterator aIt = attrs.iterator();
while (aIt.hasNext())
@@ -663,31 +652,14 @@
else{
oid = ma.getOid();
OID objectOID = new OID(oid);
- //ma.setOidPrefix(objectOID.trim());
+ ma.setOidPrefix(objectOID.trim().toString());
addObjectEntry(objectOID.trim());
}
- // for the MIB Generator
- ma.setMbean(mmb.getName());
- maList.add(ma);
addBindEntry(oid, mmb.getName(), ma.getName(),ma.isReadWrite());
}
}
- //last step, to be indicated in choice somewhere.
- //if (genMib) -- check to be added; don't want to always gen the MIB
- generateMib(mibResName, maList, mappings, server);
-
}
- /** This method starts the MIB generation process
- * @param String name of the MIB File to generate
- * @param ArrayList<MBeanAttributeInfo[]> information about the attributes gathered during initialization
- * @param ArrayList<MappedAttribute> information about the attributes in the .xml, namely the desired OID value and r/w perms
- */
- private void generateMib(String mibResName, ArrayList<MappedAttribute> maList, AttributeMappings attrList, MBeanServer server){
- this.mibGenerator = new MIBGenerator(mibResName, maList, attrList, server);
- mibGenerator.writeFile();
- }
-
/** This method adds a new ObjectEntry to the set of Object OIDs.
* @param String representation of the OID to add.
*
Modified: branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/RequestHandlerSupport.java
===================================================================
--- branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/RequestHandlerSupport.java 2011-06-07 17:08:32 UTC (rev 111542)
+++ branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/RequestHandlerSupport.java 2011-06-07 19:13:51 UTC (rev 111543)
@@ -70,7 +70,7 @@
/**
* Initialize
*/
- public void initialize(String resourceName, MBeanServer server, Logger log, Clock uptime, String mibResName)
+ public void initialize(String resourceName, MBeanServer server, Logger log, Clock uptime)
throws Exception
{
this.resourceName = resourceName;
Modified: branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/SnmpAgentService.java
===================================================================
--- branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/SnmpAgentService.java 2011-06-07 17:08:32 UTC (rev 111542)
+++ branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/SnmpAgentService.java 2011-06-07 19:13:51 UTC (rev 111543)
@@ -100,9 +100,6 @@
/** Name of resource file containing get/set mappings */
private String requestHandlerResName = null;
- /** Name of MIB output file name */
- private String mibResName = null;
-
/** Name of the trap factory class to be utilised */
private String trapFactoryClassName = null;
@@ -628,7 +625,7 @@
this.requestHandler.initialize(this.requestHandlerResName,
this.getServer(),
this.log,
- this.clock, this.mibResName);
+ this.clock);
}
private void initTransportMapping(){
@@ -732,21 +729,6 @@
/**
* @param usersResName the usersResName to set
*/
- public void setMibResName(String mibResName) {
- this.mibResName = mibResName;
- }
-
- /**
- * @return the usersResName
- */
- public String getMibResName() {
- return mibResName;
- }
-
-
- /**
- * @param usersResName the usersResName to set
- */
public void setUsersResName(String usersResName) {
this.usersResName = usersResName;
}
Modified: branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/SnmpAgentServiceMBean.java
===================================================================
--- branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/SnmpAgentServiceMBean.java 2011-06-07 17:08:32 UTC (rev 111542)
+++ branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/SnmpAgentServiceMBean.java 2011-06-07 19:13:51 UTC (rev 111543)
@@ -48,10 +48,6 @@
/** The name of the file containing SNMPv3 users */
void setUsersResName(String usersResName);
String getUsersResName();
-
- /** The name of the file containing the MIB Output file name */
- void setMibResName(String mibResName);
- String getMibResName();
/** The name of the file containing the notification/trap mappings */
void setNotificationMapResName(String notificationMapResName);
More information about the jboss-cvs-commits
mailing list