[jboss-cvs] JBossAS SVN: r111608 - in branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp: trapd and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: thauser at redhat.com
Date: 2011-06-13 17:05:48 -0400 (Mon, 13 Jun 2011)
New Revision: 111608

Modified:
   branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/test/NotificationProducerService.java
   branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/trapd/TrapdService.java
Log:
refactoring

Modified: branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/test/NotificationProducerService.java
===================================================================
--- branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/test/NotificationProducerService.java	2011-06-13 21:05:28 UTC (rev 111607)
+++ branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/test/NotificationProducerService.java	2011-06-13 21:05:48 UTC (rev 111608)
@@ -60,6 +60,11 @@
    implements NotificationProducerServiceMBean
 {
 
+	/** Notification types for testing */ 
+	   public final String V1_TEST_NOTIFICATION = "jboss.snmp.agent.v1test";
+	   public final String V2_TEST_NOTIFICATION = "jboss.snmp.agent.v2test";
+	   public final String V3_TEST_NOTIFICATION = "jboss.snmp.agent.v3test";
+	   
    /**
     * Sends a test Notification of type "V1"
     *
@@ -71,7 +76,7 @@
 	   log.debug("Sending SnmpV1 test notification");
 	   
 	   sendNotification(
-         new Notification(EventTypes.V1_TEST_NOTIFICATION, this, getNextNotificationSequenceNumber(),
+         new Notification(V1_TEST_NOTIFICATION, this, getNextNotificationSequenceNumber(),
                           "V1 test notifications")); 
    }
 
@@ -85,7 +90,7 @@
    {
 	   log.debug("Sending SnmpV2 test notification");
 	   sendNotification(
-         new Notification(EventTypes.V2_TEST_NOTIFICATION, this, getNextNotificationSequenceNumber(),
+         new Notification(V2_TEST_NOTIFICATION, this, getNextNotificationSequenceNumber(),
                           "V2 test notifications"));        
    }
    
@@ -99,7 +104,7 @@
    {
 	   log.debug("Sending SnmpV3 test notification");
 	   sendNotification(
-         new Notification(EventTypes.V3_TEST_NOTIFICATION, this, getNextNotificationSequenceNumber(),
+         new Notification(V3_TEST_NOTIFICATION, this, getNextNotificationSequenceNumber(),
                           "V3 test notifications"));        
    }
    

Modified: branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/trapd/TrapdService.java
===================================================================
--- branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/trapd/TrapdService.java	2011-06-13 21:05:28 UTC (rev 111607)
+++ branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/trapd/TrapdService.java	2011-06-13 21:05:48 UTC (rev 111608)
@@ -27,10 +27,6 @@
 import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
 import org.jboss.system.ServiceMBeanSupport;
 
-//import org.opennms.protocols.snmp.SnmpPduRequest;
-//import org.opennms.protocols.snmp.SnmpTrapSession;
-//import org.opennms.protocols.snmp.SnmpVarBind;
-
 import org.snmp4j.CommandResponder;
 import org.snmp4j.CommandResponderEvent;
 import org.snmp4j.MessageDispatcher;