You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by dm...@apache.org on 2007/01/16 14:53:28 UTC

svn commit: r496714 - in /incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg: CORBA/ DynamicAny/ IOP/ PortableInterceptor/ PortableServer/

Author: dmiddlem
Date: Tue Jan 16 06:53:24 2007
New Revision: 496714

URL: http://svn.apache.org/viewvc?view=rev&rev=496714
Log:
Implementing some of the missing functionality indicated by the Harmony 
coverage reports (YOKO-275)

Modified:
    incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/CORBA/LocalObject.java
    incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynAnyFactoryHelper.java
    incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynAnyHelper.java
    incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynArrayHelper.java
    incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynEnumHelper.java
    incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynFixedHelper.java
    incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynSequenceHelper.java
    incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynStructHelper.java
    incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynUnionHelper.java
    incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynValueHelper.java
    incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/IOP/CodecFactoryHelper.java
    incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/PortableInterceptor/CurrentHelper.java
    incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java
    incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/PortableServer/ServantActivatorHelper.java
    incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/PortableServer/ServantActivatorPOA.java
    incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/PortableServer/ServantLocatorHelper.java

Modified: incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/CORBA/LocalObject.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/CORBA/LocalObject.java?view=diff&rev=496714&r1=496713&r2=496714
==============================================================================
--- incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/CORBA/LocalObject.java (original)
+++ incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/CORBA/LocalObject.java Tue Jan 16 06:53:24 2007
@@ -65,6 +65,12 @@
                 CompletionStatus.COMPLETED_NO);
     }
 
+    public org.omg.CORBA.ORB _orb() {
+        throw new org.omg.CORBA.NO_IMPLEMENT(
+                "operation not supported by local object", 0x4f4d0000 | 3, // MinorNotSupportedByLocalObject
+                CompletionStatus.COMPLETED_NO);
+    }
+
     public org.omg.CORBA.Request _request(String operation) {
         throw new org.omg.CORBA.NO_IMPLEMENT(
                 "DII operation not supported by local object", 0x4f4d0000 | 4, // MinorDIINotSupportedByLocalObject
@@ -100,6 +106,55 @@
             org.omg.CORBA.SetOverrideType set_add) {
         throw new org.omg.CORBA.NO_IMPLEMENT(
                 "operation not supported by local object", 0x4f4d0000 | 3, // MinorNotSupportedByLocalObject
+                CompletionStatus.COMPLETED_NO);
+    }
+
+    public boolean _is_local() {
+        throw new org.omg.CORBA.NO_IMPLEMENT(
+                "operation not supported by local object", 0x4f4d0000 | 3, // MinorNotSupportedByLocalObject
+                CompletionStatus.COMPLETED_NO);
+    }
+
+    public org.omg.CORBA.portable.ServantObject _servant_preinvoke(
+            String operation, Class expectedType) {
+        throw new org.omg.CORBA.NO_IMPLEMENT(
+                "operation not supported by local object", 0x4ffd0000 | 3, // MinorNotSupportedByLocalObject
+                CompletionStatus.COMPLETED_NO);
+    }
+
+    public void _servant_postinvoke(
+            org.omg.CORBA.portable.ServantObject servant) {
+        throw new org.omg.CORBA.NO_IMPLEMENT(
+                "operation not supported by local object", 0x4ffd0000 | 3, // MinorNotSupportedByLocalObject
+                CompletionStatus.COMPLETED_NO);
+    }
+   
+    public org.omg.CORBA.portable.OutputStream _request(
+            String operation, boolean responseExcepted) {
+        throw new org.omg.CORBA.NO_IMPLEMENT(
+                "operation not supported by local object", 0x4ffd0000 | 3, // MinorNotSupportedByLocalObject
+                CompletionStatus.COMPLETED_NO);
+    }
+
+    public org.omg.CORBA.portable.InputStream _invoke(
+            org.omg.CORBA.portable.OutputStream output)
+        throws org.omg.CORBA.portable.ApplicationException,
+               org.omg.CORBA.portable.RemarshalException {
+        throw new org.omg.CORBA.NO_IMPLEMENT(
+                "operation not supported by local object", 0x4ffd0000 | 3, // MinorNotSupportedByLocalObject
+                CompletionStatus.COMPLETED_NO);
+    }
+
+    public void _releaseReply(
+            org.omg.CORBA.portable.InputStream input) {
+        throw new org.omg.CORBA.NO_IMPLEMENT(
+                "operation not supported by local object", 0x4ffd0000 | 3, // MinorNotSupportedByLocalObject
+                CompletionStatus.COMPLETED_NO);
+    }
+
+    public boolean validate_connection() {
+        throw new org.omg.CORBA.NO_IMPLEMENT(
+                "operation not supported by local object", 0x4ffd0000 | 3, // MinorNotSupportedByLocalObject
                 CompletionStatus.COMPLETED_NO);
     }
 

Modified: incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynAnyFactoryHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynAnyFactoryHelper.java?view=diff&rev=496714&r1=496713&r2=496714
==============================================================================
--- incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynAnyFactoryHelper.java (original)
+++ incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynAnyFactoryHelper.java Tue Jan 16 06:53:24 2007
@@ -82,4 +82,18 @@
 
         throw new org.omg.CORBA.BAD_PARAM();
     }
+
+    public static DynAnyFactory
+    unchecked_narrow(org.omg.CORBA.Object val)
+    {
+        try
+        {
+            return (DynAnyFactory)val;
+        }
+        catch(ClassCastException ex)
+        {
+        }
+
+        throw new org.omg.CORBA.BAD_PARAM();
+    }
 }

Modified: incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynAnyHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynAnyHelper.java?view=diff&rev=496714&r1=496713&r2=496714
==============================================================================
--- incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynAnyHelper.java (original)
+++ incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynAnyHelper.java Tue Jan 16 06:53:24 2007
@@ -82,4 +82,18 @@
 
         throw new org.omg.CORBA.BAD_PARAM();
     }
+
+    public static DynAny
+    unchecked_narrow(org.omg.CORBA.Object val)
+    {
+        try
+        {
+            return (DynAny)val;
+        }
+        catch(ClassCastException ex)
+        {
+        }
+
+        throw new org.omg.CORBA.BAD_PARAM();
+    }
 }

Modified: incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynArrayHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynArrayHelper.java?view=diff&rev=496714&r1=496713&r2=496714
==============================================================================
--- incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynArrayHelper.java (original)
+++ incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynArrayHelper.java Tue Jan 16 06:53:24 2007
@@ -82,4 +82,18 @@
 
         throw new org.omg.CORBA.BAD_PARAM();
     }
+
+    public static DynArray
+    unchecked_narrow(org.omg.CORBA.Object val)
+    {
+        try
+        {
+            return (DynArray)val;
+        }
+        catch(ClassCastException ex)
+        {
+        }
+
+        throw new org.omg.CORBA.BAD_PARAM();
+    }
 }

Modified: incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynEnumHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynEnumHelper.java?view=diff&rev=496714&r1=496713&r2=496714
==============================================================================
--- incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynEnumHelper.java (original)
+++ incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynEnumHelper.java Tue Jan 16 06:53:24 2007
@@ -82,4 +82,18 @@
 
         throw new org.omg.CORBA.BAD_PARAM();
     }
+
+    public static DynEnum
+    unchecked_narrow(org.omg.CORBA.Object val)
+    {
+        try
+        {
+            return (DynEnum)val;
+        }
+        catch(ClassCastException ex)
+        {
+        }
+
+        throw new org.omg.CORBA.BAD_PARAM();
+    }
 }

Modified: incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynFixedHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynFixedHelper.java?view=diff&rev=496714&r1=496713&r2=496714
==============================================================================
--- incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynFixedHelper.java (original)
+++ incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynFixedHelper.java Tue Jan 16 06:53:24 2007
@@ -82,4 +82,18 @@
 
         throw new org.omg.CORBA.BAD_PARAM();
     }
+
+    public static DynFixed
+    unchecked_narrow(org.omg.CORBA.Object val)
+    {
+        try
+        {
+            return (DynFixed)val;
+        }
+        catch(ClassCastException ex)
+        {
+        }
+
+        throw new org.omg.CORBA.BAD_PARAM();
+    }
 }

Modified: incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynSequenceHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynSequenceHelper.java?view=diff&rev=496714&r1=496713&r2=496714
==============================================================================
--- incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynSequenceHelper.java (original)
+++ incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynSequenceHelper.java Tue Jan 16 06:53:24 2007
@@ -82,4 +82,18 @@
 
         throw new org.omg.CORBA.BAD_PARAM();
     }
+
+    public static DynSequence
+    unchecked_narrow(org.omg.CORBA.Object val)
+    {
+        try
+        {
+            return (DynSequence)val;
+        }
+        catch(ClassCastException ex)
+        {
+        }
+
+        throw new org.omg.CORBA.BAD_PARAM();
+    }
 }

Modified: incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynStructHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynStructHelper.java?view=diff&rev=496714&r1=496713&r2=496714
==============================================================================
--- incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynStructHelper.java (original)
+++ incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynStructHelper.java Tue Jan 16 06:53:24 2007
@@ -82,4 +82,18 @@
 
         throw new org.omg.CORBA.BAD_PARAM();
     }
+
+    public static DynStruct
+    unchecked_narrow(org.omg.CORBA.Object val)
+    {
+        try
+        {
+            return (DynStruct)val;
+        }
+        catch(ClassCastException ex)
+        {
+        }
+
+        throw new org.omg.CORBA.BAD_PARAM();
+    }
 }

Modified: incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynUnionHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynUnionHelper.java?view=diff&rev=496714&r1=496713&r2=496714
==============================================================================
--- incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynUnionHelper.java (original)
+++ incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynUnionHelper.java Tue Jan 16 06:53:24 2007
@@ -82,4 +82,18 @@
 
         throw new org.omg.CORBA.BAD_PARAM();
     }
+
+    public static DynUnion
+    unchecked_narrow(org.omg.CORBA.Object val)
+    {
+        try
+        {
+            return (DynUnion)val;
+        }
+        catch(ClassCastException ex)
+        {
+        }
+
+        throw new org.omg.CORBA.BAD_PARAM();
+    }
 }

Modified: incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynValueHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynValueHelper.java?view=diff&rev=496714&r1=496713&r2=496714
==============================================================================
--- incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynValueHelper.java (original)
+++ incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/DynamicAny/DynValueHelper.java Tue Jan 16 06:53:24 2007
@@ -82,4 +82,18 @@
 
         throw new org.omg.CORBA.BAD_PARAM();
     }
+
+    public static DynValue
+    unchecked_narrow(org.omg.CORBA.Object val)
+    {
+        try
+        {
+            return (DynValue)val;
+        }
+        catch(ClassCastException ex)
+        {
+        }
+
+        throw new org.omg.CORBA.BAD_PARAM();
+    }
 }

Modified: incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/IOP/CodecFactoryHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/IOP/CodecFactoryHelper.java?view=diff&rev=496714&r1=496713&r2=496714
==============================================================================
--- incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/IOP/CodecFactoryHelper.java (original)
+++ incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/IOP/CodecFactoryHelper.java Tue Jan 16 06:53:24 2007
@@ -82,4 +82,18 @@
 
         throw new org.omg.CORBA.BAD_PARAM();
     }
+
+    public static CodecFactory
+    unchecked_narrow(org.omg.CORBA.Object val)
+    {
+        try
+        {
+            return (CodecFactory)val;
+        }
+        catch(ClassCastException ex)
+        {
+        }
+
+        throw new org.omg.CORBA.BAD_PARAM();
+    }
 }

Modified: incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/PortableInterceptor/CurrentHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/PortableInterceptor/CurrentHelper.java?view=diff&rev=496714&r1=496713&r2=496714
==============================================================================
--- incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/PortableInterceptor/CurrentHelper.java (original)
+++ incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/PortableInterceptor/CurrentHelper.java Tue Jan 16 06:53:24 2007
@@ -82,4 +82,18 @@
 
         throw new org.omg.CORBA.BAD_PARAM();
     }
+
+    public static Current
+    unchecked_narrow(org.omg.CORBA.Object val)
+    {
+        try
+        {
+            return (Current)val;
+        }
+        catch(ClassCastException ex)
+        {
+        }
+
+        throw new org.omg.CORBA.BAD_PARAM();
+    }
 }

Modified: incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java?view=diff&rev=496714&r1=496713&r2=496714
==============================================================================
--- incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java (original)
+++ incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java Tue Jan 16 06:53:24 2007
@@ -82,4 +82,18 @@
 
         throw new org.omg.CORBA.BAD_PARAM();
     }
+
+    public static IORInterceptor_3_0
+    unchecked_narrow(org.omg.CORBA.Object val)
+    {
+        try
+        {
+            return (IORInterceptor_3_0)val;
+        }
+        catch(ClassCastException ex)
+        {
+        }
+
+        throw new org.omg.CORBA.BAD_PARAM();
+    }
 }

Modified: incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/PortableServer/ServantActivatorHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/PortableServer/ServantActivatorHelper.java?view=diff&rev=496714&r1=496713&r2=496714
==============================================================================
--- incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/PortableServer/ServantActivatorHelper.java (original)
+++ incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/PortableServer/ServantActivatorHelper.java Tue Jan 16 06:53:24 2007
@@ -82,4 +82,18 @@
 
         throw new org.omg.CORBA.BAD_PARAM();
     }
+
+    public static ServantActivator
+    unchecked_narrow(org.omg.CORBA.Object val)
+    {
+        try
+        {
+            return (ServantActivator)val;
+        }
+        catch(ClassCastException ex)
+        {
+        }
+
+        throw new org.omg.CORBA.BAD_PARAM();
+    }
 }

Modified: incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/PortableServer/ServantActivatorPOA.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/PortableServer/ServantActivatorPOA.java?view=diff&rev=496714&r1=496713&r2=496714
==============================================================================
--- incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/PortableServer/ServantActivatorPOA.java (original)
+++ incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/PortableServer/ServantActivatorPOA.java Tue Jan 16 06:53:24 2007
@@ -21,7 +21,8 @@
 // This class is provided only for backward compatibility.
 //
 public abstract class ServantActivatorPOA extends
-        org.omg.PortableServer.Servant implements ServantActivator {
+        org.omg.PortableServer.Servant 
+        implements ServantActivator, org.omg.CORBA.portable.InvokeHandler {
     public ServantActivator _this() {
         return this;
     }

Modified: incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/PortableServer/ServantLocatorHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/PortableServer/ServantLocatorHelper.java?view=diff&rev=496714&r1=496713&r2=496714
==============================================================================
--- incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/PortableServer/ServantLocatorHelper.java (original)
+++ incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/PortableServer/ServantLocatorHelper.java Tue Jan 16 06:53:24 2007
@@ -82,4 +82,18 @@
 
         throw new org.omg.CORBA.BAD_PARAM();
     }
+
+    public static ServantLocator
+    unchecked_narrow(org.omg.CORBA.Object val)
+    {
+        try
+        {
+            return (ServantLocator)val;
+        }
+        catch(ClassCastException ex)
+        {
+        }
+
+        throw new org.omg.CORBA.BAD_PARAM();
+    }
 }