--- old/src/java.corba/share/classes/org/omg/CosNaming/nameservice.idl 2015-04-07 20:40:42.738505001 +0400 +++ new/src/java.corba/share/classes/org/omg/CosNaming/nameservice.idl 2015-04-07 20:40:42.622505006 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015, 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 @@ -64,12 +64,12 @@ Istring id; Istring kind; }; - + /** * A name is a sequence of name components. */ typedef sequence Name; - + /** * Specifies whether the given binding is for a object (that is not a * naming context) or for a naming context. @@ -79,7 +79,7 @@ nobject, // name is bound to an object ncontext // name is bound to a naming context }; - + /** * A name-to-object association is called a Binding. */ @@ -89,12 +89,12 @@ BindingType binding_type; // whether name is bound to an object // or a naming context }; - + /** * List of Bindings. */ - typedef sequence BindingList; - + typedef sequence BindingList; + /** * The BindingIterator interface allows a client to iterate through * the bindings using the next_one or next_n operations. @@ -112,24 +112,24 @@ * @param b the returned binding */ boolean next_one(out Binding b); - + /** * This operation returns at most the requested number of bindings. * - * @param how_many the maximum number of bindings tro return

+ * @param how_many the maximum number of bindings to return * * @param bl the returned bindings */ boolean next_n(in unsigned long how_many, - out BindingList bl); - + out BindingList bl); + // Destroy binding iterator /** * This operation destroys the iterator. */ void destroy(); }; - + /** * A naming context is an object that contains a set of name bindings in * which each name is unique. Different names can be bound to an object @@ -151,7 +151,7 @@ not_context, not_object }; - + /** * Indicates the name does not identify a binding. */ @@ -160,7 +160,7 @@ NotFoundReason why; Name rest_of_name; }; - + /** * Indicates that the implementation has given up for some reason. * The client, however, may be able to continue the operation at the @@ -171,130 +171,130 @@ NamingContext cxt; Name rest_of_name; }; - + /** * Indicates the name is invalid. */ exception InvalidName - {}; - + {}; + /** * Indicates an object is already bound to the specified name. Only * one object can be bound to a particular name in a context. */ exception AlreadyBound {}; - + /** * Indicates that the Naming Context contains bindings. */ exception NotEmpty {}; - + /** * Creates a binding of a name and an object in the naming context. * Naming contexts that are bound using bind do not participate in name * resolution when compound names are passed to be resolved. * - * @param n Name of the object

+ * @param n Name of the object. * - * @param obj The Object to bind with the given name

+ * @param obj The Object to bind with the given name. * * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates - * the name does not identify a binding.

+ * the name does not identify a binding. * * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed * Indicates that the implementation has given up for some reason. * The client, however, may be able to continue the operation - * at the returned naming context.

+ * at the returned naming context. * * @exception org.omg.CosNaming.NamingContextPackage.InvalidName - * Indicates that the name is invalid.

+ * Indicates that the name is invalid. * * @exception org.omg.CosNaming.NamingContextPackage.AlreadyBound - * Indicates an object is already bound to the specified name.

+ * Indicates an object is already bound to the specified name. */ void bind(in Name n, - in Object obj) + in Object obj) raises(NotFound, - CannotProceed, - InvalidName, - AlreadyBound); - + CannotProceed, + InvalidName, + AlreadyBound); + /** * Names an object that is a naming context. Naming contexts that * are bound using bind_context() participate in name resolution * when compound names are passed to be resolved. * - * @param n Name of the object

+ * @param n Name of the object. * - * @param nc NamingContect object to bind with the given name

+ * @param nc NamingContect object to bind with the given name. * - * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.

+ * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding. * * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed Indicates that the implementation has * given up for some reason. The client, however, may be able to - * continue the operation at the returned naming context.

+ * continue the operation at the returned naming context. * - * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid.

+ * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid. * * @exception org.omg.CosNaming.NamingContextPackage.AlreadyBound Indicates an object is already - * bound to the specified name.

+ * bound to the specified name. */ void bind_context(in Name n, - in NamingContext nc) + in NamingContext nc) raises(NotFound, - CannotProceed, - InvalidName, - AlreadyBound); - + CannotProceed, + InvalidName, + AlreadyBound); + /** * Creates a binding of a name and an object in the naming context * even if the name is already bound in the context. Naming contexts * that are bound using rebind do not participate in name resolution * when compound names are passed to be resolved. * - * @param n Name of the object

+ * @param n Name of the object. * - * @param obj The Object to rebind with the given name

+ * @param obj The Object to rebind with the given name. * - * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.

+ * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding. * * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed Indicates that the implementation has * given up for some reason. The client, however, may be able to - * continue the operation at the returned naming context.

+ * continue the operation at the returned naming context. * - * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid.

+ * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid. */ void rebind(in Name n, - in Object obj) + in Object obj) raises(NotFound, - CannotProceed, - InvalidName); - + CannotProceed, + InvalidName); + /** * Creates a binding of a name and a naming context in the naming * context even if the name is already bound in the context. Naming * contexts that are bound using rebind_context() participate in name * resolution when compound names are passed to be resolved. * - * @param n Name of the object

+ * @param n Name of the object. * - * @param nc NamingContect object to rebind with the given name

+ * @param nc NamingContect object to rebind with the given name. * - * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.

+ * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding. * * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed Indicates that the implementation has * given up for some reason. The client, however, may be able to - * continue the operation at the returned naming context.

+ * continue the operation at the returned naming context. * - * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid.

+ * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid. */ void rebind_context(in Name n, - in NamingContext nc) + in NamingContext nc) raises(NotFound, - CannotProceed, - InvalidName); + CannotProceed, + InvalidName); /** * The resolve operation is the process of retrieving an object @@ -304,39 +304,39 @@ * to the appropriate type. That is, clients typically cast the returned * object from Object to a more specialized interface. * - * @param n Name of the object

+ * @param n Name of the object. * - * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.

+ * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding. * * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed Indicates that the implementation has * given up for some reason. The client, however, may be able to - * continue the operation at the returned naming context.

+ * continue the operation at the returned naming context. * - * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid.

+ * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid. */ Object resolve(in Name n) raises(NotFound, - CannotProceed, - InvalidName); - + CannotProceed, + InvalidName); + /** * The unbind operation removes a name binding from a context. * - * @param n Name of the object

+ * @param n Name of the object. * - * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.

+ * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding. * * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed Indicates that the implementation has * given up for some reason. The client, however, may be able to - * continue the operation at the returned naming context.

+ * continue the operation at the returned naming context. * - * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid.

+ * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid. */ void unbind(in Name n) raises(NotFound, - CannotProceed, - InvalidName); - + CannotProceed, + InvalidName); + /** * The list operation allows a client to iterate through a set of * bindings in a naming context.

@@ -351,15 +351,15 @@ * bindings, the binding iterator is a nil object reference. * * - * @param how_many the maximum number of bindings to return

+ * @param how_many the maximum number of bindings to return. * - * @param bl the returned list of bindings

+ * @param bl the returned list of bindings. * - * @param bi the returned binding iterator

+ * @param bi the returned binding iterator. */ void list(in unsigned long how_many, - out BindingList bl, - out BindingIterator bi); + out BindingList bl, + out BindingIterator bi); /** * This operation returns a naming context implemented by the same @@ -367,7 +367,7 @@ * The new context is not bound to any name. */ NamingContext new_context(); - + /** * This operation creates a new context and binds it to the name * supplied as an argument. The newly-created context is implemented @@ -375,25 +375,25 @@ * is, the naming server that implements the context denoted by the * name argument excluding the last component). * - * @param n Name of the object

+ * @param n Name of the object. * - * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.

+ * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding. * * @exception org.omg.CosNaming.NamingContextPackage.AlreadyBound Indicates an object is already - * bound to the specified name.

+ * bound to the specified name. * * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed Indicates that the implementation has * given up for some reason. The client, however, may be able to - * continue the operation at the returned naming context.

+ * continue the operation at the returned naming context. * - * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid.

+ * @exception org.omg.CosNaming.NamingContextPackage.InvalidName Indicates that the name is invalid. */ NamingContext bind_new_context(in Name n) raises(NotFound, - AlreadyBound, - CannotProceed, - InvalidName); - + AlreadyBound, + CannotProceed, + InvalidName); + /** * The destroy operation deletes a naming context. If the naming * context contains bindings, the NotEmpty exception is raised. @@ -402,7 +402,7 @@ */ void destroy() raises(NotEmpty); - + }; @@ -413,7 +413,7 @@ * part of Interoperable Naming Service. * Different names can be bound to an object in the same or different * contexts at the same time. Using NamingContextExt, you can use - * URL-based names to bind and resolve.

+ * URL-based names to bind and resolve. * * See * CORBA COS @@ -425,86 +425,84 @@ * StringName is the Stringified Name, Array of Name Components * represented as a String. */ - typedef string StringName; + typedef string StringName; /** * Address is the Host and Port information represented as a String. */ - typedef string Address; - + typedef string Address; + /** * URLString is the URL address (corbaloc: or corbaname:) represented as * a String. */ - typedef string URLString; + typedef string URLString; /** * This operation creates a stringified name from the array of Name * components. * - * @param n Name of the object

+ * @param n Name of the object. * * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName - * Indicates the name does not identify a binding.

+ * Indicates the name does not identify a binding. * */ - StringName to_string( in Name n ) raises (InvalidName); + StringName to_string( in Name n ) raises (InvalidName); /** * This operation converts a Stringified Name into an equivalent array - * of Name Components. + * of Name Components. * - * @param sn Stringified Name of the object

+ * @param sn Stringified Name of the object. * * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName - * Indicates the name does not identify a binding.

+ * Indicates the name does not identify a binding. * */ - Name to_name( in StringName sn ) raises (InvalidName); + Name to_name( in StringName sn ) raises (InvalidName); /** * Indicates the invalid Stringified name for the object, The * reason could be invalid syntax. */ - exception InvalidAddress - { }; + exception InvalidAddress + { }; /** * 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

- * @param sn Stringified Name of the object

+ * @param addr internet based address of the host machine where 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.

+ * 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

- * - */ - URLString to_url( in Address addr, in StringName sn ) - raises( InvalidAddress, InvalidName ); + * Indicates the internet based address of the host machine is incorrect + */ + URLString to_url( in Address addr, in StringName sn ) + raises( InvalidAddress, InvalidName ); /** * This operation resolves the Stringified name into the object * reference. * - * @param sn Stringified Name of the object

+ * @param sn Stringified Name of the object. * * @exception org.omg.CosNaming.NamingContextPackage.NotFound - * Indicates there is no object reference for the given name.

+ * Indicates there is no object reference for the given name. * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed - * Indicates that the given compound name is incorrect

+ * Indicates that the given compound name is incorrect. * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName - * Indicates the name does not identify a binding.

+ * Indicates the name does not identify a binding. * */ - Object resolve_str( in StringName sn) - raises( NotFound, CannotProceed, - InvalidName); + Object resolve_str( in StringName sn) + raises( NotFound, CannotProceed, + InvalidName); };