summaryrefslogtreecommitdiff
path: root/org/omg
diff options
context:
space:
mode:
authorAudrius Meskauskas <audriusa@Bioinformatics.org>2005-11-06 11:32:31 +0000
committerAudrius Meskauskas <audriusa@Bioinformatics.org>2005-11-06 11:32:31 +0000
commit88f7e4891055e88e79871345f4bc7f6d4f37480e (patch)
treeacd526a36b197d63469299ec76d96044e1d1be9f /org/omg
parent8d49ae975c9dbf726a1b95eccc12907676f57ba9 (diff)
downloadclasspath-88f7e4891055e88e79871345f4bc7f6d4f37480e.tar.gz
2005-11-06 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* gnu/CORBA/Minor.java (IOR_missing): New minor code. * gnu/CORBA/NamingService/NameParser.java (corbaloc): Implemented file//, ftp:// and http:// support. * gnu/javax/rmi/CORBA/UtilDelegateImpl.java (mapSystemException): Set the cause directly. * org/omg/CORBA/DATA_CONVERSION.java, org/omg/CORBA/ORB.java (string_to_object): Documentation update.
Diffstat (limited to 'org/omg')
-rw-r--r--org/omg/CORBA/DATA_CONVERSION.java20
-rw-r--r--org/omg/CORBA/ORB.java6
2 files changed, 26 insertions, 0 deletions
diff --git a/org/omg/CORBA/DATA_CONVERSION.java b/org/omg/CORBA/DATA_CONVERSION.java
index 3faacdcb2..7261aae46 100644
--- a/org/omg/CORBA/DATA_CONVERSION.java
+++ b/org/omg/CORBA/DATA_CONVERSION.java
@@ -44,6 +44,26 @@ import java.io.Serializable;
* Means that the ORB cannot convert between the marshalled and
* native data representation.
*
+ * In GNU Classpath, this exception may have the following minor codes:
+ *
+ * <table border="1">
+ * <tr>
+ * <td>Hex</td>
+ * <td>Dec</td>
+ * <td>Minor</td>
+ * <td>Name</td>
+ * <td>Case</td>
+ * </tr>
+ * <td>47430016</td>
+ * <td>1195573270</td>
+ * <td>22</td>
+ * <td>Missing_IOR</td>
+ * <td>The object URL is such that the IOR string must be read from some
+ * local or remote resource (file or network), but this resource is not
+ * reacheable.</td>
+ * </tr>
+ * </table>
+ *
* @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
*/
public class DATA_CONVERSION
diff --git a/org/omg/CORBA/ORB.java b/org/omg/CORBA/ORB.java
index 98120ac16..52c0ad621 100644
--- a/org/omg/CORBA/ORB.java
+++ b/org/omg/CORBA/ORB.java
@@ -1024,6 +1024,12 @@ public abstract class ORB
* that runs on the given host at the given port. The ORB expects to find
* there the {@link org.omg.CosNaming.NamingContext} under the key
* "NameService.<br>
+ * 7. file://[file name] Read the object definition string from the
+ * file system<br>
+ * 8. http://[url] Read the object definition string from the provided
+ * url.<br>
+ * 9. ftp://[url] Read the object definition string from the provided
+ * url.<br>
*
* <p>The default port is always 2809. The default iiop version is 1.0
* that now may not always be supported, so we would recommend to specify