changeset 671:2bb058ce572e

8079075: some docs cleanup for CORBA - part 1 Summary: some fix for CORBA docs Reviewed-by: rriggs
author avstepan
date Tue, 05 May 2015 15:17:13 +0400
parents 0acac6937de7
children 6b017d166ac2
files src/java.corba/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputObject.java src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CodeSetConversion.java src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericIdentifiable.java src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericTaggedComponent.java src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java src/java.corba/share/classes/com/sun/corba/se/impl/ior/IORTemplateImpl.java src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdNumber.java src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectIdImpl.java src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyTemplateBase.java src/java.corba/share/classes/com/sun/corba/se/impl/ior/POAObjectKeyTemplate.java src/java.corba/share/classes/com/sun/corba/se/impl/ior/StubIORImpl.java src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileFactoryFinderImpl.java src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/CodeSetsComponentImpl.java src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressBase.java src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressClosureImpl.java src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressImpl.java src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/JavaCodebaseComponentImpl.java src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/BindingIteratorImpl.java src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingUtils.java src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/CorbanameURL.java src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/IIOPEndpointInfo.java src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURL.java src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLHandler.java src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/Utility.java src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NameService.java src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NamingContextImpl.java src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/GetPropertyAction.java src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Mutex.java src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Sync.java src/java.corba/share/classes/com/sun/corba/se/pept/transport/Acceptor.java src/java.corba/share/classes/com/sun/corba/se/spi/extension/ServantCachingPolicy.java src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttribute.java src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeBase.java src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfoFactory.java src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObject.java src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringFactories.java src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManager.java src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManagerFactory.java src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticMonitoredAttribute.java src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticsAccumulator.java src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapter.java src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Action.java src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContext.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/AttributeEntry.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/ConstEntry.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/EnumEntry.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/ExceptionEntry.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardEntry.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardValueEntry.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/IncludeEntry.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceEntry.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/MethodEntry.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/ModuleEntry.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/NativeEntry.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/ParameterEntry.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/PragmaEntry.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/PrimitiveEntry.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/RepositoryID.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/SequenceEntry.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/StringEntry.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/StructEntry.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabEntry.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabFactory.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/Token.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/TypedefEntry.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionEntry.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueBoxEntry.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueEntry.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Terminal.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Arguments.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen24.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper24.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/InterfaceGen.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGen24.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGenClone24.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen24.java src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen24.java src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Type.java
diffstat 86 files changed, 155 insertions(+), 397 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java	Tue May 05 15:17:13 2015 +0400
@@ -222,7 +222,7 @@
     /**
      * returns the type of the element contained in the Any.
      *
-     * @result          the TypeCode for the element in the Any
+     * @return          the TypeCode for the element in the Any
      */
     public TypeCode type() {
         return typeCode;
@@ -267,7 +267,7 @@
      * checks for equality between Anys.
      *
      * @param otherAny  the Any to be compared with.
-     * @result          true if the Anys are equal, false otherwise.
+     * @return          true if the Anys are equal, false otherwise.
      */
     public boolean equal(Any otherAny)
     {
@@ -508,7 +508,7 @@
     /**
      * returns an output stream that an Any value can be marshaled into.
      *
-     * @result          the OutputStream to marshal value of Any into
+     * @return          the OutputStream to marshal value of Any into
      */
     public org.omg.CORBA.portable.OutputStream create_output_stream()
     {
@@ -525,7 +525,7 @@
     /**
      * returns an input stream that an Any value can be marshaled out of.
      *
-     * @result          the InputStream to marshal value of Any out of.
+     * @return          the InputStream to marshal value of Any out of.
      */
     public org.omg.CORBA.portable.InputStream create_input_stream()
     {
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputObject.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputObject.java	Tue May 05 15:17:13 2015 +0400
@@ -166,7 +166,7 @@
      * Write the contents of the CDROutputStream to the specified
      * output stream.  Has the side-effect of pushing any current
      * Message onto the Message list.
-     * @param s The output stream to write to.
+     * @param connection The output stream to write to.
      */
     public void writeTo(CorbaConnection connection)
         throws java.io.IOException
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CodeSetConversion.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CodeSetConversion.java	Tue May 05 15:17:13 2015 +0400
@@ -54,8 +54,9 @@
  *           use NIO ByteBuffer and NIO CharBuffer, the interaction
  *           and interface between this class and the CDR streams
  *           should be looked at more closely for optimizations to
- *           avoid unnecessary copying of data between char[] &
- *           CharBuffer and byte[] & ByteBuffer, especially
+ *           avoid unnecessary copying of data between
+ *           {@code char[] & CharBuffer} and
+ *           {@code byte[] & ByteBuffer}, especially
  *           DirectByteBuffers.
  *
  */
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericIdentifiable.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericIdentifiable.java	Tue May 05 15:17:13 2015 +0400
@@ -33,7 +33,6 @@
 import com.sun.corba.se.spi.ior.Identifiable ;
 
 /**
- * @author
  * This is used for unknown components and profiles.  A TAG_MULTICOMPONENT_PROFILE will be represented this way.
  */
 public abstract class GenericIdentifiable implements Identifiable
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericTaggedComponent.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericTaggedComponent.java	Tue May 05 15:17:13 2015 +0400
@@ -34,9 +34,6 @@
 
 import com.sun.corba.se.spi.ior.TaggedComponent ;
 
-/**
- * @author
- */
 public class GenericTaggedComponent extends GenericIdentifiable
     implements TaggedComponent
 {
@@ -52,8 +49,6 @@
 
     /**
      * @return org.omg.IOP.TaggedComponent
-     * @exception
-     * @author
      */
     public org.omg.IOP.TaggedComponent getIOPComponent( ORB orb )
     {
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java	Tue May 05 15:17:13 2015 +0400
@@ -39,9 +39,6 @@
 
 import com.sun.corba.se.impl.encoding.EncapsOutputStream ;
 
-/**
- * @author
- */
 public class GenericTaggedProfile extends GenericIdentifiable implements TaggedProfile
 {
     private ORB orb ;
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/ior/IORTemplateImpl.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/IORTemplateImpl.java	Tue May 05 15:17:13 2015 +0400
@@ -47,7 +47,6 @@
 
 /**
  * This class is a container of TaggedProfileTemplates.
- * @author
  */
 public class IORTemplateImpl extends IdentifiableContainerBase implements IORTemplate
 {
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdNumber.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdNumber.java	Tue May 05 15:17:13 2015 +0400
@@ -31,7 +31,7 @@
 /** ObjectAdapterIdNumber is used to represent pre-JDK 1.4 POA adapter
  * IDs.  The POA ID was simply represented as a single integer, which was
  * mapped to the actual POA instance.  Here, we just represent these
- * internally as arrays of the form { "OldRootPOA", "<number>" },
+ * internally as arrays of the form {@code { "OldRootPOA", "<number>" }},
  * and provide an extra method to get the number back.
  */
 public class ObjectAdapterIdNumber extends ObjectAdapterIdArray {
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectIdImpl.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectIdImpl.java	Tue May 05 15:17:13 2015 +0400
@@ -29,9 +29,6 @@
 import com.sun.corba.se.spi.ior.ObjectId ;
 import org.omg.CORBA_2_3.portable.OutputStream ;
 
-/**
- * @author
- */
 public final class ObjectIdImpl implements ObjectId
 {
     private byte[] id;
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyTemplateBase.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyTemplateBase.java	Tue May 05 15:17:13 2015 +0400
@@ -47,9 +47,6 @@
 import com.sun.corba.se.impl.logging.IORSystemException ;
 
 
-/**
- * @author
- */
 public abstract class ObjectKeyTemplateBase implements ObjectKeyTemplate
 {
     // Fixed constants for Java IDL object key template forms
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/ior/POAObjectKeyTemplate.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/POAObjectKeyTemplate.java	Tue May 05 15:17:13 2015 +0400
@@ -42,9 +42,6 @@
 
 import com.sun.corba.se.impl.ior.ObjectKeyFactoryImpl ;
 
-/**
- * @author
- */
 public final class POAObjectKeyTemplate extends NewObjectKeyTemplateBase
 {
     /** This constructor reads the template ONLY from the stream.
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/ior/StubIORImpl.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/StubIORImpl.java	Tue May 05 15:17:13 2015 +0400
@@ -245,7 +245,7 @@
     /**
      * Returns a string representation of this stub. Returns the same string
      * for all stubs that represent the same remote object.
-     * "SimpleIORImpl[<typeName>,[<profileID>]data, ...]"
+     * {@code "SimpleIORImpl[<typeName>,[<profileID>]data, ...]"}
      * @return a string representation of this stub.
      */
     public String toString()
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileFactoryFinderImpl.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileFactoryFinderImpl.java	Tue May 05 15:17:13 2015 +0400
@@ -33,9 +33,6 @@
 
 import org.omg.CORBA_2_3.portable.InputStream ;
 
-/**
- * @author
- */
 public class TaggedProfileFactoryFinderImpl extends
     IdentifiableFactoryFinderBase
 {
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/CodeSetsComponentImpl.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/CodeSetsComponentImpl.java	Tue May 05 15:17:13 2015 +0400
@@ -38,9 +38,6 @@
 import com.sun.corba.se.impl.encoding.MarshalOutputStream ;
 import com.sun.corba.se.impl.encoding.MarshalInputStream ;
 
-/**
- * @author
- */
 public class CodeSetsComponentImpl extends TaggedComponentBase
     implements CodeSetsComponent
 {
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressBase.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressBase.java	Tue May 05 15:17:13 2015 +0400
@@ -32,9 +32,6 @@
 
 import com.sun.corba.se.spi.ior.iiop.IIOPAddress ;
 
-/**
- * @author
- */
 abstract class IIOPAddressBase implements IIOPAddress
 {
     // Ports are marshalled as shorts on the wire.  The IDL
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressClosureImpl.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressClosureImpl.java	Tue May 05 15:17:13 2015 +0400
@@ -32,9 +32,6 @@
 
 import com.sun.corba.se.spi.orbutil.closure.Closure ;
 
-/**
- * @author
- */
 public final class IIOPAddressClosureImpl extends IIOPAddressBase
 {
     private Closure host;
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressImpl.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressImpl.java	Tue May 05 15:17:13 2015 +0400
@@ -36,9 +36,6 @@
 
 import com.sun.corba.se.impl.logging.IORSystemException ;
 
-/**
- * @author
- */
 public final class IIOPAddressImpl extends IIOPAddressBase
 {
     private ORB orb ;
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java	Tue May 05 15:17:13 2015 +0400
@@ -76,9 +76,6 @@
 
 import com.sun.corba.se.impl.logging.IORSystemException;
 
-/**
- * @author
- */
 public class IIOPProfileImpl extends IdentifiableBase implements IIOPProfile
 {
     private ORB orb ;
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java	Tue May 05 15:17:13 2015 +0400
@@ -55,7 +55,6 @@
 import com.sun.corba.se.spi.orb.ORB ;
 
 /**
- * @author
  * If getMinorVersion==0, this does not contain any tagged components
  */
 public class IIOPProfileTemplateImpl extends TaggedProfileTemplateBase
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/JavaCodebaseComponentImpl.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/JavaCodebaseComponentImpl.java	Tue May 05 15:17:13 2015 +0400
@@ -33,9 +33,6 @@
 
 import com.sun.corba.se.spi.ior.iiop.JavaCodebaseComponent ;
 
-/**
- * @author
- */
 public class JavaCodebaseComponentImpl extends TaggedComponentBase
     implements JavaCodebaseComponent
 {
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/BindingIteratorImpl.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/BindingIteratorImpl.java	Tue May 05 15:17:13 2015 +0400
@@ -92,7 +92,7 @@
      * Return the next n bindings. It also returns true or false, indicating
      * whether there were more bindings.
      * @param how_many The number of requested bindings in the BindingList.
-     * @param bl The BindingList as an out parameter.
+     * @param blh The BindingList as an out parameter.
      * @return true if there were more bindings.
      * @exception org.omg.CORBA.SystemException One of a fixed set of CORBA
      * system exceptions.
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingUtils.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingUtils.java	Tue May 05 15:17:13 2015 +0400
@@ -90,7 +90,7 @@
 
     /**
      * Create a error print stream to the supplied file.
-     * @param logFile the file to which error messages will go.
+     * @param errFile the file to which error messages will go.
      * @exception IOException thrown if the file cannot be opened for output.
      */
     public static void makeErrStream(File errFile)
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/CorbanameURL.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/CorbanameURL.java	Tue May 05 15:17:13 2015 +0400
@@ -33,7 +33,7 @@
  *  will be stored in this object. This object is capable of storing CorbaLoc
  *  profiles as defined in the CorbaName grammer.
  *
- *  @Author Hemanth
+ *  @author Hemanth
  */
 public class CorbanameURL extends INSURLBase
 {
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/IIOPEndpointInfo.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/IIOPEndpointInfo.java	Tue May 05 15:17:13 2015 +0400
@@ -32,7 +32,7 @@
  *  host information used in creating the Service Object reference
  *  from the -ORBInitDef and -ORBDefaultInitDef definitions.
  *
- *  @Author Hemanth
+ *  @author Hemanth
  */
 public class IIOPEndpointInfo
 {
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURL.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURL.java	Tue May 05 15:17:13 2015 +0400
@@ -29,7 +29,7 @@
  * INS URL is a generic interface for two different types of URL's specified
  * in INS spec.
  *
- * @Author Hemanth
+ * @author Hemanth
  */
 public interface INSURL {
     public boolean getRIRFlag( );
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLHandler.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLHandler.java	Tue May 05 15:17:13 2015 +0400
@@ -30,7 +30,7 @@
 /**
  *  This class is the entry point to parse different types of INS URL's.
  *
- *  @Author Hemanth
+ *  @author Hemanth
  */
 
 public class INSURLHandler {
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/Utility.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/Utility.java	Tue May 05 15:17:13 2015 +0400
@@ -36,7 +36,7 @@
 /**
  *  Utility methods for Naming.
  *
- *  @Author Hemanth
+ *  @author Hemanth
  */
 class Utility {
     private static NamingSystemException wrapper =
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NameService.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NameService.java	Tue May 05 15:17:13 2015 +0400
@@ -186,7 +186,7 @@
     /**
      * getObjectReferenceFromKey returns the Object reference from the objectkey using POA.create_reference_with_id method
      * @param Object Key as String
-     * @returns reference an CORBA.Object.
+     * @return a CORBA.Object reference.
      */
     org.omg.CORBA.Object getObjectReferenceFromKey( String key )
     {
@@ -205,7 +205,7 @@
     /**
      * getObjectKey gets the Object Key from the reference using POA.reference_to_id method
      * @param reference an CORBA.Object.
-     * @returns Object Key as String
+     * @return Object Key as String
      */
     String getObjectKey( org.omg.CORBA.Object reference )
     {
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NamingContextImpl.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NamingContextImpl.java	Tue May 05 15:17:13 2015 +0400
@@ -1140,10 +1140,9 @@
     /**
     * This operation creates a stringified name from the array of Name
     * components.
-    * @param n Name of the object <p>
+    * @param n Name of the object
     * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName
-    * Indicates the name does not identify a binding.<p>
-    *
+    * Indicates the name does not identify a binding.
     */
     public String to_string(org.omg.CosNaming.NameComponent[] n)
          throws org.omg.CosNaming.NamingContextPackage.InvalidName
@@ -1167,10 +1166,9 @@
     /**
     * This operation  converts a Stringified Name into an  equivalent array
     * of Name Components.
-    * @param sn Stringified Name of the object <p>
+    * @param sn Stringified Name of the object
     * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName
-    * Indicates the name does not identify a binding.<p>
-    *
+    * Indicates the name does not identify a binding.
     */
     public org.omg.CosNaming.NameComponent[] to_name(String sn)
          throws org.omg.CosNaming.NamingContextPackage.InvalidName
@@ -1204,14 +1202,13 @@
     * This operation creates a URL based "iiopname://" format name
     * from the Stringified Name of the object.
     * @param addr internet based address of the host machine where
-    * Name Service is running <p>
-    * @param sn Stringified Name of the object <p>
+    *        Name Service is running
+    * @param sn Stringified Name of the object
     * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName
-    * Indicates the name does not identify a binding.<p>
+    * Indicates the name does not identify a binding.
     * @exception org.omg.CosNaming.NamingContextPackage.InvalidAddress
     * Indicates the internet based address of the host machine is
-    * incorrect <p>
-    *
+    * incorrect
     */
 
     public String to_url(String addr, String sn)
@@ -1247,14 +1244,13 @@
     /**
      * This operation resolves the Stringified name into the object
      * reference.
-     * @param sn Stringified Name of the object <p>
+     * @param sn Stringified Name of the object
      * @exception org.omg.CosNaming.NamingContextPackage.NotFound
-     * Indicates there is no object reference for the given name. <p>
+     * Indicates there is no object reference for the given name.
      * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed
-     * Indicates that the given compound name is incorrect <p>
+     * Indicates that the given compound name is incorrect
      * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName
-     * Indicates the name does not identify a binding.<p>
-     *
+     * Indicates the name does not identify a binding.
      */
     public org.omg.CORBA.Object resolve_str(String sn)
         throws org.omg.CosNaming.NamingContextPackage.NotFound,
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java	Tue May 05 15:17:13 2015 +0400
@@ -585,7 +585,7 @@
      * Create an NVList
      *
      * @param count     size of list to create
-     * @result          NVList created
+     * @return          NVList created
      *
      * @see NVList
      */
@@ -599,7 +599,7 @@
      * Create an NVList corresponding to an OperationDef
      *
      * @param oper      operation def to use to create list
-     * @result          NVList created
+     * @return          NVList created
      *
      * @see NVList
      */
@@ -612,7 +612,7 @@
     /**
      * Create a NamedValue
      *
-     * @result          NamedValue created
+     * @return          NamedValue created
      */
     public synchronized NamedValue create_named_value(String s, Any any, int flags)
     {
@@ -623,7 +623,7 @@
     /**
      * Create an ExceptionList
      *
-     * @result          ExceptionList created
+     * @return          ExceptionList created
      */
     public synchronized org.omg.CORBA.ExceptionList create_exception_list()
     {
@@ -634,7 +634,7 @@
     /**
      * Create a ContextList
      *
-     * @result          ContextList created
+     * @return          ContextList created
      */
     public synchronized org.omg.CORBA.ContextList create_context_list()
     {
@@ -645,7 +645,7 @@
     /**
      * Get the default Context object
      *
-     * @result          the default Context object
+     * @return          the default Context object
      */
     public synchronized org.omg.CORBA.Context get_default_context()
     {
@@ -656,7 +656,7 @@
     /**
      * Create an Environment
      *
-     * @result          Environment created
+     * @return          Environment created
      */
     public synchronized org.omg.CORBA.Environment create_environment()
     {
@@ -719,7 +719,7 @@
     /**
      * Get the next request that has gotten a response.
      *
-     * @result            the next request ready with a response.
+     * @return            the next request ready with a response.
      */
     public org.omg.CORBA.Request get_next_response()
         throws org.omg.CORBA.WrongTransaction
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/GetPropertyAction.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/GetPropertyAction.java	Tue May 05 15:17:13 2015 +0400
@@ -35,7 +35,7 @@
  * <code>AccessController.doPrivileged</code>.
  *
  * <p>The following code retrieves the value of the system
- * property named <code>"prop"</code> as a privileged action: <p>
+ * property named <code>"prop"</code> as a privileged action:
  *
  * <pre>
  * String s = (String) java.security.AccessController.doPrivileged(
@@ -67,7 +67,7 @@
      * value of that property.
      *
      * @param theProp the name of the system property.
-     * @param defaulVal the default value.
+     * @param defaultVal the default value.
      */
     public GetPropertyAction(String theProp, String defaultVal) {
         this.theProp = theProp;
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Mutex.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Mutex.java	Tue May 05 15:17:13 2015 +0400
@@ -126,7 +126,6 @@
  *    // ...  other similar traversal and update methods ...
  * }
  * </pre>
- * <p>
  * @see Semaphore
  * <p>[<a href="http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html"> Introduction to this package. </a>]
 **/
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Sync.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Sync.java	Tue May 05 15:17:13 2015 +0400
@@ -276,10 +276,9 @@
  * For example, you can use an ObservableSync
  * (perhaps as part of a LayeredSync) in order to obtain callbacks
  * before and after each method invocation for a given class.
- * <p>
-
+ *
  * <p>[<a href="http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html"> Introduction to this package. </a>]
-**/
+ **/
 
 
 public interface Sync {
--- a/src/java.corba/share/classes/com/sun/corba/se/pept/transport/Acceptor.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/pept/transport/Acceptor.java	Tue May 05 15:17:13 2015 +0400
@@ -59,7 +59,7 @@
     /**
      * Used to determine if an <code>Acceptor</code> has been initialized.
      *
-     * @return <code>true</code. if the <code>Acceptor</code> has been
+     * @return <code>true</code> if the <code>Acceptor</code> has been
      * initialized.
      */
     public boolean initialized();
@@ -74,7 +74,7 @@
 
     /**
      * Set the
-     * {@link com.sun.corba.se.pept.transport.Inbound.ConnectionCache InboundConnectionCache}
+     * {@link com.sun.corba.se.pept.transport.InboundConnectionCache InboundConnectionCache}
      * to be used by this <code>Acceptor</code>.
      *
      * PEPt uses separate caches for each type of <code>Acceptor</code>
@@ -88,7 +88,7 @@
 
     /**
      * Get the
-     * {@link com.sun.corba.se.pept.transport.Inbound.ConnectionCache InboundConnectionCache}
+     * {@link com.sun.corba.se.pept.transport.InboundConnectionCache InboundConnectionCache}
      * used by this <code>Acceptor</code>
      *
      * PEPt uses separate caches for each type of <code>Acceptor</code>
--- a/src/java.corba/share/classes/com/sun/corba/se/spi/extension/ServantCachingPolicy.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/spi/extension/ServantCachingPolicy.java	Tue May 05 15:17:13 2015 +0400
@@ -44,7 +44,7 @@
 * <ol>
 * <li>POA current semantics
 * <li>Proper handling of POA destroy.
-* <ol>
+* </ol>
 * POA current semantics requires maintaining a ThreadLocal stack of
 * invocation information that is always available for POACurrent operations.
 * Maintaining this stack is expensive on the timescale of optimized co-located
--- a/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java	Tue May 05 15:17:13 2015 +0400
@@ -30,8 +30,7 @@
 /**
  * This interface is implemented by our implementation of
  * PortableInterceptor.ClientRequestInfo and
- * PortableInterceptor.ServerRequestInfo. <p>
- *
+ * PortableInterceptor.ServerRequestInfo.
  */
 
 public interface RequestInfoExt
--- a/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java	Tue May 05 15:17:13 2015 +0400
@@ -27,13 +27,9 @@
 import java.util.*;
 
 /**
- * <p>
+ * @author Hemanth Puttaswamy
  *
- * @author Hemanth Puttaswamy
- * </p>
- * <p>
  * A Cleaner Abstraction to provide a Monitored Attribute of type 'Long'
- * </p>
  */
 public abstract class LongMonitoredAttributeBase extends MonitoredAttributeBase {
 
@@ -42,20 +38,14 @@
 
 
 /**
- * <p>
  * Constructs LongMonitoredAttribute, by creating the
  * MonitoredAttributeInfo with 'Long' as the class type.
  * Users are expected to extend this class and provide the implementation
  * for getValue() and if needed clearState() as well.
- * </p>
- * <p>
  *
- * @param name of tthe MonitoredAttribute
- * </p>
- * <p>
+ * @param name of the MonitoredAttribute
  * @param description of the Attribute, Please provid a well thought out
  * description, so that the admin can make sense of the attribute supplied.
- * </p>
  */
     public  LongMonitoredAttributeBase(String name, String description) {
         super( name );
--- a/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttribute.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttribute.java	Tue May 05 15:17:13 2015 +0400
@@ -28,15 +28,11 @@
 import java.util.*;
 
 /**
- * <p>
+ * @author Hemanth Puttaswamy
  *
- * @author Hemanth Puttaswamy
- * </p>
- * <p>
  * Monitored Attribute is the interface to represent a Monitorable
  * Attribute. Using this interface, one can get the value of the attribute
  * and set the value if it is a writeable attribute.
- * </p>
  */
 public interface MonitoredAttribute {
 
@@ -44,34 +40,25 @@
   // operations
 
 /**
- * <p>
  * Gets the Monitored Attribute Info for the attribute.
- * </p>
- * <p>
  *
  * @param monitoredAttributeInfo for this Monitored Attribute.
- * </p>
  */
     public MonitoredAttributeInfo getAttributeInfo();
 /**
- * <p>
  * Sets the value for the Monitored Attribute if isWritable() is false, the
  * method will throw ILLEGAL Operation exception.
  *
  * Also, the type of 'value' should be same as specified in the
  * MonitoredAttributeInfo for a particular instance.
- * </p>
- * <p>
  *
  * @param value should be any one of the Basic Java Type Objects which are
  * Long, Double, Float, String, Integer, Short, Character, Byte.
- * </p>
  */
     public void setValue(Object value);
 
 
 /**
- * <p>
  * Gets the value of the Monitored Attribute. The value can be obtained
  * from different parts of the module. User may choose to delegate the call
  * to getValue() to other variables.
@@ -79,34 +66,21 @@
  * NOTE: It is important to make sure that the type of Object returned in
  * getvalue is same as the one specified in MonitoredAttributeInfo for this
  * attribute.
- * </p>
- * <p>
- *
- * </p>
- * <p>
  *
  * @param value is the current value for this MonitoredAttribute
- * </p>
  */
     public Object getValue();
 /**
- * <p>
  * Gets the name of the Monitored Attribute.
- * </p>
- * <p>
  *
- * @param name of this Attribute
- * </p>
+ * @return name of this Attribute
  */
     public String getName();
 /**
- * <p>
  * If this attribute needs to be cleared, the user needs to implement this
  * method to reset the state to initial state. If the Monitored Attribute
  * doesn't change like for example (ConnectionManager High Water Mark),
  * then clearState() is a No Op.
- * </p>
- *
  */
     public void clearState();
 
--- a/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeBase.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeBase.java	Tue May 05 15:17:13 2015 +0400
@@ -27,16 +27,11 @@
 import java.util.*;
 
 /**
- * <p>
+ * @author Hemanth Puttaswamy
  *
- * @author Hemanth Puttaswamy
- * </p>
- * <p>
  *  A Convenient class provided to help users extend and implement only
  *  getValue(), if there is no need to clear the state and the attribute is not
  *  writable.
- *
- * </p>
  */
 public abstract class MonitoredAttributeBase implements MonitoredAttribute {
     String name;
--- a/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java	Tue May 05 15:17:13 2015 +0400
@@ -27,14 +27,10 @@
 import java.util.*;
 
 /**
- * <p>
+ * @author Hemanth Puttaswamy
  *
- * @author Hemanth Puttaswamy
- * </p>
- * <p>
  * Monitored AttributeInfo contains the meta information of the Monitored
  * Attribute.
- * </p>
  */
 public interface MonitoredAttributeInfo {
 
@@ -42,45 +38,38 @@
   // operations
 
 /**
- * <p>
  * If the Attribute is writable from ASAdmin then isWritable() will return
  * true.
- * </p>
- * <p>
  *
  * @return a boolean with true or false
- * </p>
  */
     public boolean isWritable();
 /**
- * <p>
  * isStatistic() is true if the attribute is presented as a Statistic.
- * </p>
- * <p>
  *
  * @return a boolean with true or false
- * </p>
  */
     public boolean isStatistic();
 /**
- * <p>
- * Class Type: We will allow only basic class types: 1)Boolean 2)Integer
- * 3)Byte 4)Long 5)Float 6)Double 7)String 8)Character
- * </p>
- * <p>
+ * Class Type: We will allow only basic class types:
+ * <ol>
+ * <li>Boolean</li>
+ * <li>Integer</li>
+ * <li>Byte</li>
+ * <li>Long</li>
+ * <li>Float</li>
+ * <li>Double</li>
+ * <li>String</li>
+ * <li>Character</li>
+ * </ol>
  *
  * @return a Class Type
- * </p>
  */
     public Class type();
 /**
- * <p>
  * Get's the description for the Monitored Attribute.
- * </p>
- * <p>
  *
  * @return a String with description
- * </p>
  */
     public String getDescription();
 
--- a/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfoFactory.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfoFactory.java	Tue May 05 15:17:13 2015 +0400
@@ -25,17 +25,12 @@
 package com.sun.corba.se.spi.monitoring;
 
 /**
- * <p>
+ * @author Hemanth Puttaswamy
  *
- * @author Hemanth Puttaswamy
- * </p>
- * <p>
  * MonitoredAttributeInfoFactory used mostly by internal classes. If the
  * User needs to define some special MonitoredAttributes like a Character
  * type Monitored Attribute, they can use this factory to build the meta
  * information.
- *
- * </p>
  */
 
 public interface MonitoredAttributeInfoFactory {
--- a/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObject.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObject.java	Tue May 05 15:17:13 2015 +0400
@@ -30,161 +30,101 @@
 import java.util.Collection;
 
 /**
- * <p>
+ * @author Hemanth Puttaswamy
  *
- * @author Hemanth Puttaswamy
- * </p>
- * <p>
  * Monitored Object provides an Hierarchichal view of the ORB Monitoring
  * System. It can contain multiple children and a single parent. Each
  * Monitored Object may also contain Multiple Monitored Attributes.
- * </p>
  */
 public interface MonitoredObject {
 
   ///////////////////////////////////////
   // operations
 /**
- * <p>
  * Gets the name of this MonitoredObject
- * </p><p>
  *
  * @return a String with name of this Monitored Object
- * </p>
  */
     public String getName();
 /**
- * <p>
  * Gets the description of MonitoredObject
- * </p><p>
  *
  * @return a String with Monitored Object Description.
- * </p>
  */
     public String getDescription();
 /**
- * <p>
  * This method will add a child Monitored Object to this Monitored Object.
- * </p>
- * <p>
- * </p>
  */
     public void addChild( MonitoredObject m );
 /**
- * <p>
  * This method will remove child Monitored Object identified by the given name
- * </p>
- * <p>
+ *
  * @param name of the ChildMonitored Object
- * </p>
  */
     public void removeChild( String name );
 
 /**
- * <p>
  * Gets the child MonitoredObject associated with this MonitoredObject
  * instance using name as the key. The name should be fully qualified name
  * like orb.connectionmanager
- * </p>
- * <p>
  *
  * @return a MonitoredObject identified by the given name
- * </p>
- * <p>
  * @param name of the ChildMonitored Object
- * </p>
  */
     public MonitoredObject getChild(String name);
 /**
- * <p>
  * Gets all the Children registered under this instance of Monitored
  * Object.
- * </p>
- * <p>
  *
  * @return Collection of immediate Children associated with this MonitoredObject.
- * </p>
  */
     public Collection getChildren();
 /**
- * <p>
  * Sets the parent for this Monitored Object.
- * </p>
- * <p>
- * </p>
  */
     public void setParent( MonitoredObject m );
 /**
- * <p>
  * There will be only one parent for an instance of MontoredObject, this
  * call gets parent and returns null if the Monitored Object is the root.
- * </p>
- * <p>
  *
  * @return a MonitoredObject which is a Parent of this Monitored Object instance
- * </p>
  */
     public MonitoredObject getParent();
 
 /**
- * <p>
  * Adds the attribute with the given name.
- * </p>
- * <p>
  *
- * </p>
- * <p>
  * @param value is the MonitoredAttribute which will be set as one of the
  * attribute of this MonitoredObject.
- * </p>
  */
     public void addAttribute(MonitoredAttribute value);
 /**
- * <p>
  * Removes the attribute with the given name.
- * </p>
- * <p>
  *
- * </p>
- * <p>
  * @param name is the MonitoredAttribute name
- * </p>
  */
     public void removeAttribute(String name);
 
 /**
- * <p>
  * Gets the Monitored Object registered by the given name
- * </p>
  *
- * <p>
  * @return a MonitoredAttribute identified by the given name
- * </p>
- * <p>
  * @param name of the attribute
- * </p>
  */
     public MonitoredAttribute getAttribute(String name);
 /**
- * <p>
  * Gets all the Monitored Attributes for this Monitored Objects. It doesn't
  * include the Child Monitored Object, that needs to be traversed using
  * getChild() or getChildren() call.
- * </p>
- * <p>
  *
  * @return Collection of all the Attributes for this MonitoredObject
- * </p>
  */
     public Collection getAttributes();
 /**
- * <p>
  * Clears the state of all the Monitored Attributes associated with the
  * Monitored Object. It will also clear the state on all it's child
  * Monitored Object. The call to clearState will be initiated from
  * CORBAMBean.startMonitoring() call.
- * </p>
- *
  */
     public void clearState();
 
--- a/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringFactories.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringFactories.java	Tue May 05 15:17:13 2015 +0400
@@ -29,17 +29,13 @@
 import com.sun.corba.se.impl.monitoring.MonitoringManagerFactoryImpl;
 
 /**
- * <p>
+ * @author Hemanth Puttaswamy
  *
- * @author Hemanth Puttaswamy
- * </p>
- * <p>
  *  This is used for getting the default factories for
  *  MonitoredObject, MonitoredAttributeInfo and MonitoringManager. We do not
  *  expect users to use the MonitoredAttributeInfo factory most of the time
  *  because the Info is automatically built by StringMonitoredAttributeBase
  *  and LongMonitoredAttributeBase.
- *  </p>
  */
 public class MonitoringFactories {
     ///////////////////////////////////////
@@ -57,20 +53,15 @@
     // operations
 
 /**
- * <p>
  * Gets the MonitoredObjectFactory
- * </p>
- * <p>
  *
  * @return a MonitoredObjectFactory
- * </p>
  */
     public static MonitoredObjectFactory getMonitoredObjectFactory( ) {
         return monitoredObjectFactory;
     }
 
 /**
- * <p>
  * Gets the MonitoredAttributeInfoFactory. The user is not expected to use this
  * Factory, since the MonitoredAttributeInfo is internally created by
  * StringMonitoredAttributeBase, LongMonitoredAttributeBase and
@@ -79,11 +70,8 @@
  * build a DoubleMonitoredAttributeBase like LongMonitoredAttributeBase
  * and build a MonitoredAttributeInfo required by MonitoredAttributeBase
  * internally by using this Factory.
- * </p>
- * <p>
  *
  * @return a MonitoredAttributeInfoFactory
- * </p>
  */
     public static MonitoredAttributeInfoFactory
         getMonitoredAttributeInfoFactory( )
@@ -92,18 +80,14 @@
     }
 
 /**
- * <p>
  * Gets the MonitoredManagerFactory. The user is not expected to use this
  * Factory, since the ORB will be automatically initialized with the
  * MonitoringManager.
  *
  * User can get hold of MonitoringManager associated with ORB by calling
  * orb.getMonitoringManager( )
- * </p>
- * <p>
  *
  * @return a MonitoredManagerFactory
- * </p>
  */
     public static MonitoringManagerFactory getMonitoringManagerFactory( ) {
         return monitoringManagerFactory;
--- a/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManager.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManager.java	Tue May 05 15:17:13 2015 +0400
@@ -30,15 +30,11 @@
 import java.util.*;
 
 /**
- * <p>
  * Monitoring Manager will have a 1 to 1 association with the ORB. This
  * gives access to the top level Monitored Object, using which more
  * Monitored Objects and Attributes can be added and traversed.
- * </p>
- * <p>
  *
  * @author Hemanth Puttaswamy
- * </p>
  */
 public interface MonitoringManager extends Closeable {
 
@@ -46,23 +42,14 @@
   // operations
 
 /**
- * <p>
  * Gets the Root Monitored Object which contains a Hierarchy Of Monitored
  * Objects exposing various Monitorable Attributes of Various modules.
- * </p>
- * <p>
- *
- * @param MonitoredObject ...
- * </p>
  */
     public MonitoredObject getRootMonitoredObject();
 /**
- * <p>
  * Initialize is called whenever there is a start monitoring call to CORBA
  * MBean. This will result in triaging initialize to all the
  * MonitoredObjects and it's Monitored Attributes.
- * </p>
- *
  */
     public void clearState();
 
--- a/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManagerFactory.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManagerFactory.java	Tue May 05 15:17:13 2015 +0400
@@ -25,14 +25,10 @@
 package com.sun.corba.se.spi.monitoring;
 
 /**
- * <p>
+ * @author Hemanth Puttaswamy
  *
- * @author Hemanth Puttaswamy
- * </p>
- * <p>
  * MonitoringObjectFactory is used internally by the ORB, It is not for
  * general public use.
- * </p>
  */
 public interface MonitoringManagerFactory {
     /**
--- a/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticMonitoredAttribute.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticMonitoredAttribute.java	Tue May 05 15:17:13 2015 +0400
@@ -27,15 +27,11 @@
 import java.util.*;
 
 /**
- * <p>
+ * @author Hemanth Puttaswamy
  *
- * @author Hemanth Puttaswamy
- * </p>
- * <p>
  * StatisticsMonitoredAttribute is provided as a convenience to collect the
  * Statistics of any entity. The getValue() call will be delegated to the
  * StatisticsAccumulator set by the user.
- * </p>
  */
 public class StatisticMonitoredAttribute extends MonitoredAttributeBase {
 
@@ -55,32 +51,19 @@
 
 
 /**
- * <p>
  * Constructs the StaisticMonitoredAttribute, builds the required
  * MonitoredAttributeInfo with Long as the class type and is always
  * readonly attribute.
- * </p>
- * <p>
  *
  * @param name Of this attribute
- * </p>
- * <p>
- * @return a StatisticMonitoredAttribute
- * </p>
- * <p>
  * @param desc should provide a good description on the kind of statistics
  * collected, a good example is "Connection Response Time Stats will Provide the
  * detailed stats based on the samples provided from every request completion
  * time"
- * </p>
- * <p>
  * @param s is the StatisticsAcumulator that user will use to accumulate the
  * samples and this Attribute Object will get the computed statistics values
  * from.
- * </p>
- * <p>
  * @param mutex using which clearState() and getValue() calls need to be locked.
- * </p>
  */
     public  StatisticMonitoredAttribute(String name, String desc,
         StatisticsAccumulator s, Object mutex)
--- a/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticsAccumulator.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticsAccumulator.java	Tue May 05 15:17:13 2015 +0400
@@ -27,11 +27,8 @@
 import java.util.*;
 
 /**
- * <p>
+ * @author Hemanth Puttaswamy
  *
- * @author Hemanth Puttaswamy
- * </p>
- * <p>
  * StatisticsAccumulator accumulates the samples provided by the user and
  * computes the value of minimum, maximum, sum and sample square sum. When
  * the StatisticMonitoredAttribute calls getValue(), it will compute all
@@ -42,7 +39,6 @@
  * Users can easily extend this class and provide the implementation of
  * toString() method to format the stats as desired. By default all the stats
  * are printed in a single line.
- * </p>
  */
 public class StatisticsAccumulator {
 
@@ -72,19 +68,12 @@
 
 
 /**
- * <p>
  * User will use this method to just register a sample with the
  * StatisticsAccumulator. This is the only method that User will use to
  * expose the statistics, internally the StatisticMonitoredAttribute will
  * collect the information when requested from the ASAdmin.
- * </p>
- * <p>
- *
- * </p>
- * <p>
  *
  * @param value a double value to make it more precise
- * </p>
  */
     public void sample(double value) {
         sampleCount++;
@@ -137,19 +126,11 @@
     }
 
 /**
- * <p>
  * Construct the Statistics Accumulator by providing the unit as a String.
- * The examples of units are &quot;Hours&quot;, &quot;Minutes&quot;,
- * &quot;Seconds&quot;, &quot;MilliSeconds&quot;, &quot;Micro Seconds&quot;
- * etc.,
- * </p>
- * <p>
+ * The examples of units are "Hours", "Minutes",
+ * "Seconds", "MilliSeconds", "Micro Seconds" etc.
  *
- * @return a StatisticsAccumulator with ...
- * </p>
- * <p>
  * @param unit a String representing the units for the samples collected
- * </p>
  */
     public StatisticsAccumulator( String unit ) {
         this.unit = unit;
--- a/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java	Tue May 05 15:17:13 2015 +0400
@@ -27,14 +27,10 @@
 import java.util.*;
 
 /**
- * <p>
+ * @author Hemanth Puttaswamy
  *
- * @author Hemanth Puttaswamy
- * </p>
- * <p>
  * A Convenient Abstraction to present String type Monitored Attribute. One
  * of the examples of StringMonitoredAttribute is the State information.
- * </p>
  */
 public abstract class StringMonitoredAttributeBase
     extends MonitoredAttributeBase
@@ -45,20 +41,11 @@
 
 
 /**
- * <p>
  * Constructs StringMonitoredAttribute with the MonitoredAttributeInfo
  * built with the class type of String.
- * </p>
- * <p>
  *
  * @param name of this attribute
- * </p>
- * <p>
  * @param description of this attribute
- * </p>
- * <p>
- * @return a StringMonitoredAttributeBase
- * </p>
  */
     public  StringMonitoredAttributeBase(String name, String description) {
         super( name );
--- a/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapter.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapter.java	Tue May 05 15:17:13 2015 +0400
@@ -111,7 +111,7 @@
 *   <li>oa.returnServant()</li>
 *   <li>oa.exit()</li>
 *   <li>pop info</li>
-*   <ol>
+*   </ol>
 * </li>
 * REVISIT: Is this the required order for exit/pop?  Cna they be nested instead?
 * Note that getInvocationServant and returnServant may throw exceptions.  In such cases,
--- a/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Action.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Action.java	Tue May 05 15:17:13 2015 +0400
@@ -46,8 +46,8 @@
         * in the state machine, as the state could be corrupted.
         * Any exception thrown by the Action for the transition
         * will be propagated to doIt.
-        * @param FSM fsm is the state machine causing this action.
-        * @param Input in is the input that caused the transition.
+        * @param fsm the state machine causing this action.
+        * @param in  the input that caused the transition.
         */
         public void doIt( FSM fsm, Input in ) ;
 }
--- a/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContext.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContext.java	Tue May 05 15:17:13 2015 +0400
@@ -42,9 +42,8 @@
 * the service context and provides any needed methods for manipulating
 * the service context.  Each subclass must provide the following
 * members:
-* <p>
 * <ul>
-* </li>a public static final int SERVICE_CONTEXT_ID that gives the OMG
+* <li>a public static final int SERVICE_CONTEXT_ID that gives the OMG
 * (or other) defined id for the service context.  This is needed for the
 * registration mechanism defined in ServiceContexts. OMG defined
 * service context ids are taken from section 13.6.7 of ptc/98-12-04.</li>
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/AttributeEntry.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/AttributeEntry.java	Tue May 05 15:17:13 2015 +0400
@@ -80,7 +80,7 @@
   } // generate
 
   /** Access the attribute generator.
-      @returns an object which implements the AttributeGen interface.
+      @return an object which implements the AttributeGen interface.
       @see AttributeGen */
   public Generator generator ()
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ConstEntry.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ConstEntry.java	Tue May 05 15:17:13 2015 +0400
@@ -90,7 +90,7 @@
   } // generate
 
   /** Access the constant generator.
-      @returns an object which implements the ConstGen interface.
+      @return an object which implements the ConstGen interface.
       @see ConstGen */
   public Generator generator ()
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/EnumEntry.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/EnumEntry.java	Tue May 05 15:17:13 2015 +0400
@@ -84,7 +84,7 @@
   } // generate
 
   /** Access the enumerator generator.
-      @returns an object which implements the EnumGen interface.
+      @return an object which implements the EnumGen interface.
       @see EnumGen */
   public Generator generator ()
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ExceptionEntry.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ExceptionEntry.java	Tue May 05 15:17:13 2015 +0400
@@ -80,7 +80,7 @@
   } // generate
 
   /** Access the exception generator.
-      @returns an object which implements the ExceptionGen interface.
+      @return an object which implements the ExceptionGen interface.
       @see ExceptionGen */
   public Generator generator ()
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardEntry.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardEntry.java	Tue May 05 15:17:13 2015 +0400
@@ -83,7 +83,7 @@
   } // generate
 
   /** Access the interface generator.
-      @returns an object which implements the InterfaceGen interface.
+      @return an object which implements the InterfaceGen interface.
       @see InterfaceGen */
   public Generator generator ()
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardValueEntry.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardValueEntry.java	Tue May 05 15:17:13 2015 +0400
@@ -79,7 +79,7 @@
   } // generate
 
   /** Access the interface generator.
-      @returns an object which implements the ForwardValueGen interface.
+      @return an object which implements the ForwardValueGen interface.
       @see ValueGen */
   public Generator generator ()
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/IncludeEntry.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/IncludeEntry.java	Tue May 05 15:17:13 2015 +0400
@@ -81,7 +81,7 @@
   } // generate
 
   /** Access the Include type generator.
-      @returns an object which implements the IncludeGen interface.
+      @return an object which implements the IncludeGen interface.
       @see IncludeGen */
   public Generator generator ()
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceEntry.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceEntry.java	Tue May 05 15:17:13 2015 +0400
@@ -111,7 +111,7 @@
   } // generate
 
   /** Access the interface generator.
-      @returns an object which implements the InterfaceGen interface.
+      @return an object which implements the InterfaceGen interface.
       @see InterfaceGen */
   public Generator generator ()
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/MethodEntry.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/MethodEntry.java	Tue May 05 15:17:13 2015 +0400
@@ -89,7 +89,7 @@
   } // generate
 
   /** Access the method generator.
-      @returns an object which implements the MethodGen interface.
+      @return an object which implements the MethodGen interface.
       @see MethodGen */
   public Generator generator ()
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ModuleEntry.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ModuleEntry.java	Tue May 05 15:17:13 2015 +0400
@@ -84,7 +84,7 @@
   } // generate
 
   /** Access the module generator.
-      @returns an object which implements the ModuleGen interface.
+      @return an object which implements the ModuleGen interface.
       @see ModuleGen */
   public Generator generator ()
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/NativeEntry.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/NativeEntry.java	Tue May 05 15:17:13 2015 +0400
@@ -73,7 +73,7 @@
   } // generate
 
   /** Access the constant generator.
-      @returns an object which implements the ConstGen interface.
+      @return an object which implements the ConstGen interface.
       @see ConstGen */
   public Generator generator ()
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ParameterEntry.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ParameterEntry.java	Tue May 05 15:17:13 2015 +0400
@@ -88,7 +88,7 @@
   } // generate
 
   /** Access the parameter generator.
-      @returns an object which implements the ParameterGen interface.
+      @return an object which implements the ParameterGen interface.
       @see ParameterGen */
   public Generator generator ()
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PragmaEntry.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PragmaEntry.java	Tue May 05 15:17:13 2015 +0400
@@ -80,7 +80,7 @@
   } // generate
 
   /** Access the Include type generator.
-      @returns an object which implements the IncludeGen interface.
+      @return an object which implements the IncludeGen interface.
       @see IncludeGen */
   public Generator generator ()
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PrimitiveEntry.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PrimitiveEntry.java	Tue May 05 15:17:13 2015 +0400
@@ -81,7 +81,7 @@
   } // generate
 
   /** Access the primitive type generator.
-      @returns an object which implements the PrimitiveGen interface.
+      @return an object which implements the PrimitiveGen interface.
       @see PrimitiveGen */
   public Generator generator ()
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/RepositoryID.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/RepositoryID.java	Tue May 05 15:17:13 2015 +0400
@@ -68,8 +68,8 @@
   /**
    * Determine is a supplied string meets the minimal format requirement
    * for a Repository ID.
-   * @return true iff supplied string has form '<format>:<string>', where
-   * <format> is any non-empty string not containing ':'.
+   * @return true if supplied string has form {@code '<format>:<string>'}, where
+   * {@code <format>} is any non-empty string not containing ':'.
    **/
   public static boolean hasValidForm (String string)
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SequenceEntry.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SequenceEntry.java	Tue May 05 15:17:13 2015 +0400
@@ -101,7 +101,7 @@
   } // generate
 
   /** Access the sequence generator.
-      @returns an object which implements the SequenceGen interface.
+      @return an object which implements the SequenceGen interface.
       @see SequenceGen */
   public Generator generator ()
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StringEntry.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StringEntry.java	Tue May 05 15:17:13 2015 +0400
@@ -91,7 +91,7 @@
   } // generate
 
   /** Access the primitive type generator.
-      @returns an object which implements the PrimitiveGen interface.
+      @return an object which implements the PrimitiveGen interface.
       @see PrimitiveGen */
   public Generator generator ()
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StructEntry.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StructEntry.java	Tue May 05 15:17:13 2015 +0400
@@ -90,7 +90,7 @@
   } // generate
 
   /** Access the struct generator.
-      @returns an object which implements the StructGen interface.
+      @return an object which implements the StructGen interface.
       @see StructGen */
   public Generator generator ()
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabEntry.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabEntry.java	Tue May 05 15:17:13 2015 +0400
@@ -127,7 +127,7 @@
 
   /** Get the name of this entry's module.  If there are modules within
       modules, each module name is separated by '/'.
-      @returns this entry's module name. */
+      @return this entry's module name. */
   public String module ()
   {
     return _module;
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabFactory.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabFactory.java	Tue May 05 15:17:13 2015 +0400
@@ -97,7 +97,7 @@
       char, octet, short, long, etc.  The reason it is not limited to
       these is that, as an extender, you may wish to override these names.
       For instance, when generating Java code, octet translates to byte,
-      so there is an entry in Compile.overrideNames:  <"octet", "byte">
+      so there is an entry in Compile.overrideNames: {@code <"octet", "byte">}
       and a PrimitiveEntry in the symbol table for "byte". */
   PrimitiveEntry primitiveEntry (String name);
 
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Token.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Token.java	Tue May 05 15:17:13 2015 +0400
@@ -332,7 +332,7 @@
   * @param boolean[] collidesWithKeyword is an array containing one value: a flag
   * representing whether this string is an identifier that collides with a keyword.
   * This is set by this method.
-  * @returns Token The resulting Token corresponding to string.
+  * @return Token The resulting Token corresponding to string.
   */
   public static Token makeKeywordToken(
     String string, float corbaLevel, boolean escapedOK, boolean[] collision )
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/TypedefEntry.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/TypedefEntry.java	Tue May 05 15:17:13 2015 +0400
@@ -110,7 +110,7 @@
   }
 
   /** Access the typedef generator.
-      @returns an object which implements the TypedefGen interface.
+      @return an object which implements the TypedefGen interface.
       @see TypedefGen */
   public Generator generator ()
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionEntry.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionEntry.java	Tue May 05 15:17:13 2015 +0400
@@ -93,7 +93,7 @@
   } // generate
 
   /** Access the union generator.
-      @returns an object which implements the UnionGen interface.
+      @return an object which implements the UnionGen interface.
       @see UnionGen */
   public Generator generator ()
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueBoxEntry.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueBoxEntry.java	Tue May 05 15:17:13 2015 +0400
@@ -77,7 +77,7 @@
   } // generate
 
   /** Access the value generator.
-      @returns an object which implements the ValueGen interface.
+      @return an object which implements the ValueGen interface.
       @see ValueGen */
   public Generator generator ()
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueEntry.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueEntry.java	Tue May 05 15:17:13 2015 +0400
@@ -86,7 +86,7 @@
   } // generate
 
   /** Access the value generator.
-      @returns an object which implements the ValueGen interface.
+      @return an object which implements the ValueGen interface.
       @see ValueGen */
   public Generator generator ()
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Terminal.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Terminal.java	Tue May 05 15:17:13 2015 +0400
@@ -43,11 +43,11 @@
 /**
  * This class contains values.  Objects of this class are the terminal
  * nodes of an expression tree.
- * <b>
+ * <p>
  * Note that there is a constructor for Double values, but not Float.
  * CORBA defines that all floating point expressions are evaluated as
  * double, and that the result is coerced back to float if necessary.
- * <b>
+ * <p>
  * Note also that there is a constructor for long values, but not for
  * int or short.  CORBA defines that all integral expressions are evaluated
  * as unsigned long.  A CORBA long is a Java int.  There is no unsigned int
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Arguments.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Arguments.java	Tue May 05 15:17:13 2015 +0400
@@ -260,7 +260,7 @@
   } // packageFromProps
 
   /**
-   * d57482 <klr> method added so default emitter check could be overriden.
+   * d57482 (klr) method added so default emitter check could be overriden.
    **/
   protected void setDefaultEmitter () {
       // If the flag -fclient was not found, assume it.
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen24.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen24.java	Tue May 05 15:17:13 2015 +0400
@@ -64,7 +64,7 @@
   } // ctor
 
   /**
-   * <d62023-klr> Added for 2.4 RTF
+   * (d62023-klr) Added for 2.4 RTF
    **/
   protected void abstractMethod (Hashtable symbolTable, MethodEntry m, PrintWriter stream)
   {
@@ -83,7 +83,7 @@
   } // abstractMethod
 
   /**
-   * <d62023-klr> Added for 2.4 RTF
+   * (d62023-klr) Added for 2.4 RTF
    **/
   protected void interfaceMethod (Hashtable symbolTable, MethodEntry m, PrintWriter stream)
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper24.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper24.java	Tue May 05 15:17:13 2015 +0400
@@ -70,7 +70,7 @@
   /**
    * Generate the heading, including package, imports, class statements,
    * and open curly.
-   * <d62023> - don't implement ValueHelper, make non-boxed helpers abstract
+   * d62023 - don't implement ValueHelper, make non-boxed helpers abstract
    **/
   protected void writeHeading ()
   {
@@ -92,8 +92,10 @@
 
   /**
    * Generate the instance variables.
-   * <d62023> - no helper instance except for boxed valuetypes.
-   *          - move truncatable_ids to mapped class.
+   * <pre>
+   * d62023 - no helper instance except for boxed valuetypes;
+   *        - move truncatable_ids to mapped class.
+   * </pre>
    **/
   protected void writeInstVars ()
   {
@@ -110,9 +112,9 @@
   } // writeInstVars
 
   /**
-   * <d62023> generate members of BoxedValueHelper interface if boxed
+   * d62023 - generate members of BoxedValueHelper interface if boxed
    *
-   * <d62023> Hook in here to write factory methods for non-boxed ValueTypes
+   * d62023 - hook in here to write factory methods for non-boxed ValueTypes
    *          into Helper.
    **/
   protected void writeValueHelperInterface ()
@@ -143,8 +145,8 @@
   } // writeHelperFactories
 
   /**
-   * <d62023> Generate constructors only for boxed valuetype helpers
-   *            All other helpers are abstract.
+   * d62023 - generate constructors only for boxed valuetype helpers.
+   *          All other helpers are abstract.
    **/
   protected void writeCtors ()
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/InterfaceGen.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/InterfaceGen.java	Tue May 05 15:17:13 2015 +0400
@@ -190,17 +190,19 @@
 
   /**
    * Generate the interface. Provides general algorithm for binding generation:
-   * 1.) Initialize members unique to this generator. - init ()
-   * 2.) Open print stream - openStream ()
-   * 3.) Write class heading (package, prologue, class statement, open curly - writeHeading ()
-   * 4.) Write class body (member data and methods) - write*Body ()
-   * 5.) Write class closing (close curly) - writeClosing ()
-   * 6.) Close the print stream - closeStream ()
+   * <ol>
+   * <li> Initialize members unique to this generator - init()</li>
+   * <li> Open print stream - openStream()</li>
+   * <li> Write class heading (package, prologue, class statement, open curly - writeHeading()</li>
+   * <li> Write class body (member data and methods) - write*Body()</li>
+   * <li> Write class closing (close curly) - writeClosing()</li>
+   * <li> Close the print stream - closeStream ()</li>
+   * </ol>
    *
    * For CORBA 2.3, interfaces are mapped to Operations and Signature
    * interfaces. The Operations interface contains the method definitions.
    * The Signature interface extends the Operations interface and adds
-   * CORBA::Object. <klr>
+   * CORBA::Object. (klr)
    **/
   protected void generateInterface ()
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGen24.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGen24.java	Tue May 05 15:17:13 2015 +0400
@@ -96,7 +96,7 @@
   }
 
   /**
-   * <d62023> Write the methodEntry for a valuetype factory method into
+   * d62023 - write the methodEntry for a valuetype factory method into
    *          the Value Helper class. Contents from email from Simon,
    *          4/25/99.
    **/
@@ -135,7 +135,7 @@
   } // helperFactoryMethod
 
   /**
-   * <d62023> - write an abstract method definition
+   * d62023 - write an abstract method definition
    **/
   protected void abstractMethod (Hashtable symbolTable, MethodEntry m, PrintWriter stream)
   {
@@ -152,8 +152,8 @@
   } // abstractMethod
 
   /**
-   * <d62023> - write a default factory method implementation for the
-   *            <value>DefaultFactory. m is a methodEntry for a factory
+   * d62023   - write a default factory method implementation for the
+   *            {@code <value>DefaultFactory}. m is a methodEntry for a factory
    *            method contained in a non-abstract ValueEntry.
    **/
   protected void defaultFactoryMethod (Hashtable symbolTable, MethodEntry m, PrintWriter stream)
@@ -176,7 +176,7 @@
   } // defaultFactoryMethod
 
   /**
-   * <d62023> - remove all valueInitializer junk
+   * d62023 - remove all valueInitializer junk
    **/
   protected void writeMethodSignature ()
   {
@@ -242,7 +242,7 @@
   } // writeMethodSignature
 
   /**
-   * <d62023> - delete method templates for valuetypes
+   * d62023 - delete method templates for valuetypes
    **/
   protected void interfaceMethod (Hashtable symbolTable, MethodEntry m, PrintWriter stream)
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGenClone24.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGenClone24.java	Tue May 05 15:17:13 2015 +0400
@@ -74,7 +74,7 @@
   } // ctor
 
   /**
-   * <d62023> - write an abstract method definition
+   * d62023 - write an abstract method definition
    **/
   protected void abstractMethod (Hashtable symbolTable, MethodEntry m, PrintWriter stream)
   {
@@ -91,7 +91,7 @@
   } // abstractMethod
 
   /**
-   * <d62023> - delete method templates for valuetypes
+   * d62023 - delete method templates for valuetypes
    **/
   protected void interfaceMethod (Hashtable symbolTable, MethodEntry m, PrintWriter stream)
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen24.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen24.java	Tue May 05 15:17:13 2015 +0400
@@ -69,7 +69,7 @@
   } // ctor
 
   /**
-   * <d62023> - Move from helper to mapped class
+   * d62023 - Move from helper to mapped class
    **/
   protected void writeTruncatable () // <d60929>
   {
@@ -84,7 +84,7 @@
 
 
   /**
-   * <d62023>
+   * d62023
    **/
   public void helperRead (String entryName, SymtabEntry entry, PrintWriter stream)
   {
@@ -144,7 +144,7 @@
   } // helperWrite
 
   /**
-   * <d62023>
+   * d62023
    **/
   public int write (int index, String indent, String name, SymtabEntry entry, PrintWriter stream)
   {
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen24.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen24.java	Tue May 05 15:17:13 2015 +0400
@@ -73,15 +73,17 @@
   } // ctor
 
   /**
-   * <d62023> - delete constructor; helper is abstract
+   * d62023 - delete constructor; helper is abstract
    **/
   protected void writeConstructor ()
   {
   } // writeConstructor
 
   /**
-   * <d62023> - delete write_value from non-boxed helpers
-   *          - delete _write from non-boxed helpers
+   * <pre>
+   * d62023 - delete write_value from non-boxed helpers
+   *        - delete _write from non-boxed helpers
+   * </pre>
    **/
   public void helperWrite (SymtabEntry entry, PrintWriter stream)
   {
@@ -91,7 +93,7 @@
   } // helperWrite
 
   /**
-   * <d62023>
+   * d62023
    **/
   public void helperRead (String entryName, SymtabEntry entry, PrintWriter stream)
   {
@@ -101,7 +103,7 @@
   } // helperRead
 
   /**
-   * <d62023> - suppress initializers from mapped value; now generated in
+   * d62023 - suppress initializers from mapped value; now generated in
    *    the Helper class and Factory class
    **/
   protected void writeInitializers ()
@@ -110,7 +112,7 @@
   } // writeInitializers
 
   /**
-   * <d62023> - Goes in mapped class, not Helper
+   * d62023 - goes in mapped class, not Helper
    **/
   protected void writeTruncatable () // <d60929>
   {
@@ -155,7 +157,7 @@
   }
 
   /**
-   * <d62023> CustomMarshal -> CustomValue for custom valuetypes
+   * d62023 - CustomMarshal {@literal ->} CustomValue for custom valuetypes
    *          mapped class is abstract
    **/
   protected void writeHeading ()
@@ -217,7 +219,7 @@
   } // writeHeading
 
   /**
-   * <d62023> - private state maps to protected, not default
+   * d62023 - private state maps to protected, not default
    **/
   protected void writeMembers ()
   {
@@ -245,8 +247,7 @@
   } // writeMembers
 
   /**
-   * <d62023> Methods need to be abstract
-   *          writeStreamable
+   * d62023 - methods need to be abstract writeStreamable
    **/
   protected void writeMethods ()
   {
@@ -294,7 +295,7 @@
   } // writeMethods
 
   /**
-   * <d62023> Call super._read()
+   * d62023 - call super._read()
    **/
   public int read (int index, String indent, String name, SymtabEntry entry, PrintWriter stream)
   {
@@ -335,7 +336,7 @@
   } // read
 
   /**
-   * <d62023> Call super._write()
+   * d62023 - call super._write()
    **/
   public int write (int index, String indent, String name, SymtabEntry entry, PrintWriter stream)
   {
@@ -374,7 +375,7 @@
   } // write
 
   /**
-   * <62023> - generate factory interface and default factory
+   * d62023 - generate factory interface and default factory
    **/
   public void generate (Hashtable symbolTable, ValueEntry v, PrintWriter str)
   {
--- a/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Type.java	Thu Apr 30 13:02:02 2015 -0700
+++ b/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Type.java	Tue May 05 15:17:13 2015 +0400
@@ -51,7 +51,7 @@
  * conformance checking and name mapping as defined in the "Java to IDL
  * Mapping" OMG specification.  The family is composed of the following
  * fixed set of types:
- * <pre>
+ * <pre>{@literal
  *
  *                                              +- RemoteType <-- AbstractType
  *                                              |
@@ -67,7 +67,7 @@
  *                                              |
  *                                              +- NCClassType
  *
- * </pre>
+ * }</pre>
  * PrimitiveType represents a primitive or a void type.
  * <p>
  * CompoundType is an abstract base representing any non-special class