[jboss-cvs] JBossAS SVN: r110454 - in branches/snmp4j-int: component-matrix and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 26 12:03:06 EST 2011
Author: thauser at redhat.com
Date: 2011-01-26 12:03:05 -0500 (Wed, 26 Jan 2011)
New Revision: 110454
Modified:
branches/snmp4j-int/build/build.xml
branches/snmp4j-int/component-matrix/pom.xml
branches/snmp4j-int/varia/pom.xml
branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/control/AttrResultInfo.java
branches/snmp4j-int/varia/src/resources/services/snmp/deploy/attributes.xml
branches/snmp4j-int/varia/src/resources/services/snmp/deploy/managers.xml
branches/snmp4j-int/varia/src/resources/services/snmp/deploy/notifications.xml
Log:
Rebasing work from snmp4j-integration-1.11.1 branch
Modified: branches/snmp4j-int/build/build.xml
===================================================================
--- branches/snmp4j-int/build/build.xml 2011-01-26 16:51:25 UTC (rev 110453)
+++ branches/snmp4j-int/build/build.xml 2011-01-26 17:03:05 UTC (rev 110454)
@@ -2178,6 +2178,7 @@
<fileset refid="org.jboss.mc-int:jboss-mc-int-servlet:jar"/>
<fileset refid="org.beanshell:bsh:jar"/>
<fileset refid="joesnmp:joesnmp:jar"/>
+ <fileset refid="org.snmp4j:snmp4j:jar"/>
<fileset refid="wutka-dtdparser:dtdparser:jar"/>
<fileset refid="apache-bsf:bsf:jar"/>
<fileset refid="org.jboss.spec.javax.el:jboss-el-api_2.2_spec:jar"/>
Modified: branches/snmp4j-int/component-matrix/pom.xml
===================================================================
--- branches/snmp4j-int/component-matrix/pom.xml 2011-01-26 16:51:25 UTC (rev 110453)
+++ branches/snmp4j-int/component-matrix/pom.xml 2011-01-26 17:03:05 UTC (rev 110454)
@@ -157,6 +157,7 @@
<version.weld.api>1.1.Beta2</version.weld.api>
<version.xdoclet>1.2.3</version.xdoclet>
<version.xmlschema>1.4.5</version.xmlschema>
+ <version.org.snmp4j>1.11.1</version.org.snmp4j>
</properties>
<!-- Build Configuration -->
@@ -1634,6 +1635,12 @@
<artifactId>joesnmp</artifactId>
<version>0.3.4</version>
</dependency>
+
+ <dependency>
+ <groupId>org.snmp4j</groupId>
+ <artifactId>snmp4j</artifactId>
+ <version>1.11.1</version>
+ </dependency>
<dependency>
<groupId>juddi</groupId>
Modified: branches/snmp4j-int/varia/pom.xml
===================================================================
--- branches/snmp4j-int/varia/pom.xml 2011-01-26 16:51:25 UTC (rev 110453)
+++ branches/snmp4j-int/varia/pom.xml 2011-01-26 17:03:05 UTC (rev 110454)
@@ -241,6 +241,11 @@
<groupId>joesnmp</groupId>
<artifactId>joesnmp</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.snmp4j</groupId>
+ <artifactId>snmp4j</artifactId>
+ </dependency>
<dependency>
<groupId>javax.mail</groupId>
Modified: branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/control/AttrResultInfo.java
===================================================================
--- branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/control/AttrResultInfo.java 2011-01-26 16:51:25 UTC (rev 110453)
+++ branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/control/AttrResultInfo.java 2011-01-26 17:03:05 UTC (rev 110454)
@@ -22,6 +22,7 @@
package org.jboss.jmx.adaptor.control;
import java.beans.PropertyEditor;
+import org.snmp4j.smi.TimeTicks;
/** A simple tuple of an mbean operation name, sigature and result.
@@ -60,6 +61,9 @@
}
else
{
+ if(result instanceof TimeTicks){
+ return ((TimeTicks)result).toString("{0} d {1} h {2} m {3} s {4} hs");
+ }
return result.toString();
}
}
Modified: branches/snmp4j-int/varia/src/resources/services/snmp/deploy/attributes.xml
===================================================================
--- branches/snmp4j-int/varia/src/resources/services/snmp/deploy/attributes.xml 2011-01-26 16:51:25 UTC (rev 110453)
+++ branches/snmp4j-int/varia/src/resources/services/snmp/deploy/attributes.xml 2011-01-26 17:03:05 UTC (rev 110454)
@@ -24,11 +24,12 @@
</mbean>
<!-- Tx Manager statistics -->
- <mbean name="jboss:service=TransactionManager">
+ <!-- these attributes no longer exist in the AS -->
+ <!-- <mbean name="jboss:service=TransactionManager">
<attribute name="CommitCount" oid=".1.2.3.4.1.6"/>
<attribute name="RollbackCount" oid=".1.2.3.4.1.7"/>
<attribute name="TransactionCount" oid=".1.2.3.4.1.8"/>
- </mbean>
+ </mbean>-->
<!-- DefaultDS statistics -->
<mbean name="jboss.jca:name=DefaultDS,service=ManagedConnectionPool" oid-prefix=".1.2.3.4.1">
Modified: branches/snmp4j-int/varia/src/resources/services/snmp/deploy/managers.xml
===================================================================
--- branches/snmp4j-int/varia/src/resources/services/snmp/deploy/managers.xml 2011-01-26 16:51:25 UTC (rev 110453)
+++ branches/snmp4j-int/varia/src/resources/services/snmp/deploy/managers.xml 2011-01-26 17:03:05 UTC (rev 110454)
@@ -32,5 +32,6 @@
<local-address></local-address>
<local-port></local-port>
<version>1</version>
+ <community-string>public</community-string>
</manager>
</manager-list>
Modified: branches/snmp4j-int/varia/src/resources/services/snmp/deploy/notifications.xml
===================================================================
--- branches/snmp4j-int/varia/src/resources/services/snmp/deploy/notifications.xml 2011-01-26 16:51:25 UTC (rev 110453)
+++ branches/snmp4j-int/varia/src/resources/services/snmp/deploy/notifications.xml 2011-01-26 17:03:05 UTC (rev 110454)
@@ -64,4 +64,57 @@
</var-bind-list>
</mapping>
+<!-- Used for internal testing -ignore -->
+ <mapping>
+ <notification-type>jboss.snmp.agent.v1test</notification-type>
+ <generic>10</generic>
+ <specific>0</specific>
+ <enterprise>1.2.3.4.5.6.7</enterprise>
+ <var-bind-list wrapper-class="org.jboss.jmx.adaptor.snmp.agent.NotificationWrapperSupport">
+ <var-bind>
+ <tag>a:startTime</tag>
+ <oid>1.2.3.4.5.6.7.9</oid>
+ </var-bind>
+ <var-bind>
+ <tag>a:trapCount</tag>
+ <oid>1.2.3.4.5.6.7.6</oid>
+ </var-bind>
+ </var-bind-list>
+ </mapping>
+
+ <mapping>
+ <notification-type>jboss.snmp.agent.v2test</notification-type>
+ <generic>11</generic>
+ <specific>0</specific>
+ <enterprise>1.2.3.4.5.6.7</enterprise>
+ <var-bind-list wrapper-class="org.jboss.jmx.adaptor.snmp.agent.NotificationWrapperSupport">
+ <var-bind>
+ <tag>a:startTime</tag>
+ <oid>1.2.3.4.5.6.7.9</oid>
+ </var-bind>
+ <var-bind>
+ <tag>a:trapCount</tag>
+ <oid>1.2.3.4.5.6.7.6</oid>
+ </var-bind>
+ </var-bind-list>
+ </mapping>
+
+ <mapping>
+ <notification-type>jboss.snmp.agent.v3test</notification-type>
+ <generic>12</generic>
+ <specific>0</specific>
+ <enterprise>1.2.3.4.5.6.7</enterprise>
+ <var-bind-list wrapper-class="org.jboss.jmx.adaptor.snmp.agent.NotificationWrapperSupport">
+ <var-bind>
+ <tag>a:startTime</tag>
+ <oid>1.2.3.4.5.6.7.9</oid>
+ </var-bind>
+ <var-bind>
+ <tag>a:trapCount</tag>
+ <oid>1.2.3.4.5.6.7.6</oid>
+ </var-bind>
+ </var-bind-list>
+ </mapping>
+
+
</notification-map-list>
More information about the jboss-cvs-commits
mailing list