diff -r 020b64fc02df -r a1aa62221649 jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmThreadingMeta.java
--- a/jdk/src/jdk.snmp/share/classes/sun/management/snmp/jvmmib/JvmThreadingMeta.java	Tue Oct 21 13:56:58 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,455 +0,0 @@
-/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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 General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.management.snmp.jvmmib;
-
-//
-// Generated by mibgen version 5.0 (06/02/03) when compiling JVM-MANAGEMENT-MIB in standard metadata mode.
-//
-
-// java imports
-//
-import java.io.Serializable;
-
-// jmx imports
-//
-import javax.management.MBeanServer;
-import com.sun.jmx.snmp.SnmpCounter;
-import com.sun.jmx.snmp.SnmpCounter64;
-import com.sun.jmx.snmp.SnmpGauge;
-import com.sun.jmx.snmp.SnmpInt;
-import com.sun.jmx.snmp.SnmpUnsignedInt;
-import com.sun.jmx.snmp.SnmpIpAddress;
-import com.sun.jmx.snmp.SnmpTimeticks;
-import com.sun.jmx.snmp.SnmpOpaque;
-import com.sun.jmx.snmp.SnmpString;
-import com.sun.jmx.snmp.SnmpStringFixed;
-import com.sun.jmx.snmp.SnmpOid;
-import com.sun.jmx.snmp.SnmpNull;
-import com.sun.jmx.snmp.SnmpValue;
-import com.sun.jmx.snmp.SnmpVarBind;
-import com.sun.jmx.snmp.SnmpStatusException;
-
-// jdmk imports
-//
-import com.sun.jmx.snmp.agent.SnmpMib;
-import com.sun.jmx.snmp.agent.SnmpMibGroup;
-import com.sun.jmx.snmp.agent.SnmpStandardObjectServer;
-import com.sun.jmx.snmp.agent.SnmpStandardMetaServer;
-import com.sun.jmx.snmp.agent.SnmpMibSubRequest;
-import com.sun.jmx.snmp.agent.SnmpMibTable;
-import com.sun.jmx.snmp.EnumRowStatus;
-import com.sun.jmx.snmp.SnmpDefinitions;
-
-/**
- * The class is used for representing SNMP metadata for the "JvmThreading" group.
- * The group is defined with the following oid: 1.3.6.1.4.1.42.2.145.3.163.1.1.3.
- */
-public class JvmThreadingMeta extends SnmpMibGroup
-     implements Serializable, SnmpStandardMetaServer {
-
-    static final long serialVersionUID = 5223833578005322854L;
-    /**
-     * Constructor for the metadata associated to "JvmThreading".
-     */
-    public JvmThreadingMeta(SnmpMib myMib, SnmpStandardObjectServer objserv) {
-        objectserver = objserv;
-        try {
-            registerObject(6);
-            registerObject(5);
-            registerObject(4);
-            registerObject(3);
-            registerObject(2);
-            registerObject(1);
-            registerObject(10);
-            registerObject(7);
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e.getMessage());
-        }
-    }
-
-    /**
-     * Get the value of a scalar variable
-     */
-    public SnmpValue get(long var, Object data)
-        throws SnmpStatusException {
-        switch((int)var) {
-            case 6:
-                return new SnmpInt(node.getJvmThreadCpuTimeMonitoring());
-
-            case 5:
-                return new SnmpInt(node.getJvmThreadContentionMonitoring());
-
-            case 4:
-                return new SnmpCounter64(node.getJvmThreadTotalStartedCount());
-
-            case 3:
-                return new SnmpCounter(node.getJvmThreadPeakCount());
-
-            case 2:
-                return new SnmpGauge(node.getJvmThreadDaemonCount());
-
-            case 1:
-                return new SnmpGauge(node.getJvmThreadCount());
-
-            case 10: {
-                throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
-                }
-
-            case 7:
-                return new SnmpCounter64(node.getJvmThreadPeakCountReset());
-
-            default:
-                break;
-        }
-        throw new SnmpStatusException(SnmpStatusException.noSuchObject);
-    }
-
-    /**
-     * Set the value of a scalar variable
-     */
-    public SnmpValue set(SnmpValue x, long var, Object data)
-        throws SnmpStatusException {
-        switch((int)var) {
-            case 6:
-                if (x instanceof SnmpInt) {
-                    try  {
-                        node.setJvmThreadCpuTimeMonitoring( new EnumJvmThreadCpuTimeMonitoring (((SnmpInt)x).toInteger()));
-                    } catch(IllegalArgumentException e)  {
-                        throw new SnmpStatusException(SnmpStatusException.snmpRspWrongValue);
-                    }
-                    return new SnmpInt(node.getJvmThreadCpuTimeMonitoring());
-                } else {
-                    throw new SnmpStatusException(SnmpStatusException.snmpRspWrongType);
-                }
-
-            case 5:
-                if (x instanceof SnmpInt) {
-                    try  {
-                        node.setJvmThreadContentionMonitoring( new EnumJvmThreadContentionMonitoring (((SnmpInt)x).toInteger()));
-                    } catch(IllegalArgumentException e)  {
-                        throw new SnmpStatusException(SnmpStatusException.snmpRspWrongValue);
-                    }
-                    return new SnmpInt(node.getJvmThreadContentionMonitoring());
-                } else {
-                    throw new SnmpStatusException(SnmpStatusException.snmpRspWrongType);
-                }
-
-            case 4:
-                throw new SnmpStatusException(SnmpStatusException.snmpRspNotWritable);
-
-            case 3:
-                throw new SnmpStatusException(SnmpStatusException.snmpRspNotWritable);
-
-            case 2:
-                throw new SnmpStatusException(SnmpStatusException.snmpRspNotWritable);
-
-            case 1:
-                throw new SnmpStatusException(SnmpStatusException.snmpRspNotWritable);
-
-            case 10: {
-                throw new SnmpStatusException(SnmpStatusException.snmpRspNotWritable);
-                }
-
-            case 7:
-                if (x instanceof SnmpCounter64) {
-                    node.setJvmThreadPeakCountReset(((SnmpCounter64)x).toLong());
-                    return new SnmpCounter64(node.getJvmThreadPeakCountReset());
-                } else {
-                    throw new SnmpStatusException(SnmpStatusException.snmpRspWrongType);
-                }
-
-            default:
-                break;
-        }
-        throw new SnmpStatusException(SnmpStatusException.snmpRspNotWritable);
-    }
-
-    /**
-     * Check the value of a scalar variable
-     */
-    public void check(SnmpValue x, long var, Object data)
-        throws SnmpStatusException {
-        switch((int) var) {
-            case 6:
-                if (x instanceof SnmpInt) {
-                    try  {
-                        node.checkJvmThreadCpuTimeMonitoring( new EnumJvmThreadCpuTimeMonitoring (((SnmpInt)x).toInteger()));
-                    } catch(IllegalArgumentException e)  {
-                        throw new SnmpStatusException(SnmpStatusException.snmpRspWrongValue);
-                    }
-                } else {
-                    throw new SnmpStatusException(SnmpStatusException.snmpRspWrongType);
-                }
-                break;
-
-            case 5:
-                if (x instanceof SnmpInt) {
-                    try  {
-                        node.checkJvmThreadContentionMonitoring( new EnumJvmThreadContentionMonitoring (((SnmpInt)x).toInteger()));
-                    } catch(IllegalArgumentException e)  {
-                        throw new SnmpStatusException(SnmpStatusException.snmpRspWrongValue);
-                    }
-                } else {
-                    throw new SnmpStatusException(SnmpStatusException.snmpRspWrongType);
-                }
-                break;
-
-            case 4:
-                throw new SnmpStatusException(SnmpStatusException.snmpRspNotWritable);
-
-            case 3:
-                throw new SnmpStatusException(SnmpStatusException.snmpRspNotWritable);
-
-            case 2:
-                throw new SnmpStatusException(SnmpStatusException.snmpRspNotWritable);
-
-            case 1:
-                throw new SnmpStatusException(SnmpStatusException.snmpRspNotWritable);
-
-            case 10: {
-                throw new SnmpStatusException(SnmpStatusException.snmpRspNotWritable);
-                }
-
-            case 7:
-                if (x instanceof SnmpCounter64) {
-                    node.checkJvmThreadPeakCountReset(((SnmpCounter64)x).toLong());
-                } else {
-                    throw new SnmpStatusException(SnmpStatusException.snmpRspWrongType);
-                }
-                break;
-
-            default:
-                throw new SnmpStatusException(SnmpStatusException.snmpRspNotWritable);
-        }
-    }
-
-    /**
-     * Allow to bind the metadata description to a specific object.
-     */
-    protected void setInstance(JvmThreadingMBean var) {
-        node = var;
-    }
-
-
-    // ------------------------------------------------------------
-    //
-    // Implements the "get" method defined in "SnmpMibGroup".
-    // See the "SnmpMibGroup" Javadoc API for more details.
-    //
-    // ------------------------------------------------------------
-
-    public void get(SnmpMibSubRequest req, int depth)
-        throws SnmpStatusException {
-        objectserver.get(this,req,depth);
-    }
-
-
-    // ------------------------------------------------------------
-    //
-    // Implements the "set" method defined in "SnmpMibGroup".
-    // See the "SnmpMibGroup" Javadoc API for more details.
-    //
-    // ------------------------------------------------------------
-
-    public void set(SnmpMibSubRequest req, int depth)
-        throws SnmpStatusException {
-        objectserver.set(this,req,depth);
-    }
-
-
-    // ------------------------------------------------------------
-    //
-    // Implements the "check" method defined in "SnmpMibGroup".
-    // See the "SnmpMibGroup" Javadoc API for more details.
-    //
-    // ------------------------------------------------------------
-
-    public void check(SnmpMibSubRequest req, int depth)
-        throws SnmpStatusException {
-        objectserver.check(this,req,depth);
-    }
-
-    /**
-     * Returns true if "arc" identifies a scalar object.
-     */
-    public boolean isVariable(long arc) {
-
-        switch((int)arc) {
-            case 6:
-            case 5:
-            case 4:
-            case 3:
-            case 2:
-            case 1:
-            case 7:
-                return true;
-            default:
-                break;
-        }
-        return false;
-    }
-
-    /**
-     * Returns true if "arc" identifies a readable scalar object.
-     */
-    public boolean isReadable(long arc) {
-
-        switch((int)arc) {
-            case 6:
-            case 5:
-            case 4:
-            case 3:
-            case 2:
-            case 1:
-            case 7:
-                return true;
-            default:
-                break;
-        }
-        return false;
-    }
-
-
-    // ------------------------------------------------------------
-    //
-    // Implements the "skipVariable" method defined in "SnmpMibGroup".
-    // See the "SnmpMibGroup" Javadoc API for more details.
-    //
-    // ------------------------------------------------------------
-
-    public boolean  skipVariable(long var, Object data, int pduVersion) {
-        switch((int)var) {
-            case 4:
-            case 7:
-                if (pduVersion==SnmpDefinitions.snmpVersionOne) return true;
-                break;
-            default:
-                break;
-        }
-        return super.skipVariable(var,data,pduVersion);
-    }
-
-    /**
-     * Return the name of the attribute corresponding to the SNMP variable identified by "id".
-     */
-    public String getAttributeName(long id)
-        throws SnmpStatusException {
-        switch((int)id) {
-            case 6:
-                return "JvmThreadCpuTimeMonitoring";
-
-            case 5:
-                return "JvmThreadContentionMonitoring";
-
-            case 4:
-                return "JvmThreadTotalStartedCount";
-
-            case 3:
-                return "JvmThreadPeakCount";
-
-            case 2:
-                return "JvmThreadDaemonCount";
-
-            case 1:
-                return "JvmThreadCount";
-
-            case 10: {
-                throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
-                }
-
-            case 7:
-                return "JvmThreadPeakCountReset";
-
-            default:
-                break;
-        }
-        throw new SnmpStatusException(SnmpStatusException.noSuchObject);
-    }
-
-    /**
-     * Returns true if "arc" identifies a table object.
-     */
-    public boolean isTable(long arc) {
-
-        switch((int)arc) {
-            case 10:
-                return true;
-            default:
-                break;
-        }
-        return false;
-    }
-
-    /**
-     * Returns the table object identified by "arc".
-     */
-    public SnmpMibTable getTable(long arc) {
-
-        switch((int)arc) {
-            case 10:
-                return tableJvmThreadInstanceTable;
-        default:
-            break;
-        }
-        return null;
-    }
-
-    /**
-     * Register the group's SnmpMibTable objects with the meta-data.
-     */
-    public void registerTableNodes(SnmpMib mib, MBeanServer server) {
-        tableJvmThreadInstanceTable = createJvmThreadInstanceTableMetaNode("JvmThreadInstanceTable", "JvmThreading", mib, server);
-        if ( tableJvmThreadInstanceTable != null)  {
-            tableJvmThreadInstanceTable.registerEntryNode(mib,server);
-            mib.registerTableMeta("JvmThreadInstanceTable", tableJvmThreadInstanceTable);
-        }
-
-    }
-
-
-    /**
-     * Factory method for "JvmThreadInstanceTable" table metadata class.
-     *
-     * You can redefine this method if you need to replace the default
-     * generated metadata class with your own customized class.
-     *
-     * @param tableName Name of the table object ("JvmThreadInstanceTable")
-     * @param groupName Name of the group to which this table belong ("JvmThreading")
-     * @param mib The SnmpMib object in which this table is registered
-     * @param server MBeanServer for this table entries (may be null)
-     *
-     * @return An instance of the metadata class generated for the
-     *         "JvmThreadInstanceTable" table (JvmThreadInstanceTableMeta)
-     *
-     **/
-    protected JvmThreadInstanceTableMeta createJvmThreadInstanceTableMetaNode(String tableName, String groupName, SnmpMib mib, MBeanServer server)  {
-        return new JvmThreadInstanceTableMeta(mib, objectserver);
-    }
-
-    protected JvmThreadingMBean node;
-    protected SnmpStandardObjectServer objectserver = null;
-    protected JvmThreadInstanceTableMeta tableJvmThreadInstanceTable = null;
-}