--- a/src/jdk.snmp/share/classes/com/sun/jmx/snmp/BerDecoder.java	Tue Oct 21 13:56:58 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,757 +0,0 @@
-/*
- * Copyright (c) 1997, 2007, 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 com.sun.jmx.snmp;
-
-
-
-
-/**
- * The <CODE>BerDecoder</CODE> class is used for decoding
- * BER-encoded data.
- *
- * A <CODE>BerDecoder</CODE> needs to be set up with the byte string containing
- * the encoding. It maintains a current position in the byte string.
- *
- * Methods allows to fetch integer, string, OID, etc., from the current
- * position. After a fetch the current position is moved forward.
- *
- * A fetch throws a <CODE>BerException</CODE> if the encoding is not of the
- * expected type.
- *
- * <p><b>This API is a Sun Microsystems internal API  and is subject
- * to change without notice.</b></p>
- *
- * @since 1.5
- */
-
-public class BerDecoder {
-
-  /**
-  * Constructs a new decoder and attaches it to the specified byte string.
-  *
-  * @param b The byte string containing the encoded data.
-  */
-
-  public BerDecoder(byte b[]) {
-    bytes = b ;
-    reset() ;
-  }
-
-  public void reset() {
-    next = 0 ;
-    stackTop = 0 ;
-  }
-
-  /**
-  * Fetch an integer.
-  *
-  * @return The decoded integer.
-  *
-  * @exception BerException Current position does not point to an integer.
-  */
-
-  public int fetchInteger() throws BerException {
-    return fetchInteger(IntegerTag) ;
-  }
-
-
-  /**
-  * Fetch an integer with the specified tag.
-  *
-  * @param tag The expected tag.
-  *
-  * @return The decoded integer.
-  *
-  * @exception BerException Current position does not point to an integer
-  *                         or the tag is not the expected one.
-  */
-
-  public int fetchInteger(int tag) throws BerException {
-    int result = 0 ;
-    final int backup = next ;
-    try {
-      if (fetchTag() != tag) {
-        throw new BerException() ;
-      }
-      result = fetchIntegerValue() ;
-    }
-    catch(BerException e) {
-      next = backup ;
-      throw e ;
-    }
-
-    return result ;
-  }
-
-
-
-  /**
-  * Fetch an integer and return a long value.
-  *
-  * @return The decoded integer.
-  *
-  * @exception BerException Current position does not point to an integer.
-  */
-
-  public long fetchIntegerAsLong() throws BerException {
-    return fetchIntegerAsLong(IntegerTag) ;
-  }
-
-
-  /**
-  * Fetch an integer with the specified tag and return a long value.
-  *
-  * @param tag The expected tag.
-  *
-  * @return The decoded integer.
-  *
-  * @exception BerException Current position does not point to an integer
-  *                         or the tag is not the expected one.
-  */
-
-  public long fetchIntegerAsLong(int tag) throws BerException {
-    long result = 0 ;
-    final int backup = next ;
-    try {
-      if (fetchTag() != tag) {
-        throw new BerException() ;
-      }
-      result = fetchIntegerValueAsLong() ;
-    }
-    catch(BerException e) {
-      next = backup ;
-      throw e ;
-    }
-
-    return result ;
-  }
-
-
-
-  /**
-  * Fetch an octet string.
-  *
-  * @return The decoded string.
-  *
-  * @exception BerException Current position does not point to an octet string.
-  */
-
-  public byte[] fetchOctetString() throws BerException {
-    return fetchOctetString(OctetStringTag) ;
-  }
-
-
-  /**
-  * Fetch an octet string with a specified tag.
-  *
-  * @param tag The expected tag.
-  *
-  * @return The decoded string.
-  *
-  * @exception BerException Current position does not point to an octet string
-  *                         or the tag is not the expected one.
-  */
-
-  public byte[] fetchOctetString(int tag) throws BerException {
-    byte[] result = null ;
-    final int backup = next ;
-    try {
-      if (fetchTag() != tag) {
-        throw new BerException() ;
-      }
-      result = fetchStringValue() ;
-    }
-    catch(BerException e) {
-      next = backup ;
-      throw e ;
-    }
-
-    return result ;
-  }
-
-
-  /**
-  * Fetch an object identifier.
-  *
-  * @return The decoded object identifier as an array of long.
-  */
-
-  public long[] fetchOid() throws BerException {
-    return fetchOid(OidTag) ;
-  }
-
-
-  /**
-  * Fetch an object identifier with a specified tag.
-  *
-  * @param tag The expected tag.
-  *
-  * @return The decoded object identifier as an array of long.
-  *
-  * @exception BerException Current position does not point to an oid
-  *                         or the tag is not the expected one.
-  */
-
-  public long[] fetchOid(int tag) throws BerException {
-    long[] result = null ;
-    final int backup = next ;
-    try {
-      if (fetchTag() != tag) {
-        throw new BerException() ;
-      }
-      result = fetchOidValue() ;
-    }
-    catch(BerException e) {
-      next = backup ;
-      throw e ;
-    }
-
-    return result ;
-  }
-
-
-  /**
-  * Fetch a <CODE>NULL</CODE> value.
-  *
-  * @exception BerException Current position does not point to <CODE>NULL</CODE> value.
-  */
-
-  public void fetchNull() throws BerException {
-    fetchNull(NullTag) ;
-  }
-
-
-  /**
-  * Fetch a <CODE>NULL</CODE> value with a specified tag.
-  *
-  * @param tag The expected tag.
-  *
-  * @exception BerException Current position does not point to
-  *            <CODE>NULL</CODE> value or the tag is not the expected one.
-  */
-
-  public void fetchNull(int tag) throws BerException {
-    final int backup = next ;
-    try {
-      if (fetchTag() != tag) {
-        throw new BerException() ;
-      }
-      final int length = fetchLength();
-      if (length != 0) throw new BerException();
-    }
-    catch(BerException e) {
-      next = backup ;
-      throw e ;
-    }
-  }
-
-
-
-  /**
-  * Fetch an <CODE>ANY</CODE> value. In fact, this method does not decode anything
-  * it simply returns the next TLV as an array of bytes.
-  *
-  * @return The TLV as a byte array.
-  *
-  * @exception BerException The next TLV is really badly encoded...
-  */
-
-  public byte[] fetchAny() throws BerException {
-    byte[] result = null ;
-    final int backup = next ;
-    try {
-      final int tag = fetchTag() ;
-      final int contentLength = fetchLength() ;
-      if (contentLength < 0) throw new BerException() ;
-      final int tlvLength = next + contentLength - backup ;
-      if (contentLength > (bytes.length - next))
-          throw new IndexOutOfBoundsException("Decoded length exceeds buffer");
-      final byte[] data = new byte[tlvLength] ;
-      java.lang.System.arraycopy(bytes,backup,data,0,tlvLength);
-      // for (int i = 0 ; i < tlvLength ; i++) {
-      //  data[i] = bytes[backup + i] ;
-      // }
-      next = next + contentLength ;
-      result = data;
-    }
-    catch(IndexOutOfBoundsException e) {
-      next = backup ;
-      throw new BerException() ;
-    }
-    // catch(Error e) {
-    //    debug("fetchAny: Error decoding BER: " + e);
-    //    throw e;
-    // }
-
-    return result ;
-  }
-
-
-  /**
-  * Fetch an <CODE>ANY</CODE> value with a specific tag.
-  *
-  * @param tag The expected tag.
-  *
-  * @return The TLV as a byte array.
-  *
-  * @exception BerException The next TLV is really badly encoded...
-  */
-
-  public byte[] fetchAny(int tag) throws BerException {
-    if (getTag() != tag) {
-      throw new BerException() ;
-    }
-    return fetchAny() ;
-  }
-
-
-
-  /**
-  * Fetch a sequence header.
-  * The decoder computes the end position of the sequence and push it
-  * on its stack.
-  *
-  * @exception BerException Current position does not point to a sequence header.
-  */
-
-  public void openSequence() throws BerException {
-    openSequence(SequenceTag) ;
-  }
-
-
-  /**
-  * Fetch a sequence header with a specific tag.
-  *
-  * @param tag The expected tag.
-  *
-  * @exception BerException Current position does not point to a sequence header
-  *                         or the tag is not the expected one.
-  */
-
-  public void openSequence(int tag) throws BerException {
-    final int backup = next ;
-    try {
-      if (fetchTag() != tag) {
-        throw new BerException() ;
-      }
-      final int l = fetchLength() ;
-      if (l < 0) throw new BerException();
-      if (l > (bytes.length - next)) throw new BerException();
-      stackBuf[stackTop++] = next + l ;
-    }
-    catch(BerException e) {
-      next = backup ;
-      throw e ;
-    }
-  }
-
-
-  /**
-  * Close a sequence.
-  * The decode pull the stack and verifies that the current position
-  * matches with the calculated end of the sequence. If not it throws
-  * an exception.
-  *
-  * @exception BerException The sequence is not expected to finish here.
-  */
-
-  public void closeSequence() throws BerException {
-    if (stackBuf[stackTop - 1] == next) {
-      stackTop-- ;
-    }
-    else {
-      throw new BerException() ;
-    }
-  }
-
-
-  /**
-  * Return <CODE>true</CODE> if the end of the current sequence is not reached.
-  * When this method returns <CODE>false</CODE>, <CODE>closeSequence</CODE> can (and must) be
-  * invoked.
-  *
-  * @return <CODE>true</CODE> if there is still some data in the sequence.
-  */
-
-  public boolean cannotCloseSequence() {
-    return (next < stackBuf[stackTop - 1]) ;
-  }
-
-
-  /**
-  * Get the tag of the data at the current position.
-  * Current position is unchanged.
-  *
-  * @return The next tag.
-  */
-
-  public int getTag() throws BerException {
-    int result = 0 ;
-    final int backup = next ;
-    try {
-      result = fetchTag() ;
-    }
-    finally {
-      next = backup ;
-    }
-
-    return result ;
-  }
-
-
-
-  public String toString() {
-    final StringBuffer result = new StringBuffer(bytes.length * 2) ;
-    for (int i = 0 ; i < bytes.length ; i++) {
-      final int b = (bytes[i] > 0) ? bytes[i] : bytes[i] + 256 ;
-      if (i == next) {
-        result.append("(") ;
-      }
-      result.append(Character.forDigit(b / 16, 16)) ;
-      result.append(Character.forDigit(b % 16, 16)) ;
-      if (i == next) {
-        result.append(")") ;
-      }
-    }
-    if (bytes.length == next) {
-      result.append("()") ;
-    }
-
-    return new String(result) ;
-  }
-
-
-  //
-  // Some standard tags
-  //
-  public final static int BooleanTag      = 1 ;
-  public final static int IntegerTag      = 2 ;
-  public final static int OctetStringTag  = 4 ;
-  public final static int NullTag          = 5 ;
-  public final static int OidTag          = 6 ;
-  public final static int SequenceTag      = 0x30 ;
-
-
-
-
-  ////////////////////////// PRIVATE ///////////////////////////////
-
-
-
-  /**
-  * Fetch a tag and move the current position forward.
-  *
-  * @return The tag
-  */
-
-  private final int fetchTag() throws BerException {
-    int result = 0 ;
-    final int backup = next ;
-
-    try {
-      final byte b0 = bytes[next++] ;
-      result = (b0 >= 0) ? b0 : b0 + 256 ;
-      if ((result & 31) == 31) {
-        while ((bytes[next] & 128) != 0) {
-          result = result << 7 ;
-          result = result | (bytes[next++] & 127);
-        }
-      }
-    }
-    catch(IndexOutOfBoundsException e) {
-      next = backup ;
-      throw new BerException() ;
-    }
-
-    return result ;
-  }
-
-
-  /**
-  * Fetch a length and move the current position forward.
-  *
-  * @return The length
-  */
-
-  private final int fetchLength() throws BerException {
-    int result = 0 ;
-    final int backup = next ;
-
-    try {
-      final byte b0 = bytes[next++] ;
-      if (b0 >= 0) {
-        result = b0 ;
-      }
-      else {
-        for (int c = 128 + b0 ; c > 0 ; c--) {
-          final byte bX = bytes[next++] ;
-          result = result << 8 ;
-          result = result | ((bX >= 0) ? bX : bX+256) ;
-        }
-      }
-    }
-    catch(IndexOutOfBoundsException e) {
-      next = backup ;
-      throw new BerException() ;
-    }
-
-    return result ;
-  }
-
-
-  /**
-  * Fetch an integer value and move the current position forward.
-  *
-  * @return The integer
-  */
-
-  private int fetchIntegerValue() throws BerException {
-    int result = 0 ;
-    final int backup = next ;
-
-    try {
-      final int length = fetchLength() ;
-      if (length <= 0) throw new BerException() ;
-      if (length > (bytes.length - next)) throw
-          new IndexOutOfBoundsException("Decoded length exceeds buffer");
-      final int end = next + length ;
-      result = bytes[next++] ;
-      while (next < end) {
-        final byte b = bytes[next++] ;
-        if (b < 0) {
-          result = (result << 8) | (256 + b) ;
-        }
-        else {
-          result = (result << 8) | b ;
-        }
-      }
-    }
-    catch(BerException e) {
-      next = backup ;
-      throw e ;
-    }
-    catch(IndexOutOfBoundsException e) {
-      next = backup ;
-      throw new BerException() ;
-    }
-    catch(ArithmeticException e) {
-      next = backup ;
-      throw new BerException() ;
-    }
-    return result ;
-  }
-
-
-  /**
-  * Fetch an integer value and return a long value.
-  * FIX ME: someday we could have only on fetchIntegerValue() which always
-  * returns a long value.
-  *
-  * @return The integer
-  */
-
-  private final long fetchIntegerValueAsLong() throws BerException {
-    long result = 0 ;
-    final int backup = next ;
-
-    try {
-      final int length = fetchLength() ;
-      if (length <= 0) throw new BerException() ;
-      if (length > (bytes.length - next)) throw
-          new IndexOutOfBoundsException("Decoded length exceeds buffer");
-
-      final int end = next + length ;
-      result = bytes[next++] ;
-      while (next < end) {
-        final byte b = bytes[next++] ;
-        if (b < 0) {
-          result = (result << 8) | (256 + b) ;
-        }
-        else {
-          result = (result << 8) | b ;
-        }
-      }
-    }
-    catch(BerException e) {
-      next = backup ;
-      throw e ;
-    }
-    catch(IndexOutOfBoundsException e) {
-      next = backup ;
-      throw new BerException() ;
-    }
-    catch(ArithmeticException e) {
-      next = backup ;
-      throw new BerException() ;
-    }
-    return result ;
-  }
-
-
-  /**
-  * Fetch a byte string and move the current position forward.
-  *
-  * @return The byte string
-  */
-
-  private byte[] fetchStringValue() throws BerException {
-    byte[] result = null ;
-    final int backup = next ;
-
-    try {
-      final int length = fetchLength() ;
-      if (length < 0) throw new BerException() ;
-      if (length > (bytes.length - next))
-          throw new IndexOutOfBoundsException("Decoded length exceeds buffer");
-      final byte data[] = new byte[length] ;
-      java.lang.System.arraycopy(bytes,next,data,0,length);
-      next += length;
-      //      int i = 0 ;
-      //      while (i < length) {
-      //          result[i++] = bytes[next++] ;
-      //      }
-      result = data;
-    }
-    catch(BerException e) {
-        next = backup ;
-      throw e ;
-    }
-    catch(IndexOutOfBoundsException e) {
-      next = backup ;
-      throw new BerException() ;
-    }
-    catch(ArithmeticException e) {
-      next = backup ;
-      throw new BerException() ;
-    }
-    // catch(Error e) {
-    //  debug("fetchStringValue: Error decoding BER: " + e);
-    //  throw e;
-    // }
-
-    return result ;
-  }
-
-
-
-  /**
-  * Fetch an oid and move the current position forward.
-  *
-  * @return The oid
-  */
-
-  private final long[] fetchOidValue() throws BerException {
-    long[] result = null ;
-    final int backup = next ;
-
-    try {
-      final int length = fetchLength() ;
-      if (length <= 0) throw new BerException() ;
-      if (length > (bytes.length - next))
-          throw new IndexOutOfBoundsException("Decoded length exceeds buffer");
-      // Count how many bytes have their 8th bit to 0
-      // -> this gives the number of components in the oid
-      int subidCount = 2 ;
-      for (int i = 1 ; i < length ; i++) {
-        if ((bytes[next + i] & 0x80) == 0) {
-          subidCount++ ;
-        }
-      }
-      final int datalen = subidCount;
-      final long[] data = new long[datalen];
-      final byte b0 = bytes[next++] ;
-
-      // bugId 4641746
-      // The 8th bit of the first byte should always be set to 0
-      if (b0 < 0) throw new BerException();
-
-      // bugId 4641746
-      // The first sub Id cannot be greater than 2
-      final long lb0 =  b0 / 40 ;
-      if (lb0 > 2) throw new BerException();
-
-      final long lb1 = b0 % 40;
-      data[0] = lb0 ;
-      data[1] = lb1 ;
-      int i = 2 ;
-      while (i < datalen) {
-        long subid = 0 ;
-        byte b = bytes[next++] ;
-        while ((b & 0x80) != 0) {
-          subid = (subid << 7) | (b & 0x7f) ;
-          // bugId 4654674
-          if (subid < 0) throw new BerException();
-          b = bytes[next++] ;
-        }
-        subid = (subid << 7) | b ;
-        // bugId 4654674
-        if (subid < 0) throw new BerException();
-        data[i++] = subid ;
-      }
-      result = data;
-    }
-    catch(BerException e) {
-      next = backup ;
-      throw e ;
-    }
-    catch(IndexOutOfBoundsException e) {
-      next = backup ;
-      throw new BerException() ;
-    }
-    // catch(Error e) {
-    //  debug("fetchOidValue: Error decoding BER: " + e);
-    //  throw e;
-    // }
-
-    return result ;
-  }
-
-    // private static final void debug(String str) {
-    //   System.out.println(str);
-    // }
-
-  //
-  // This is the byte array containing the encoding.
-  //
-  private final byte bytes[];
-
-  //
-  // This is the current location. It is the next byte
-  // to be decoded. It's an index in bytes[].
-  //
-  private int next = 0 ;
-
-  //
-  // This is the stack where end of sequences are kept.
-  // A value is computed and pushed in it each time openSequence()
-  // is invoked.
-  // A value is pulled and checked each time closeSequence() is called.
-  //
-  private final int stackBuf[] = new int[200] ;
-  private int stackTop = 0 ;
-
-}

--- a/src/jdk.snmp/share/classes/com/sun/jmx/snmp/BerEncoder.java	Tue Oct 21 13:56:58 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,477 +0,0 @@
-/*
- * Copyright (c) 1997, 2007, 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 com.sun.jmx.snmp;
-
-
-/**
- * The <CODE>BerEncoder</CODE> class is used for encoding data using BER.
- *
- * A <CODE>BerEncoder</CODE> needs to be set up with a byte buffer. The encoded
- * data are stored in this byte buffer.
- * <P>
- * NOTE : the buffer is filled from end to start. This means the caller
- * needs to encode its data in the reverse order.
- *
- *
- * <p><b>This API is a Sun Microsystems internal API  and is subject
- * to change without notice.</b></p>
- *
- * @since 1.5
- */
-
-public class BerEncoder {
-
-  /**
-  * Constructs a new encoder and attaches it to the specified byte string.
-  *
-  * @param b The byte string containing the encoded data.
-  */
-
-  public BerEncoder(byte b[]) {
-    bytes = b ;
-    start = b.length ;
-    stackTop = 0 ;
-  }
-
-
-  /**
-  * Trim the encoding data and returns the length of the encoding.
-  *
-  * The encoder does backward encoding : so the bytes buffer is
-  * filled from end to start. The encoded data must be shift before
-  * the buffer can be used. This is the purpose of the <CODE>trim</CODE> method.
-  *
-  * After a call to the <CODE>trim</CODE> method, the encoder is reinitialized and <CODE>putXXX</CODE>
-  * overwrite any existing encoded data.
-  *
-  * @return The length of the encoded data.
-  */
-
-  public int trim() {
-    final int result = bytes.length - start ;
-
-    // for (int i = start ; i < bytes.length ; i++) {
-    //  bytes[i-start] = bytes[i] ;
-    // }
-    if (result > 0)
-        java.lang.System.arraycopy(bytes,start,bytes,0,result);
-
-    start = bytes.length ;
-    stackTop = 0 ;
-
-    return result ;
-  }
-
-  /**
-  * Put an integer.
-  *
-  * @param v The integer to encode.
-  */
-
-  public void putInteger(int v) {
-    putInteger(v, IntegerTag) ;
-  }
-
-
-  /**
-  * Put an integer with the specified tag.
-  *
-  * @param v The integer to encode.
-  * @param tag The tag to encode.
-  */
-
-  public void putInteger(int v, int tag) {
-    putIntegerValue(v) ;
-    putTag(tag) ;
-  }
-
-
-
-  /**
-  * Put an integer expressed as a long.
-  *
-  * @param v The long to encode.
-  */
-
-  public void putInteger(long v) {
-    putInteger(v, IntegerTag) ;
-  }
-
-
-  /**
-  * Put an integer expressed as a long with the specified tag.
-  *
-  * @param v The long to encode
-  * @param tag The tag to encode.
-  */
-
-  public void putInteger(long v, int tag) {
-    putIntegerValue(v) ;
-    putTag(tag) ;
-  }
-
-
-
-  /**
-  * Put an octet string.
-  *
-  * @param s The bytes to encode
-  */
-
-  public void putOctetString(byte[] s) {
-    putOctetString(s, OctetStringTag) ;
-  }
-
-
-  /**
-  * Put an octet string with a specified tag.
-  *
-  * @param s The bytes to encode
-  * @param tag The tag to encode.
-  */
-
-  public void putOctetString(byte[] s, int tag) {
-    putStringValue(s) ;
-    putTag(tag) ;
-  }
-
-
-  /**
-  * Put an object identifier.
-  *
-  * @param s The oid to encode.
-  */
-
-  public void putOid(long[] s) {
-    putOid(s, OidTag) ;
-  }
-
-
-  /**
-  * Put an object identifier with a specified tag.
-  *
-  * @param s The integer to encode.
-  * @param tag The tag to encode.
-  */
-
-  public void putOid(long[] s, int tag) {
-    putOidValue(s) ;
-    putTag(tag) ;
-  }
-
-
-  /**
-  * Put a <CODE>NULL</CODE> value.
-  */
-
-  public void putNull() {
-    putNull(NullTag) ;
-  }
-
-
-  /**
-  * Put a <CODE>NULL</CODE> value with a specified tag.
-  *
-  * @param tag The tag to encode.
-  */
-
-  public void putNull(int tag) {
-    putLength(0) ;
-    putTag(tag) ;
-  }
-
-
-
-  /**
-  * Put an <CODE>ANY</CODE> value. In fact, this method does not encode anything.
-  * It simply copies the specified bytes into the encoding.
-  *
-  * @param s The encoding of the <CODE>ANY</CODE> value.
-  */
-
-  public void putAny(byte[] s) {
-        putAny(s, s.length) ;
-  }
-
-
-  /**
-  * Put an <CODE>ANY</CODE> value. Only the first <CODE>byteCount</CODE> are considered.
-  *
-  * @param s The encoding of the <CODE>ANY</CODE> value.
-  * @param byteCount The number of bytes of the encoding.
-  */
-
-  public void putAny(byte[] s, int byteCount) {
-      java.lang.System.arraycopy(s,0,bytes,start-byteCount,byteCount);
-      start -= byteCount;
-      //    for (int i = byteCount - 1 ; i >= 0 ; i--) {
-      //      bytes[--start] = s[i] ;
-      //    }
-  }
-
-
-  /**
-  * Open a sequence.
-  * The encoder push the current position on its stack.
-  */
-
-  public void openSequence() {
-    stackBuf[stackTop++] = start ;
-  }
-
-
-  /**
-  * Close a sequence.
-  * The decode pull the stack to know the end of the current sequence.
-  */
-
-  public void closeSequence() {
-    closeSequence(SequenceTag) ;
-  }
-
-
-  /**
-  * Close a sequence with the specified tag.
-  */
-
-  public void closeSequence(int tag) {
-    final int end = stackBuf[--stackTop] ;
-    putLength(end - start) ;
-    putTag(tag) ;
-  }
-
-
-  //
-  // Some standard tags
-  //
-  public final static int BooleanTag      = 1 ;
-  public final static int IntegerTag      = 2 ;
-  public final static int OctetStringTag  = 4 ;
-  public final static int NullTag          = 5 ;
-  public final static int OidTag          = 6 ;
-  public final static int SequenceTag      = 0x30 ;
-
-
-
-
-  ////////////////////////// PROTECTED ///////////////////////////////
-
-
-
-  /**
-  * Put a tag and move the current position backward.
-  *
-  * @param tag The tag to encode.
-  */
-
-  protected final void putTag(int tag) {
-    if (tag < 256) {
-      bytes[--start] = (byte)tag ;
-    }
-    else {
-      while (tag != 0) {
-        bytes[--start] = (byte)(tag & 127) ;
-        tag = tag << 7 ;
-      }
-    }
-  }
-
-
-  /**
-  * Put a length and move the current position backward.
-  *
-  * @param length The length to encode.
-  */
-
-  protected final void putLength(final int length) {
-    if (length < 0) {
-      throw new IllegalArgumentException() ;
-    }
-    else if (length < 128) {
-      bytes[--start] = (byte)length ;
-    }
-    else if (length < 256) {
-      bytes[--start] = (byte)length ;
-      bytes[--start] = (byte)0x81 ;
-    }
-    else if (length < 65536) {
-      bytes[--start] = (byte)(length) ;
-      bytes[--start] = (byte)(length >> 8) ;
-      bytes[--start] = (byte)0x82 ;
-    }
-    else if (length < 16777126) {
-      bytes[--start] = (byte)(length) ;
-      bytes[--start] = (byte)(length >> 8) ;
-      bytes[--start] = (byte)(length >> 16) ;
-      bytes[--start] = (byte)0x83 ;
-    }
-    else {
-      bytes[--start] = (byte)(length) ;
-      bytes[--start] = (byte)(length >> 8) ;
-      bytes[--start] = (byte)(length >> 16) ;
-      bytes[--start] = (byte)(length >> 24) ;
-      bytes[--start] = (byte)0x84 ;
-    }
-  }
-
-
-  /**
-  * Put an integer value and move the current position backward.
-  *
-  * @param v The integer to encode.
-  */
-
-  protected final void putIntegerValue(int v) {
-    final int end = start ;
-    int mask = 0x7f800000 ;
-    int byteNeeded = 4 ;
-    if (v < 0) {
-      while (((mask & v) == mask) && (byteNeeded > 1)) {
-        mask = mask >> 8 ;
-        byteNeeded-- ;
-      }
-    }
-    else {
-      while (((mask & v) == 0) && (byteNeeded > 1)) {
-        mask = mask >> 8 ;
-        byteNeeded-- ;
-      }
-    }
-    for (int i = 0 ; i < byteNeeded ; i++) {
-      bytes[--start] = (byte)v ;
-      v =  v >> 8 ;
-    }
-    putLength(end - start) ;
-  }
-
-
-  /**
-  * Put an integer value expressed as a long.
-  *
-  * @param v The integer to encode.
-  */
-
-  protected final void putIntegerValue(long v) {
-    final int end = start ;
-    long mask = 0x7f80000000000000L ;
-    int byteNeeded = 8 ;
-    if (v < 0) {
-      while (((mask & v) == mask) && (byteNeeded > 1)) {
-        mask = mask >> 8 ;
-        byteNeeded-- ;
-      }
-    }
-    else {
-      while (((mask & v) == 0) && (byteNeeded > 1)) {
-        mask = mask >> 8 ;
-        byteNeeded-- ;
-      }
-    }
-    for (int i = 0 ; i < byteNeeded ; i++) {
-      bytes[--start] = (byte)v ;
-      v =  v >> 8 ;
-    }
-    putLength(end - start) ;
-  }
-
-
-  /**
-  * Put a byte string and move the current position backward.
-  *
-  * @param s The byte string to encode.
-  */
-
-  protected final void putStringValue(byte[] s) {
-      final int datalen = s.length;
-      java.lang.System.arraycopy(s,0,bytes,start-datalen,datalen);
-      start -= datalen;
-      // for (int i = s.length - 1 ; i >= 0 ; i--) {
-      //   bytes[--start] = s[i] ;
-      // }
-      putLength(datalen) ;
-  }
-
-
-
-  /**
-  * Put an oid and move the current position backward.
-  *
-  * @param s The oid to encode.
-  */
-
-  protected final void putOidValue(final long[] s) {
-      final int end = start ;
-      final int slength = s.length;
-
-      // bugId 4641746: 0, 1, and 2 are legal values.
-      if ((slength < 2) || (s[0] > 2) || (s[1] >= 40)) {
-          throw new IllegalArgumentException() ;
-      }
-      for (int i = slength - 1 ; i >= 2 ; i--) {
-          long c = s[i] ;
-          if (c < 0) {
-              throw new IllegalArgumentException() ;
-          }
-          else if (c < 128) {
-              bytes[--start] = (byte)c ;
-          }
-          else {
-              bytes[--start] = (byte)(c & 127) ;
-              c = c >> 7 ;
-              while (c != 0) {
-                  bytes[--start] = (byte)(c | 128) ;
-                  c = c >> 7 ;
-              }
-          }
-      }
-      bytes[--start] = (byte)(s[0] * 40 + s[1]) ;
-      putLength(end - start) ;
-  }
-
-
-  //
-  // This is the byte array containing the encoding.
-  //
-  protected final byte bytes[];
-
-  //
-  // This is the index of the first byte of the encoding.
-  // It is initialized to <CODE>bytes.length</CODE> and decrease each time
-  // an value is put in the encoder.
-  //
-  protected int start = -1 ;
-
-  //
-  // This is the stack where end of sequences are kept.
-  // A value is computed and pushed in it each time the <CODE>openSequence</CODE> method
-  // is invoked.
-  // A value is pulled and checked each time the <CODE>closeSequence</CODE> method is called.
-  //
-  protected final int stackBuf[] = new int[200] ;
-  protected int stackTop = 0 ;
-
-}

--- a/src/jdk.snmp/share/classes/com/sun/jmx/snmp/BerException.java	Tue Oct 21 13:56:58 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 1997, 2007, 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 com.sun.jmx.snmp;
-
-
-
-
-
-/**
- * Exception thrown when a BER encoding/decoding error occurs.
- *
- * <p><b>This API is a Sun Microsystems internal API  and is subject
- * to change without notice.</b></p>
- *
- * @since 1.5
- */
-
-public class BerException extends Exception {
-  private static final long serialVersionUID = 494709767137042951L;
-
-  public static final int BAD_VERSION=1;
-
-  private int errorType= 0;
-
-  public BerException() {
-    errorType= 0;
-  }
-
-  public BerException(int x) {
-    errorType= x;
-  }
-
-  public boolean isInvalidSnmpVersion() {
-    if (errorType == BAD_VERSION)
-      return true;
-    else
-      return false;
-  }
-}

--- a/src/jdk.snmp/share/classes/com/sun/jmx/snmp/EnumRowStatus.java	Tue Oct 21 13:56:58 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,304 +0,0 @@
-/*
- * Copyright (c) 2000, 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 com.sun.jmx.snmp;
-
-import java.io.Serializable;
-import java.util.Hashtable;
-
-
-/**
- * This class is an internal class which is used to represent RowStatus
- * codes as defined in RFC 2579.
- *
- * It defines an additional code, <i>unspecified</i>, which is
- * implementation specific, and is used to identify
- * unspecified actions (when for instance the RowStatus variable
- * is not present in the varbind list) or uninitialized values.
- *
- * mibgen does not generate objects of this class but any variable
- * using the RowStatus textual convention can be converted into an
- * object of this class thanks to the
- * <code>EnumRowStatus(Enumerated valueIndex)</code> constructor.
- *
- * <p><b>This API is a Sun Microsystems internal API  and is subject
- * to change without notice.</b></p>
- **/
-
-public class EnumRowStatus extends Enumerated implements Serializable {
-    private static final long serialVersionUID = 8966519271130162420L;
-
-    /**
-     * This value is SNMP Runtime implementation specific, and is used to identify
-     * unspecified actions (when for instance the RowStatus variable
-     * is not present in the varbind list) or uninitialized values.
-     */
-    public final static int unspecified   = 0;
-
-    /**
-     * This value corresponds to the <i>active</i> RowStatus, as defined in
-     * RFC 2579 from SMIv2:
-     * <ul>
-     * <i>active</i> indicates that the conceptual row is available for
-     * use by the managed device;
-     * </ul>
-     */
-    public final static int active        = 1;
-
-    /**
-     * This value corresponds to the <i>notInService</i> RowStatus, as
-     * defined in RFC 2579 from SMIv2:
-     * <ul>
-     * <i>notInService</i> indicates that the conceptual
-     * row exists in the agent, but is unavailable for use by
-     * the managed device; <i>notInService</i> has
-     * no implication regarding the internal consistency of
-     * the row, availability of resources, or consistency with
-     * the current state of the managed device;
-     * </ul>
-     **/
-    public final static int notInService  = 2;
-
-    /**
-     * This value corresponds to the <i>notReady</i> RowStatus, as defined
-     * in RFC 2579 from SMIv2:
-     * <ul>
-     * <i>notReady</i> indicates that the conceptual row
-     * exists in the agent, but is missing information
-     * necessary in order to be available for use by the
-     * managed device (i.e., one or more required columns in
-     * the conceptual row have not been instantiated);
-     * </ul>
-     */
-    public final static int notReady      = 3;
-
-    /**
-     * This value corresponds to the <i>createAndGo</i> RowStatus,
-     * as defined in RFC 2579 from SMIv2:
-     * <ul>
-     * <i>createAndGo</i> is supplied by a management
-     * station wishing to create a new instance of a
-     * conceptual row and to have its status automatically set
-     * to active, making it available for use by the managed
-     * device;
-     * </ul>
-     */
-    public final static int createAndGo   = 4;
-
-    /**
-     * This value corresponds to the <i>createAndWait</i> RowStatus,
-     * as defined in RFC 2579 from SMIv2:
-     * <ul>
-     * <i>createAndWait</i> is supplied by a management
-     * station wishing to create a new instance of a
-     * conceptual row (but not make it available for use by
-     * the managed device);
-     * </ul>
-     */
-    public final static int createAndWait = 5;
-
-    /**
-     * This value corresponds to the <i>destroy</i> RowStatus, as defined in
-     * RFC 2579 from SMIv2:
-     * <ul>
-     * <i>destroy</i> is supplied by a management station
-     * wishing to delete all of the instances associated with
-     * an existing conceptual row.
-     * </ul>
-     */
-    public final static int destroy       = 6;
-
-    /**
-     * Build an <code>EnumRowStatus</code> from an <code>int</code>.
-     * @param valueIndex should be either 0 (<i>unspecified</i>), or one of
-     *        the values defined in RFC 2579.
-     * @exception IllegalArgumentException if the given
-     *            <code>valueIndex</code> is not valid.
-     **/
-    public EnumRowStatus(int valueIndex)
-        throws IllegalArgumentException {
-        super(valueIndex);
-    }
-
-    /**
-     * Build an <code>EnumRowStatus</code> from an <code>Enumerated</code>.
-     * @param valueIndex should be either 0 (<i>unspecified</i>), or one of
-     *        the values defined in RFC 2579.
-     * @exception IllegalArgumentException if the given
-     *            <code>valueIndex</code> is not valid.
-     **/
-    public EnumRowStatus(Enumerated valueIndex)
-        throws IllegalArgumentException {
-        this(valueIndex.intValue());
-    }
-
-    /**
-     * Build an <code>EnumRowStatus</code> from a <code>long</code>.
-     * @param valueIndex should be either 0 (<i>unspecified</i>), or one of
-     *        the values defined in RFC 2579.
-     * @exception IllegalArgumentException if the given
-     *            <code>valueIndex</code> is not valid.
-     **/
-    public EnumRowStatus(long valueIndex)
-        throws IllegalArgumentException {
-        this((int)valueIndex);
-    }
-
-    /**
-     * Build an <code>EnumRowStatus</code> from an <code>Integer</code>.
-     * @param valueIndex should be either 0 (<i>unspecified</i>), or one of
-     *        the values defined in RFC 2579.
-     * @exception IllegalArgumentException if the given
-     *            <code>valueIndex</code> is not valid.
-     **/
-    public EnumRowStatus(Integer valueIndex)
-        throws IllegalArgumentException {
-        super(valueIndex);
-    }
-
-    /**
-     * Build an <code>EnumRowStatus</code> from a <code>Long</code>.
-     * @param valueIndex should be either 0 (<i>unspecified</i>), or one of
-     *        the values defined in RFC 2579.
-     * @exception IllegalArgumentException if the given
-     *            <code>valueIndex</code> is not valid.
-     **/
-    public EnumRowStatus(Long valueIndex)
-        throws IllegalArgumentException {
-        this(valueIndex.longValue());
-    }
-
-    /**
-     * Build an <code>EnumRowStatus</code> with <i>unspecified</i> value.
-     **/
-    public EnumRowStatus()
-        throws IllegalArgumentException {
-        this(unspecified);
-    }
-
-    /**
-     * Build an <code>EnumRowStatus</code> from a <code>String</code>.
-     * @param x should be either "unspecified", or one of
-     *        the values defined in RFC 2579 ("active", "notReady", etc...)
-     * @exception IllegalArgumentException if the given String
-     *            <code>x</code> is not valid.
-     **/
-    public EnumRowStatus(String x)
-        throws IllegalArgumentException {
-        super(x);
-    }
-
-    /**
-     * Build an <code>EnumRowStatus</code> from an <code>SnmpInt</code>.
-     * @param valueIndex should be either 0 (<i>unspecified</i>), or one of
-     *        the values defined in RFC 2579.
-     * @exception IllegalArgumentException if the given
-     *            <code>valueIndex</code> is not valid.
-     **/
-    public EnumRowStatus(SnmpInt valueIndex)
-        throws IllegalArgumentException {
-        this(valueIndex.intValue());
-    }
-
-    /**
-     * Build an SnmpValue from this object.
-     *
-     * @exception IllegalArgumentException if this object holds an
-     *            <i>unspecified</i> value.
-     * @return an SnmpInt containing this object value.
-     **/
-    public SnmpInt toSnmpValue()
-        throws IllegalArgumentException {
-        if (value == unspecified)
-            throw new
-        IllegalArgumentException("`unspecified' is not a valid SNMP value.");
-        return new SnmpInt(value);
-    }
-
-    /**
-     * Check that the given <code>value</code> is valid.
-     *
-     * Valid values are:
-     * <ul><li><i>unspecified(0)</i></li>
-     *     <li><i>active(1)</i></li>
-     *     <li><i>notInService(2)</i></li>
-     *     <li><i>notReady(3)</i></li>
-     *     <li><i>createAndGo(4)</i></li>
-     *     <li><i>createAndWait(5)</i></li>
-     *     <li><i>destroy(6)</i></li>
-     * </ul>
-     *
-     **/
-    static public boolean isValidValue(int value) {
-        if (value < 0) return false;
-        if (value > 6) return false;
-        return true;
-    }
-
-    // Documented in Enumerated
-    //
-    @Override
-    protected Hashtable<Integer, String> getIntTable() {
-        return EnumRowStatus.getRSIntTable();
-    }
-
-    // Documented in Enumerated
-    //
-    @Override
-    protected Hashtable<String, Integer> getStringTable() {
-        return  EnumRowStatus.getRSStringTable();
-    }
-
-    static Hashtable<Integer, String> getRSIntTable() {
-        return intTable ;
-    }
-
-    static Hashtable<String, Integer> getRSStringTable() {
-        return stringTable ;
-    }
-
-    // Initialize the mapping tables.
-    //
-    final static Hashtable<Integer, String> intTable = new Hashtable<>();
-    final static Hashtable<String, Integer> stringTable = new Hashtable<>();
-    static  {
-        intTable.put(0, "unspecified");
-        intTable.put(3, "notReady");
-        intTable.put(6, "destroy");
-        intTable.put(2, "notInService");
-        intTable.put(5, "createAndWait");
-        intTable.put(1, "active");
-        intTable.put(4, "createAndGo");
-        stringTable.put("unspecified", 0);
-        stringTable.put("notReady", 3);
-        stringTable.put("destroy", 6);
-        stringTable.put("notInService", 2);
-        stringTable.put("createAndWait", 5);
-        stringTable.put("active", 1);
-        stringTable.put("createAndGo", 4);
-    }
-
-
-}

--- a/src/jdk.snmp/share/classes/com/sun/jmx/snmp/Enumerated.java	Tue Oct 21 13:56:58 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,221 +0,0 @@
-/*
- * Copyright (c) 1999, 2014, 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 com.sun.jmx.snmp;
-
-
-import java.io.*;
-import java.util.Hashtable;
-import java.util.*;
-
-
-
-/** This class is used for implementing enumerated values.
- *
- * An enumeration is represented by a class derived from Enumerated.
- * The derived class defines what are the permitted values in the enumeration.
- *
- * An enumerated value is represented by an instance of the derived class.
- * It can be represented :
- *  - as an integer
- *  - as a string
- *
- * <p><b>This API is a Sun Microsystems internal API  and is subject
- * to change without notice.</b></p>
- */
-@SuppressWarnings("serial") // JDK implementation class
-abstract public class Enumerated  implements Serializable {
-
-  /**
-   * Construct an enumerated with a default value.
-   * The default value is the first available in getIntTable().
-    * @exception IllegalArgumentException One of the arguments passed to the method is illegal or inappropriate.
-   */
-  public Enumerated() throws IllegalArgumentException {
-    Enumeration<Integer> e =getIntTable().keys();
-    if (e.hasMoreElements()) {
-      value = e.nextElement().intValue() ;
-    }
-    else {
-      throw new IllegalArgumentException() ;
-    }
-  }
-
-  /**
-   * Construct an enumerated from its integer form.
-   *
-   * @param valueIndex The integer form.
-   * @exception IllegalArgumentException One of the arguments passed to
-   *            the method is illegal or inappropriate.
-   */
-  public Enumerated(int valueIndex) throws IllegalArgumentException {
-    if (getIntTable().get(valueIndex) == null) {
-      throw new IllegalArgumentException() ;
-    }
-    value = valueIndex ;
-  }
-
-  /**
-   * Construct an enumerated from its Integer form.
-   *
-   * @param valueIndex The Integer form.
-   * @exception IllegalArgumentException One of the arguments passed to
-   *            the method is illegal or inappropriate.
-   */
-  public Enumerated(Integer valueIndex) throws IllegalArgumentException {
-    if (getIntTable().get(valueIndex) == null) {
-      throw new IllegalArgumentException() ;
-    }
-    value = valueIndex.intValue() ;
-  }
-
-
-  /**
-   * Construct an enumerated from its string form.
-   *
-   * @param valueString The string form.
-   * @exception IllegalArgumentException One of the arguments passed
-   *  to the method is illegal or inappropriate.
-   */
-  public Enumerated(String valueString) throws IllegalArgumentException {
-    Integer index = getStringTable().get(valueString) ;
-    if (index == null) {
-      throw new IllegalArgumentException() ;
-    }
-    else {
-      value = index.intValue() ;
-    }
-  }
-
-
-  /**
-   * Return the integer form of the enumerated.
-   *
-   * @return The integer form
-   */
-
-  public int intValue() {
-    return value ;
-  }
-
-
-  /**
-   * Returns an Java enumeration of the permitted integers.
-   *
-   * @return An enumeration of Integer instances
-   */
-
-  public Enumeration<Integer> valueIndexes() {
-    return getIntTable().keys() ;
-  }
-
-
-  /**
-   * Returns an Java enumeration of the permitted strings.
-   *
-   * @return An enumeration of String instances
-   */
-
-  public Enumeration<String> valueStrings() {
-    return getStringTable().keys() ;
-  }
-
-
-  /**
-   * Compares this enumerated to the specified enumerated.
-   *
-   * The result is true if and only if the argument is not null
-   * and is of the same class.
-   *
-   * @param obj The object to compare with.
-   *
-   * @return True if this and obj are the same; false otherwise
-   */
-  @Override
-  public boolean equals(Object obj) {
-
-    return ((obj != null) &&
-            (getClass() == obj.getClass()) &&
-            (value == ((Enumerated)obj).value)) ;
-  }
-
-
-  /**
-   * Returns the hash code for this enumerated.
-   *
-   * @return A hash code value for this object.
-   */
-  @Override
-  public int hashCode() {
-    String hashString = getClass().getName() + String.valueOf(value) ;
-    return hashString.hashCode() ;
-  }
-
-
-  /**
-   * Returns the string form of this enumerated.
-   *
-   * @return The string for for this object.
-   */
-  @Override
-  public String toString() {
-    return getIntTable().get(value);
-  }
-
-
-  /**
-   * Returns the hashtable of the integer forms.
-   * getIntTable().get(x) returns the string form associated
-   * to the integer x.
-   *
-   * This method must be implemented by the derived class.
-   *
-   * @return An hashtable for read-only purpose
-   */
-
-  protected abstract Hashtable<Integer,String>  getIntTable() ;
-
-
-
-  /**
-   * Returns the hashtable of the string forms.
-   * getStringTable().get(s) returns the integer form associated
-   * to the string s.
-   *
-   * This method must be implemented by the derived class.
-   *
-   * @return An hashtable for read-only purpose
-   */
-
-  protected abstract Hashtable<String,Integer> getStringTable() ;
-
-
-  /**
-   * This variable keeps the integer form of the enumerated.
-   * The string form is retrieved using getIntTable().
-   */
-  protected int value ;
-
-}

--- a/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/ASCII_CharStream.README	Tue Oct 21 13:56:58 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-WARNING : ASCII_CharStream.java must be PATCHED.
-
-The following methods should be removed after javacc generation.
-The goal is to simplify 100%-pure testing (see bug 4127719).
-
-
-  /**
-   * @deprecated 
-   * @see #getEndColumn
-   */
-
-  public final int getColumn() {
-     return bufcolumn[bufpos];
-  }
-
-  /**
-   * @deprecated 
-   * @see #getEndLine
-   */
-
-  public final int getLine() {
-     return bufline[bufpos];
-  }

--- a/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/ASCII_CharStream.java	Tue Oct 21 13:56:58 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,402 +0,0 @@
-/*
- * Copyright (c) 1997, 2004, 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.
- */
-
-/* Generated By:JavaCC: Do not edit this line. ASCII_CharStream.java Version 0.7pre6 */
-package com.sun.jmx.snmp.IPAcl;
-
-/**
- * An implementation of interface CharStream, where the stream is assumed to
- * contain only ASCII characters (without unicode processing).
- */
-
-final class ASCII_CharStream
-{
-  public static final boolean staticFlag = false;
-  int bufsize;
-  int available;
-  int tokenBegin;
-  public int bufpos = -1;
-  private int bufline[];
-  private int bufcolumn[];
-
-  private int column = 0;
-  private int line = 1;
-
-  private boolean prevCharIsCR = false;
-  private boolean prevCharIsLF = false;
-
-  private java.io.Reader inputStream;
-
-  private char[] buffer;
-  private int maxNextCharInd = 0;
-  private int inBuf = 0;
-
-  private final void ExpandBuff(boolean wrapAround)
-  {
-     char[] newbuffer = new char[bufsize + 2048];
-     int newbufline[] = new int[bufsize + 2048];
-     int newbufcolumn[] = new int[bufsize + 2048];
-
-     try
-     {
-        if (wrapAround)
-        {
-           System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
-           System.arraycopy(buffer, 0, newbuffer,
-                                             bufsize - tokenBegin, bufpos);
-           buffer = newbuffer;
-
-           System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
-           System.arraycopy(bufline, 0, newbufline, bufsize - tokenBegin, bufpos);
-           bufline = newbufline;
-
-           System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
-           System.arraycopy(bufcolumn, 0, newbufcolumn, bufsize - tokenBegin, bufpos);
-           bufcolumn = newbufcolumn;
-
-           maxNextCharInd = (bufpos += (bufsize - tokenBegin));
-        }
-        else
-        {
-           System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
-           buffer = newbuffer;
-
-           System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
-           bufline = newbufline;
-
-           System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
-           bufcolumn = newbufcolumn;
-
-           maxNextCharInd = (bufpos -= tokenBegin);
-        }
-     }
-     catch (Throwable t)
-     {
-        throw new Error(t.getMessage());
-     }
-
-
-     bufsize += 2048;
-     available = bufsize;
-     tokenBegin = 0;
-  }
-
-  private final void FillBuff() throws java.io.IOException
-  {
-     if (maxNextCharInd == available)
-     {
-        if (available == bufsize)
-        {
-           if (tokenBegin > 2048)
-           {
-              bufpos = maxNextCharInd = 0;
-              available = tokenBegin;
-           }
-           else if (tokenBegin < 0)
-              bufpos = maxNextCharInd = 0;
-           else
-              ExpandBuff(false);
-        }
-        else if (available > tokenBegin)
-           available = bufsize;
-        else if ((tokenBegin - available) < 2048)
-           ExpandBuff(true);
-        else
-           available = tokenBegin;
-     }
-
-     int i;
-     try {
-        if ((i = inputStream.read(buffer, maxNextCharInd,
-                                    available - maxNextCharInd)) == -1)
-        {
-           inputStream.close();
-           throw new java.io.IOException();
-        }
-        else
-           maxNextCharInd += i;
-        return;
-     }
-     catch(java.io.IOException e) {
-        --bufpos;
-        backup(0);
-        if (tokenBegin == -1)
-           tokenBegin = bufpos;
-        throw e;
-     }
-  }
-
-  public final char BeginToken() throws java.io.IOException
-  {
-     tokenBegin = -1;
-     char c = readChar();
-     tokenBegin = bufpos;
-
-     return c;
-  }
-
-  private final void UpdateLineColumn(char c)
-  {
-     column++;
-
-     if (prevCharIsLF)
-     {
-        prevCharIsLF = false;
-        line += (column = 1);
-     }
-     else if (prevCharIsCR)
-     {
-        prevCharIsCR = false;
-        if (c == '\n')
-        {
-           prevCharIsLF = true;
-        }
-        else
-           line += (column = 1);
-     }
-
-     switch (c)
-     {
-        case '\r' :
-           prevCharIsCR = true;
-           break;
-        case '\n' :
-           prevCharIsLF = true;
-           break;
-        case '\t' :
-           column--;
-           column += (8 - (column & 07));
-           break;
-        default :
-           break;
-     }
-
-     bufline[bufpos] = line;
-     bufcolumn[bufpos] = column;
-  }
-
-  public final char readChar() throws java.io.IOException
-  {
-     if (inBuf > 0)
-     {
-        --inBuf;
-        return (char)((char)0xff & buffer[(bufpos == bufsize - 1) ? (bufpos = 0) : ++bufpos]);
-     }
-
-     if (++bufpos >= maxNextCharInd)
-        FillBuff();
-
-     char c = (char)((char)0xff & buffer[bufpos]);
-
-     UpdateLineColumn(c);
-     return (c);
-  }
-
-  /**
-   * @deprecated
-   * @see #getEndColumn
-   */
-    @Deprecated
-  public final int getColumn() {
-     return bufcolumn[bufpos];
-  }
-
-  /**
-   * @deprecated
-   * @see #getEndLine
-   */
-    @Deprecated
-  public final int getLine() {
-     return bufline[bufpos];
-  }
-
-  public final int getEndColumn() {
-     return bufcolumn[bufpos];
-  }
-
-  public final int getEndLine() {
-     return bufline[bufpos];
-  }
-
-  public final int getBeginColumn() {
-     return bufcolumn[tokenBegin];
-  }
-
-  public final int getBeginLine() {
-     return bufline[tokenBegin];
-  }
-
-  public final void backup(int amount) {
-
-    inBuf += amount;
-    if ((bufpos -= amount) < 0)
-       bufpos += bufsize;
-  }
-
-  public ASCII_CharStream(java.io.Reader dstream, int startline,
-  int startcolumn, int buffersize)
-  {
-    inputStream = dstream;
-    line = startline;
-    column = startcolumn - 1;
-
-    available = bufsize = buffersize;
-    buffer = new char[buffersize];
-    bufline = new int[buffersize];
-    bufcolumn = new int[buffersize];
-  }
-
-  public ASCII_CharStream(java.io.Reader dstream, int startline,
-                                                           int startcolumn)
-  {
-     this(dstream, startline, startcolumn, 4096);
-  }
-  public void ReInit(java.io.Reader dstream, int startline,
-  int startcolumn, int buffersize)
-  {
-    inputStream = dstream;
-    line = startline;
-    column = startcolumn - 1;
-
-    if (buffer == null || buffersize != buffer.length)
-    {
-      available = bufsize = buffersize;
-      buffer = new char[buffersize];
-      bufline = new int[buffersize];
-      bufcolumn = new int[buffersize];
-    }
-    prevCharIsLF = prevCharIsCR = false;
-    tokenBegin = inBuf = maxNextCharInd = 0;
-    bufpos = -1;
-  }
-
-  public void ReInit(java.io.Reader dstream, int startline,
-                                                           int startcolumn)
-  {
-     ReInit(dstream, startline, startcolumn, 4096);
-  }
-  public ASCII_CharStream(java.io.InputStream dstream, int startline,
-  int startcolumn, int buffersize)
-  {
-     this(new java.io.InputStreamReader(dstream), startline, startcolumn, 4096);
-  }
-
-  public ASCII_CharStream(java.io.InputStream dstream, int startline,
-                                                           int startcolumn)
-  {
-     this(dstream, startline, startcolumn, 4096);
-  }
-
-  public void ReInit(java.io.InputStream dstream, int startline,
-  int startcolumn, int buffersize)
-  {
-     ReInit(new java.io.InputStreamReader(dstream), startline, startcolumn, 4096);
-  }
-  public void ReInit(java.io.InputStream dstream, int startline,
-                                                           int startcolumn)
-  {
-     ReInit(dstream, startline, startcolumn, 4096);
-  }
-  public final String GetImage()
-  {
-     if (bufpos >= tokenBegin)
-        return new String(buffer, tokenBegin, bufpos - tokenBegin + 1);
-     else
-        return new String(buffer, tokenBegin, bufsize - tokenBegin) +
-                              new String(buffer, 0, bufpos + 1);
-  }
-
-  public final char[] GetSuffix(int len)
-  {
-     char[] ret = new char[len];
-
-     if ((bufpos + 1) >= len)
-        System.arraycopy(buffer, bufpos - len + 1, ret, 0, len);
-     else
-     {
-        System.arraycopy(buffer, bufsize - (len - bufpos - 1), ret, 0,
-                                                          len - bufpos - 1);
-        System.arraycopy(buffer, 0, ret, len - bufpos - 1, bufpos + 1);
-     }
-
-     return ret;
-  }
-
-  public void Done()
-  {
-     buffer = null;
-     bufline = null;
-     bufcolumn = null;
-  }
-
-  /**
-   * Method to adjust line and column numbers for the start of a token.
-   */
-  public void adjustBeginLineColumn(int newLine, int newCol)
-  {
-     int start = tokenBegin;
-     int len;
-
-     if (bufpos >= tokenBegin)
-     {
-        len = bufpos - tokenBegin + inBuf + 1;
-     }
-     else
-     {
-        len = bufsize - tokenBegin + bufpos + 1 + inBuf;
-     }
-
-     int i = 0, j = 0, k = 0;
-     int nextColDiff = 0, columnDiff = 0;
-
-     while (i < len &&
-            bufline[j = start % bufsize] == bufline[k = ++start % bufsize])
-     {
-        bufline[j] = newLine;
-        nextColDiff = columnDiff + bufcolumn[k] - bufcolumn[j];
-        bufcolumn[j] = newCol + columnDiff;
-        columnDiff = nextColDiff;
-        i++;
-     }
-
-     if (i < len)
-     {
-        bufline[j] = newLine++;
-        bufcolumn[j] = newCol + columnDiff;
-
-        while (i++ < len)
-        {
-           if (bufline[j = start % bufsize] != bufline[++start % bufsize])
-              bufline[j] = newLine++;
-           else
-              bufline[j] = newLine;
-        }
-     }
-
-     line = bufline[j];
-     column = bufcolumn[j];
-  }
-
-}

--- a/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/AclEntryImpl.java	Tue Oct 21 13:56:58 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,263 +0,0 @@
-/*
- * Copyright (c) 1997, 2007, 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 com.sun.jmx.snmp.IPAcl;
-
-
-
-import java.security.acl.Permission;
-import java.util.Vector;
-import java.util.Enumeration;
-import java.io.Serializable;
-import java.net.UnknownHostException;
-
-import java.security.Principal;
-import java.security.acl.AclEntry;
-
-
-/**
- * Represent one entry in the Access Control List (ACL).
- * This ACL entry object contains a permission associated with a particular principal.
- * (A principal represents an entity such as an individual machine or a group).
- *
- * @see java.security.acl.AclEntry
- */
-
-class AclEntryImpl implements AclEntry, Serializable {
-  private static final long serialVersionUID = -5047185131260073216L;
-
-  private AclEntryImpl (AclEntryImpl i) throws UnknownHostException {
-        setPrincipal(i.getPrincipal());
-        permList = new Vector<Permission>();
-        commList = new Vector<String>();
-
-        for (Enumeration<String> en = i.communities(); en.hasMoreElements();){
-          addCommunity(en.nextElement());
-        }
-
-        for (Enumeration<Permission> en = i.permissions(); en.hasMoreElements();){
-          addPermission(en.nextElement());
-        }
-        if (i.isNegative()) setNegativePermissions();
-  }
-
-  /**
-   * Contructs an empty ACL entry.
-   */
-  public AclEntryImpl (){
-        princ = null;
-        permList = new Vector<Permission>();
-        commList = new Vector<String>();
-  }
-
-  /**
-   * Constructs an ACL entry with a specified principal.
-   *
-   * @param p the principal to be set for this entry.
-   */
-  public AclEntryImpl (Principal p) throws UnknownHostException {
-        princ = p;
-        permList = new Vector<Permission>();
-        commList = new Vector<String>();
-  }
-
-  /**
-   * Clones this ACL entry.
-   *
-   * @return a clone of this ACL entry.
-   */
-  public Object clone() {
-        AclEntryImpl i;
-        try {
-          i = new AclEntryImpl(this);
-        }catch (UnknownHostException e) {
-          i = null;
-        }
-        return (Object) i;
-  }
-
-  /**
-   * Returns true if this is a negative ACL entry (one denying the associated principal
-   * the set of permissions in the entry), false otherwise.
-   *
-   * @return true if this is a negative ACL entry, false if it's not.
-   */
-  public boolean isNegative(){
-        return neg;
-  }
-
-  /**
-   * Adds the specified permission to this ACL entry. Note: An entry can
-   * have multiple permissions.
-   *
-   * @param perm the permission to be associated with the principal in this
-   *        entry
-   * @return true if the permission is removed, false if the permission was
-   *         not part of this entry's permission set.
-   *
-   */
-  public boolean addPermission(java.security.acl.Permission perm){
-        if (permList.contains(perm)) return false;
-        permList.addElement(perm);
-        return true;
-  }
-
-  /**
-   * Removes the specified permission from this ACL entry.
-   *
-   * @param perm the permission to be removed from this entry.
-   * @return true if the permission is removed, false if the permission
-   *         was not part of this entry's permission set.
-   */
-  public boolean removePermission(java.security.acl.Permission perm){
-        if (!permList.contains(perm)) return false;
-        permList.removeElement(perm);
-        return true;
-  }
-
-  /**
-   * Checks if the specified permission is part of the permission set in
-   * this entry.
-   *
-   * @param perm the permission to be checked for.
-   * @return true if the permission is part of the permission set in this
-   *         entry, false otherwise.
-   */
-
-  public boolean checkPermission(java.security.acl.Permission perm){
-        return (permList.contains(perm));
-  }
-
-  /**
-   * Returns an enumeration of the permissions in this ACL entry.
-   *
-   * @return an enumeration of the permissions in this ACL entry.
-   */
-  public Enumeration<Permission> permissions(){
-        return permList.elements();
-  }
-
-  /**
-   * Sets this ACL entry to be a negative one. That is, the associated principal
-   * (e.g., a user or a group) will be denied the permission set specified in the
-   * entry. Note: ACL entries are by default positive. An entry becomes a negative
-   * entry only if this setNegativePermissions method is called on it.
-   *
-   * Not Implemented.
-   */
-  public void setNegativePermissions(){
-        neg = true;
-  }
-
-  /**
-   * Returns the principal for which permissions are granted or denied by this ACL
-   * entry. Returns null if there is no principal set for this entry yet.
-   *
-   * @return the principal associated with this entry.
-   */
-  public Principal getPrincipal(){
-        return princ;
-  }
-
-  /**
-   * Specifies the principal for which permissions are granted or denied by
-   * this ACL entry. If a principal was already set for this ACL entry,
-   * false is returned, otherwise true is returned.
-   *
-   * @param p the principal to be set for this entry.
-   * @return true if the principal is set, false if there was already a
-   *         principal set for this entry.
-   */
-  public boolean setPrincipal(Principal p) {
-        if (princ != null )
-          return false;
-        princ = p;
-        return true;
-  }
-
-  /**
-   * Returns a string representation of the contents of this ACL entry.
-   *
-   * @return a string representation of the contents.
-   */
-  public String toString(){
-        return "AclEntry:"+princ.toString();
-  }
-
-  /**
-   * Returns an enumeration of the communities in this ACL entry.
-   *
-   * @return an enumeration of the communities in this ACL entry.
-   */
-  public Enumeration<String> communities(){
-        return commList.elements();
-  }
-
-  /**
-   * Adds the specified community to this ACL entry. Note: An entry can
-   * have multiple communities.
-   *
-   * @param comm the community to be associated with the principal
-   *        in this entry.
-   * @return true if the community was added, false if the community was
-   *         already part of this entry's community set.
-   */
-  public boolean addCommunity(String comm){
-        if (commList.contains(comm)) return false;
-        commList.addElement(comm);
-        return true;
-  }
-
-  /**
-   * Removes the specified community from this ACL entry.
-   *
-   * @param comm the community  to be removed from this entry.
-   * @return true if the community is removed, false if the community was
-   *         not part of this entry's community set.
-   */
-  public boolean removeCommunity(String comm){
-        if (!commList.contains(comm)) return false;
-        commList.removeElement(comm);
-        return true;
-  }
-
-  /**
-   * Checks if the specified community is part of the community set in this
-   * entry.
-   *
-   * @param  comm the community to be checked for.
-   * @return true if the community is part of the community set in this
-   *         entry, false otherwise.
-   */
-  public boolean checkCommunity(String comm){
-        return (commList.contains(comm));
-  }
-
-  private Principal princ = null;
-  private boolean neg     = false;
-  private Vector<Permission> permList = null;
-  private Vector<String> commList = null;
-}

--- a/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/AclImpl.java	Tue Oct 21 13:56:58 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,295 +0,0 @@
-/*
- * Copyright (c) 1997, 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 com.sun.jmx.snmp.IPAcl;
-
-
-
-import java.security.Principal;
-import java.security.acl.Acl;
-import java.security.acl.AclEntry;
-import java.security.acl.NotOwnerException;
-
-import java.io.Serializable;
-import java.security.acl.Permission;
-import java.util.Vector;
-import java.util.Enumeration;
-
-
-/**
- * Represent an Access Control List (ACL) which is used to guard access to http adaptor.
- * <P>
- * It is a data structure with multiple ACL entries. Each ACL entry, of interface type
- * AclEntry, contains a set of permissions and a set of communities associated with a
- * particular principal. (A principal represents an entity such as a host or a group of host).
- * Additionally, each ACL entry is specified as being either positive or negative.
- * If positive, the permissions are to be granted to the associated principal.
- * If negative, the permissions are to be denied.
- *
- * @see java.security.acl.Acl
- */
-
-class AclImpl extends OwnerImpl implements Acl, Serializable {
-  private static final long serialVersionUID = -2250957591085270029L;
-
-  private Vector<AclEntry> entryList = null;
-  private String aclName = null;
-
-  /**
-   * Constructs the ACL with a specified owner
-   *
-   * @param owner owner of the ACL.
-   * @param name  name of this ACL.
-   */
-  public AclImpl (PrincipalImpl owner, String name) {
-        super(owner);
-        entryList = new Vector<>();
-        aclName = name;
-  }
-
-  /**
-   * Sets the name of this ACL.
-   *
-   * @param caller the principal invoking this method. It must be an owner
-   *        of this ACL.
-   * @param name the name to be given to this ACL.
-   *
-   * @exception NotOwnerException if the caller principal is not an owner
-   *            of this ACL.
-   * @see java.security.Principal
-   */
-  @Override
-  public void setName(Principal caller, String name)
-        throws NotOwnerException {
-          if (!isOwner(caller))
-                throw new NotOwnerException();
-          aclName = name;
-  }
-
-  /**
-   * Returns the name of this ACL.
-   *
-   * @return the name of this ACL.
-   */
-  @Override
-  public String getName(){
-        return aclName;
-  }
-
-  /**
-   * Adds an ACL entry to this ACL. An entry associates a principal (e.g., an individual or a group)
-   * with a set of permissions. Each principal can have at most one positive ACL entry
-   * (specifying permissions to be granted to the principal) and one negative ACL entry
-   * (specifying permissions to be denied). If there is already an ACL entry
-   * of the same type (negative or positive) already in the ACL, false is returned.
-   *
-   * @param caller the principal invoking this method. It must be an owner
-   *        of this ACL.
-   * @param entry the ACL entry to be added to this ACL.
-   * @return true on success, false if an entry of the same type (positive
-   *       or negative) for the same principal is already present in this ACL.
-   * @exception NotOwnerException if the caller principal is not an owner of
-   *       this ACL.
-   * @see java.security.Principal
-   */
-  @Override
-  public boolean addEntry(Principal caller, AclEntry entry)
-        throws NotOwnerException {
-          if (!isOwner(caller))
-                throw new NotOwnerException();
-
-          if (entryList.contains(entry))
-                return false;
-          /*
-                 for (Enumeration e = entryList.elements();e.hasMoreElements();){
-                 AclEntry ent = (AclEntry) e.nextElement();
-                 if (ent.getPrincipal().equals(entry.getPrincipal()))
-                 return false;
-                 }
-                 */
-
-          entryList.addElement(entry);
-          return true;
-  }
-
-  /**
-   * Removes an ACL entry from this ACL.
-   *
-   * @param caller the principal invoking this method. It must be an owner
-   *        of this ACL.
-   * @param entry the ACL entry to be removed from this ACL.
-   * @return true on success, false if the entry is not part of this ACL.
-   * @exception NotOwnerException if the caller principal is not an owner
-   *   of this Acl.
-   * @see java.security.Principal
-   * @see java.security.acl.AclEntry
-   */
-  @Override
-  public boolean removeEntry(Principal caller, AclEntry entry)
-        throws NotOwnerException {
-          if (!isOwner(caller))
-                throw new NotOwnerException();
-
-          return (entryList.removeElement(entry));
-  }
-
-  /**
-   * Removes all ACL entries from this ACL.
-   *
-   * @param caller the principal invoking this method. It must be an owner
-   *        of this ACL.
-   * @exception NotOwnerException if the caller principal is not an owner of
-   *        this Acl.
-   * @see java.security.Principal
-   */
-  public void removeAll(Principal caller)
-        throws NotOwnerException {
-          if (!isOwner(caller))
-                throw new NotOwnerException();
-        entryList.removeAllElements();
-  }
-
-  /**
-   * Returns an enumeration for the set of allowed permissions for
-   * the specified principal
-   * (representing an entity such as an individual or a group).
-   * This set of allowed permissions is calculated as follows:
-   * <UL>
-   * <LI>If there is no entry in this Access Control List for the specified
-   * principal, an empty permission set is returned.</LI>
-   * <LI>Otherwise, the principal's group permission sets are determined.
-   * (A principal can belong to one or more groups, where a group is a group
-   * of principals, represented by the Group interface.)</LI>
-   * </UL>
-   * @param user the principal whose permission set is to be returned.
-   * @return the permission set specifying the permissions the principal
-   *     is allowed.
-   * @see java.security.Principal
-   */
-  @Override
-  public Enumeration<Permission> getPermissions(Principal user){
-        Vector<Permission> empty = new Vector<>();
-        for (Enumeration<AclEntry> e = entryList.elements();e.hasMoreElements();){
-          AclEntry ent = e.nextElement();
-          if (ent.getPrincipal().equals(user))
-                return ent.permissions();
-        }
-        return empty.elements();
-  }
-
-  /**
-   * Returns an enumeration of the entries in this ACL. Each element in the
-   * enumeration is of type AclEntry.
-   *
-   * @return an enumeration of the entries in this ACL.
-   */
-  @Override
-  public Enumeration<AclEntry> entries(){
-        return entryList.elements();
-  }
-
-  /**
-   * Checks whether or not the specified principal has the specified
-   * permission.
-   * If it does, true is returned, otherwise false is returned.
-   * More specifically, this method checks whether the passed permission
-   * is a member of the allowed permission set of the specified principal.
-   * The allowed permission set is determined by the same algorithm as is
-   * used by the getPermissions method.
-   *
-   * @param user the principal, assumed to be a valid authenticated Principal.
-   * @param perm the permission to be checked for.
-   * @return true if the principal has the specified permission,
-   *         false otherwise.
-   * @see java.security.Principal
-   * @see java.security.Permission
-   */
-  @Override
-  public boolean checkPermission(Principal user,
-                                 java.security.acl.Permission perm) {
-        for (Enumeration<AclEntry> e = entryList.elements();e.hasMoreElements();){
-          AclEntry ent = e.nextElement();
-          if (ent.getPrincipal().equals(user))
-                if (ent.checkPermission(perm)) return true;
-        }
-        return false;
-  }
-
-  /**
-   * Checks whether or not the specified principal has the specified
-   * permission.
-   * If it does, true is returned, otherwise false is returned.
-   * More specifically, this method checks whether the passed permission
-   * is a member of the allowed permission set of the specified principal.
-   * The allowed permission set is determined by the same algorithm as is
-   * used by the getPermissions method.
-   *
-   * @param user the principal, assumed to be a valid authenticated Principal.
-   * @param community the community name associated with the principal.
-   * @param perm the permission to be checked for.
-   * @return true if the principal has the specified permission, false
-   *        otherwise.
-   * @see java.security.Principal
-   * @see java.security.Permission
-   */
-  public boolean checkPermission(Principal user, String community,
-                                 java.security.acl.Permission perm) {
-        for (Enumeration<AclEntry> e = entryList.elements();e.hasMoreElements();){
-          AclEntryImpl ent = (AclEntryImpl) e.nextElement();
-          if (ent.getPrincipal().equals(user))
-                if (ent.checkPermission(perm) && ent.checkCommunity(community)) return true;
-        }
-        return false;
-  }
-
-  /**
-   * Checks whether or not the specified community string is defined.
-   *
-   * @param community the community name associated with the principal.
-   *
-   * @return true if the specified community string is defined, false
-   *      otherwise.
-   * @see java.security.Principal
-   * @see java.security.Permission
-   */
-  public boolean checkCommunity(String community) {
-        for (Enumeration<AclEntry> e = entryList.elements();e.hasMoreElements();){
-          AclEntryImpl ent = (AclEntryImpl) e.nextElement();
-          if (ent.checkCommunity(community)) return true;
-        }
-        return false;
-  }
-
-  /**
-   * Returns a string representation of the ACL contents.
-   *
-   * @return a string representation of the ACL contents.
-   */
-  @Override
-  public String toString(){
-        return ("AclImpl: "+ getName());
-  }
-}

--- a/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/GroupImpl.java	Tue Oct 21 13:56:58 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) 1997, 2007, 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 com.sun.jmx.snmp.IPAcl;
-
-
-
-import java.util.Vector;
-import java.util.Enumeration;
-import java.io.Serializable;
-import java.net.UnknownHostException;
-
-
-import java.security.Principal;
-import java.security.acl.Group;
-
-
-/**
- * This class is used to represent a subnet mask (a group of hosts
- * matching the same
- * IP mask).
- *
- */
-
-class GroupImpl extends PrincipalImpl implements Group, Serializable {
-  private static final long serialVersionUID = -7777387035032541168L;
-
-  /**
-   * Constructs an empty group.
-   * @exception UnknownHostException Not implemented
-   */
-  public GroupImpl () throws UnknownHostException {
-  }
-
-  /**
-   * Constructs a group using the specified subnet mask.
-   *
-   * @param mask The subnet mask to use to build the group.
-   * @exception UnknownHostException if the subnet mask cann't be built.
-   */
-  public GroupImpl (String mask) throws UnknownHostException {
-        super(mask);
-  }
-
-    /**
-     * Adds the specified member to the group.
-     *
-     * @param p the principal to add to this group.
-     * @return true if the member was successfully added, false if the
-     *     principal was already a member.
-     */
-    public boolean addMember(Principal p) {
-        // we don't need to add members because the ip address is a
-        // subnet mask
-        return true;
-    }
-
-  public int hashCode() {
-        return super.hashCode();
-  }
-
-  /**
-   * Compares this group to the specified object. Returns true if the object
-   * passed in matches the group represented.
-   *
-   * @param p the object to compare with.
-   * @return true if the object passed in matches the subnet mask,
-   *   false otherwise.
-   */
-  public boolean equals (Object p) {
-        if (p instanceof PrincipalImpl || p instanceof GroupImpl){
-          if ((super.hashCode() & p.hashCode()) == p.hashCode()) return true;
-          else return false;
-        } else {
-          return false;
-        }
-  }
-
-  /**
-   * Returns true if the passed principal is a member of the group.
-   *
-   * @param p the principal whose membership is to be checked.
-   * @return true if the principal is a member of this group, false otherwise.
-   */
-  public boolean isMember(Principal p) {
-        if ((p.hashCode() & super.hashCode()) == p.hashCode()) return true;
-        else return false;
-  }
-
-  /**
-   * Returns an enumeration which contains the subnet mask.
-   *
-   * @return an enumeration which contains the subnet mask.
-   */
-  public Enumeration<? extends Principal> members(){
-        Vector<Principal> v = new Vector<Principal>(1);
-        v.addElement(this);
-        return v.elements();
-  }
-
-  /**
-   * Removes the specified member from the group. (Not implemented)
-   *
-   * @param p the principal to remove from this group.
-   * @return allways return true.
-   */
-  public boolean removeMember(Principal p) {
-        return true;
-  }
-
-  /**
-   * Prints a string representation of this group.
-   *
-   * @return  a string representation of this group.
-   */
-  public String toString() {
-        return ("GroupImpl :"+super.getAddress().toString());
-  }
-}

--- a/src/jdk.snmp/share/classes/com/sun/jmx/snmp/IPAcl/Host.java	Tue Oct 21 13:56:58 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,182 +0,0 @@
-/*
- * Copyright (c) 1997, 2014, 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 com.sun.jmx.snmp.IPAcl;
-
-
-
-// java import
-//
-import java.io.Serializable;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Hashtable;
-import java.util.logging.Level;
-import java.util.Vector;
-import java.security.acl.NotOwnerException;
-
-import static com.sun.jmx.defaults.JmxProperties.SNMP_LOGGER;
-
-/**
- * The class defines an abstract representation of a host.
- *
- */
-@SuppressWarnings("serial") // JDK implementation class
-abstract class Host extends SimpleNode implements Serializable {
-
-    public Host(int id) {
-        super(id);
-    }
-
-    public Host(Parser p, int id) {
-        super(p, id);
-    }
-
-    protected abstract PrincipalImpl createAssociatedPrincipal()
-        throws UnknownHostException;
-
-    protected abstract String getHname();
-
-    public void buildAclEntries(PrincipalImpl owner, AclImpl acl) {
-        // Create a principal
-        //
-        PrincipalImpl p=null;
-        try {
-            p = createAssociatedPrincipal();
-        } catch(UnknownHostException e) {
-            if (SNMP_LOGGER.isLoggable(Level.FINEST)) {
-                SNMP_LOGGER.logp(Level.FINEST, Host.class.getName(),
-                        "buildAclEntries",
-                        "Cannot create ACL entry; got exception", e);
-            }
-            throw new IllegalArgumentException("Cannot create ACL entry for " + e.getMessage());
-        }
-
-        // Create an AclEntry
-        //
-        AclEntryImpl entry= null;
-        try {
-            entry = new AclEntryImpl(p);
-            // Add permission
-            //
-            registerPermission(entry);
-            acl.addEntry(owner, entry);
-        } catch(UnknownHostException e) {
-            if (SNMP_LOGGER.isLoggable(Level.FINEST)) {
-                SNMP_LOGGER.logp(Level.FINEST, Host.class.getName(),
-                        "buildAclEntries",
-                        "Cannot create ACL entry; got exception", e);
-            }
-            return;
-        } catch(NotOwnerException a) {
-            if (SNMP_LOGGER.isLoggable(Level.FINEST)) {
-                SNMP_LOGGER.logp(Level.FINEST, Host.class.getName(),
-                        "buildAclEntries",
-                        "Cannot create ACL entry; got exception", a);
-            }
-            return;
-        }
-    }
-
-    private void registerPermission(AclEntryImpl entry) {
-        JDMHost host= (JDMHost) jjtGetParent();
-        JDMManagers manager= (JDMManagers) host.jjtGetParent();
-        JDMAclItem acl= (JDMAclItem) manager.jjtGetParent();
-        JDMAccess access= acl.getAccess();
-        access.putPermission(entry);
-        JDMCommunities comm= acl.getCommunities();
-        comm.buildCommunities(entry);
-    }
-
-    public void buildTrapEntries(Hashtable<InetAddress, Vector<String>> dest) {
-
-        JDMHostTrap host= (JDMHostTrap) jjtGetParent();
-        JDMTrapInterestedHost hosts= (JDMTrapInterestedHost) host.jjtGetParent();
-        JDMTrapItem trap = (JDMTrapItem) hosts.jjtGetParent();
-        JDMTrapCommunity community = trap.getCommunity();
-        String comm = community.getCommunity();
-
-        InetAddress add = null;
-        try {
-            add = java.net.InetAddress.getByName(getHname());
-        } catch(UnknownHostException e) {
-            if (SNMP_LOGGER.isLoggable(Level.FINEST)) {
-                SNMP_LOGGER.logp(Level.FINEST, Host.class.getName(),
-                        "buildTrapEntries",
-                        "Cannot create TRAP entry; got exception", e);
-            }
-            return;
-        }
-
-        Vector<String> list = null;
-        if (dest.containsKey(add)){
-            list = dest.get(add);
-            if (!list.contains(comm)){
-                list.addElement(comm);
-            }
-        } else {
-            list = new Vector<String>();
-            list.addElement(comm);
-            dest.put(add,list);
-        }
-    }
-
-    public void buildInformEntries(Hashtable<InetAddress, Vector<String>> dest) {
-
-        JDMHostInform host= (JDMHostInform) jjtGetParent();
-        JDMInformInterestedHost hosts= (JDMInformInterestedHost) host.jjtGetParent();
-        JDMInformItem inform = (JDMInformItem) hosts.jjtGetParent();
-        JDMInformCommunity community = inform.getCommunity();
-        String comm = community.getCommunity();
-
-        InetAddress add = null;
-        try {
-            add = java.net.InetAddress.getByName(getHname());
-        } catch(UnknownHostException e) {
-            if (SNMP_LOGGER.isLoggable(Level.FINEST)) {
-                SNMP_LOGGER.logp(Level.FINEST, Host.class.getName(),
-                        "buildTrapEntries",
-                        "Cannot create INFORM entry; got exception", e);
-            }
-            return;
-        }
-
-        Vector<String> list = null;
-        if (dest.containsKey(add)){
-            list = dest.get(add);
-            if (!list.contains(comm)){
-                list.addElement(comm);
-            }
-        } else {
-            list = new Vector<String>();
-            list.addElement(comm);
-            dest.put(add,list);
-        }
-    }
-
-
-
-}