[kaffe] CVS kaffe (robilad): resynced with gnu classpath: corba fixes from audrius

Kaffe CVS cvs-commits at kaffe.org
Sat May 21 08:42:58 PDT 2005


PatchSet 6566 
Date: 2005/05/21 15:30:05
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: corba fixes from audrius

2005-05-21  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2005-05-20  Audrius Meskauskas, <AudriusA at Bioinformatics.org>

        * org/omg/CORBA/SetOverrideType.java (_ADD_OVERRIDE, _SET_OVERRIDE),
        org/omg/CORBA/CompletionStatus.java
        (_COMPLETED_YES, _COMPLETED_NO, _COMPLETED_MAYBE): Making public.
        * org/omg/CORBA/ValueMember.java: Inherit from
        org.omg.CORBA.portable.IDLEntity.

        2005-05-20  Audrius Meskauskas, <AudriusA at Bioinformatics.org>

        * org/omg/CORBA/portable/ApplicationException.java,
        org/omg/CORBA/portable/RemarshalException.java:
        Adding serialVersionUID.
        *org/omg/CORBA/portable/OutputStream.java(write_Context):
        Making concrete.
        org/omg/CORBA/portable/ServantObject.java (servant):
        Fixing typo in the field name.

Members: 
	ChangeLog:1.4093->1.4094 
	libraries/javalib/org/omg/CORBA/CompletionStatus.java:1.2->1.3 
	libraries/javalib/org/omg/CORBA/SetOverrideType.java:1.1->1.2 
	libraries/javalib/org/omg/CORBA/ValueMember.java:1.2->1.3 
	libraries/javalib/org/omg/CORBA/portable/ApplicationException.java:1.1->1.2 
	libraries/javalib/org/omg/CORBA/portable/OutputStream.java:1.4->1.5 
	libraries/javalib/org/omg/CORBA/portable/RemarshalException.java:1.1->1.2 
	libraries/javalib/org/omg/CORBA/portable/ServantObject.java:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4093 kaffe/ChangeLog:1.4094
--- kaffe/ChangeLog:1.4093	Sat May 21 15:26:33 2005
+++ kaffe/ChangeLog	Sat May 21 15:30:05 2005
@@ -2,6 +2,28 @@
 
 	Resynced with GNU Classpath.
 
+	2005-05-20  Audrius Meskauskas, <AudriusA at Bioinformatics.org>
+
+        * org/omg/CORBA/SetOverrideType.java (_ADD_OVERRIDE, _SET_OVERRIDE),
+        org/omg/CORBA/CompletionStatus.java
+        (_COMPLETED_YES, _COMPLETED_NO, _COMPLETED_MAYBE): Making public.
+        * org/omg/CORBA/ValueMember.java: Inherit from
+        org.omg.CORBA.portable.IDLEntity.
+
+	2005-05-20  Audrius Meskauskas, <AudriusA at Bioinformatics.org>
+
+        * org/omg/CORBA/portable/ApplicationException.java,
+        org/omg/CORBA/portable/RemarshalException.java:
+        Adding serialVersionUID.
+        *org/omg/CORBA/portable/OutputStream.java(write_Context):
+        Making concrete.
+        org/omg/CORBA/portable/ServantObject.java (servant):
+        Fixing typo in the field name.
+
+2005-05-21  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
 	2005-05-19  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
         * java/net/URI.java:
Index: kaffe/libraries/javalib/org/omg/CORBA/CompletionStatus.java
diff -u kaffe/libraries/javalib/org/omg/CORBA/CompletionStatus.java:1.2 kaffe/libraries/javalib/org/omg/CORBA/CompletionStatus.java:1.3
--- kaffe/libraries/javalib/org/omg/CORBA/CompletionStatus.java:1.2	Wed Mar  9 12:43:22 2005
+++ kaffe/libraries/javalib/org/omg/CORBA/CompletionStatus.java	Sat May 21 15:30:07 2005
@@ -59,18 +59,18 @@
   /**
    * The method was completed when the exception was thrown.
    */
-  static final int _COMPLETED_YES = 0;
+  public static final int _COMPLETED_YES = 0;
 
   /**
    * The method was running when the exception was thrown.
    */
-  static final int _COMPLETED_NO = 1;
+  public static final int _COMPLETED_NO = 1;
 
   /**
    * The method was either running or complete (no exact information availabe)
    * when the exception was thrown.
    */
-  static final int _COMPLETED_MAYBE = 2;
+  public static final int _COMPLETED_MAYBE = 2;
 
   /**
    * An instance of CompletionStatus, initialized to {@link #COMPLETED_YES }
Index: kaffe/libraries/javalib/org/omg/CORBA/SetOverrideType.java
diff -u kaffe/libraries/javalib/org/omg/CORBA/SetOverrideType.java:1.1 kaffe/libraries/javalib/org/omg/CORBA/SetOverrideType.java:1.2
--- kaffe/libraries/javalib/org/omg/CORBA/SetOverrideType.java:1.1	Sun May 15 19:20:15 2005
+++ kaffe/libraries/javalib/org/omg/CORBA/SetOverrideType.java	Sat May 21 15:30:07 2005
@@ -46,7 +46,7 @@
  * Defines the instruction, how the newly specified policies can be
  * taken into consideration. The policies can be either
  * added to the current policies or replace them.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA at Bioinformatics.org)
  */
 public class SetOverrideType
@@ -60,12 +60,12 @@
   /**
    * Add the new policies to the existing policies.
    */
-  static final int _ADD_OVERRIDE = 1;
+  public static final int _ADD_OVERRIDE = 1;
 
   /**
    * Replace the new existing policies by the new policies.
    */
-  static final int _SET_OVERRIDE = 0;
+  public static final int _SET_OVERRIDE = 0;
 
   /**
    * Add the new policies to the existing policies.
@@ -80,7 +80,7 @@
    */
   public static final SetOverrideType SET_OVERRIDE =
     new SetOverrideType(_SET_OVERRIDE);
-   
+
   private final int _value;
 
   /**
@@ -96,7 +96,7 @@
    * @param kind one of _ADD_OVERRIDE or _SET_OVERRIDE.
    *
    * @return one of ADD_OVERRIDE or SET_OVERRIDE.
-   * 
+   *
    * @throws BAD_PARAM if the parameter is not one of these two values.
    */
   public static SetOverrideType from_int(int kind)
@@ -116,7 +116,7 @@
 
   /**
    * Returns a short string representation.
-   * 
+   *
    * @return either "add" or "replace".
    */
   public String toString()
@@ -126,7 +126,7 @@
 
   /**
    * Returns the value, representing stored instruction.
-   * 
+   *
    * @return one of ADD_OVERRIDE or SET_OVERRIDE
    */
   public int value()
Index: kaffe/libraries/javalib/org/omg/CORBA/ValueMember.java
diff -u kaffe/libraries/javalib/org/omg/CORBA/ValueMember.java:1.2 kaffe/libraries/javalib/org/omg/CORBA/ValueMember.java:1.3
--- kaffe/libraries/javalib/org/omg/CORBA/ValueMember.java:1.2	Wed May 18 22:08:57 2005
+++ kaffe/libraries/javalib/org/omg/CORBA/ValueMember.java	Sat May 21 15:30:07 2005
@@ -38,6 +38,8 @@
 
 package org.omg.CORBA;
 
+import org.omg.CORBA.portable.IDLEntity;
+
 import java.io.Serializable;
 
 /**
Index: kaffe/libraries/javalib/org/omg/CORBA/portable/ApplicationException.java
diff -u kaffe/libraries/javalib/org/omg/CORBA/portable/ApplicationException.java:1.1 kaffe/libraries/javalib/org/omg/CORBA/portable/ApplicationException.java:1.2
--- kaffe/libraries/javalib/org/omg/CORBA/portable/ApplicationException.java:1.1	Sun May 15 19:20:15 2005
+++ kaffe/libraries/javalib/org/omg/CORBA/portable/ApplicationException.java	Sat May 21 15:30:07 2005
@@ -38,6 +38,7 @@
 
 package org.omg.CORBA.portable;
 
+import java.io.Serializable;
 
 /**
  * This expection is thrown if the application throws an exception,
@@ -47,8 +48,13 @@
  */
 public class ApplicationException
   extends Exception
-  implements java.io.Serializable
+  implements Serializable
 {
+  /**
+   * Use serialVersionUID (v1.4) for interoperability.
+   */
+  private static final long serialVersionUID = -2088103024111528125L;
+
   /**
    * The input from where the exception parameters can be read.
    */
Index: kaffe/libraries/javalib/org/omg/CORBA/portable/OutputStream.java
diff -u kaffe/libraries/javalib/org/omg/CORBA/portable/OutputStream.java:1.4 kaffe/libraries/javalib/org/omg/CORBA/portable/OutputStream.java:1.5
--- kaffe/libraries/javalib/org/omg/CORBA/portable/OutputStream.java:1.4	Wed May 18 22:08:58 2005
+++ kaffe/libraries/javalib/org/omg/CORBA/portable/OutputStream.java	Sat May 21 15:30:07 2005
@@ -91,9 +91,16 @@
   }
 
   /**
-   * Write CORBA Context.
+   * Should write a CORBA context to the output stream, but,
+   * following the 1.4 specification, it does not and
+   * must be overridden to get a functionality.
+   *
+   * @throws NO_IMPLEMENT, always.
    */
-  public abstract void write_Context(Context context, ContextList contexts);
+  public void write_Context(Context context, ContextList contexts)
+  {
+    throw new NO_IMPLEMENT();
+  }
 
   /**
    * Write CORBA (not java) Object.
Index: kaffe/libraries/javalib/org/omg/CORBA/portable/RemarshalException.java
diff -u kaffe/libraries/javalib/org/omg/CORBA/portable/RemarshalException.java:1.1 kaffe/libraries/javalib/org/omg/CORBA/portable/RemarshalException.java:1.2
--- kaffe/libraries/javalib/org/omg/CORBA/portable/RemarshalException.java:1.1	Sun May 15 19:20:15 2005
+++ kaffe/libraries/javalib/org/omg/CORBA/portable/RemarshalException.java	Sat May 21 15:30:07 2005
@@ -38,6 +38,7 @@
 
 package org.omg.CORBA.portable;
 
+import java.io.Serializable;
 
 /**
  * This is exception is potentially thrown by the _invoke()
@@ -49,6 +50,10 @@
  */
 public class RemarshalException
   extends Exception
-  implements java.io.Serializable
+  implements Serializable
 {
+  /**
+   * Use serialVersionUID (v1.4) for interoperability.
+   */
+  private static final long serialVersionUID = -7025491253080954918L;
 }
Index: kaffe/libraries/javalib/org/omg/CORBA/portable/ServantObject.java
diff -u kaffe/libraries/javalib/org/omg/CORBA/portable/ServantObject.java:1.1 kaffe/libraries/javalib/org/omg/CORBA/portable/ServantObject.java:1.2
--- kaffe/libraries/javalib/org/omg/CORBA/portable/ServantObject.java:1.1	Sun May 15 19:20:15 2005
+++ kaffe/libraries/javalib/org/omg/CORBA/portable/ServantObject.java	Sat May 21 15:30:07 2005
@@ -57,5 +57,5 @@
    * The real servant, that can be casted to the expected type, later
    * invoking the methods directly.
    */
-  public java.lang.Object Servant;
+  public java.lang.Object servant;
 }




More information about the kaffe mailing list