binding-corba* modules Code cleanup, added comments, svn headers

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@685898 13f79535-47bb-0310-9956-ffa450edef68

32 files changed, 53 insertions, 183 deletions

diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java
index 58fda9919a..4af0f68856 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java
@@ -66,7 +66,7 @@ public class CorbaInvoker implements Invoker {
                 }
             }
             if (msg.getOperation().getFaultTypes() != null) {
-                for (DataType type : msg.getOperation().getFaultTypes()) {
+                for (DataType<?> type : msg.getOperation().getFaultTypes()) {
                     request.addExceptionType(type.getPhysical());
                 }
             }
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/ComponentInvocationProxy.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/ComponentInvocationProxy.java
index f8458bef15..c1cd3abe77 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/ComponentInvocationProxy.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/ComponentInvocationProxy.java
@@ -36,6 +36,7 @@ import org.apache.tuscany.sca.runtime.RuntimeComponentService;
 import org.apache.tuscany.sca.runtime.RuntimeWire;
 
 /**
+ * @version $Rev$ $Date$
  * Invocation proxy for SCA components
  */
 public class ComponentInvocationProxy implements InvocationProxy {
@@ -60,6 +61,7 @@ public class ComponentInvocationProxy implements InvocationProxy {
     /**
      * Maps Java methods to Tuscany operations
      */
+    @SuppressWarnings("unchecked")
     private void createMethod2OperationMapping() {
         // for every operation find all methods with the same name, then
         // compare operations and methods parameters
@@ -111,7 +113,7 @@ public class ComponentInvocationProxy implements InvocationProxy {
                 }
                 // cache input types trees
                 if (operation.getInputType() != null) {
-                    for (DataType<List<DataType>> type : operation.getInputType().getLogical()) {
+                    for (DataType<List<DataType<?>>> type : operation.getInputType().getLogical()) {
                         Class<?> forClass = type.getPhysical();
                         TypeTree inputType = TypeTreeCreator.createTypeTree(forClass, false);
                         inputInstances.add(inputType);
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java
index 26f006242e..21de319e00 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java
@@ -35,6 +35,7 @@ import org.omg.CORBA.portable.OutputStream;
 import org.omg.CORBA.portable.ResponseHandler;
 
 /**
+ * @version $Rev$ $Date$
  * General servant which provides target component implementation via CORBA
  */
 public class DynaCorbaServant extends ObjectImpl implements InvokeHandler {
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationException.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationException.java
index 4dc09885ef..a82e43e42e 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationException.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationException.java
@@ -20,6 +20,7 @@
 package org.apache.tuscany.sca.binding.corba.impl.service;
 
 /**
+ * @version $Rev$ $Date$
  * Wrapper for exception thrown during target invocation 
  */
 public class InvocationException extends Exception {
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationProxy.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationProxy.java
index f732e142b2..5ad9068b8d 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationProxy.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationProxy.java
@@ -22,6 +22,7 @@ package org.apache.tuscany.sca.binding.corba.impl.service;
 import java.util.List;
 
 /**
+ * @version $Rev$ $Date$
  * Target proxy interface for service bindings
  */
 public interface InvocationProxy {
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/OperationTypes.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/OperationTypes.java
index 2ffcd30d0a..d93036d6d9 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/OperationTypes.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/OperationTypes.java
@@ -23,6 +23,10 @@ import java.util.List;
 
 import org.apache.tuscany.sca.binding.corba.impl.types.TypeTree;
 
+/**
+ * @version $Rev$ $Date$
+ * Holder for Java type trees for one method  
+ */
 public class OperationTypes {
 
     private TypeTree outputType;
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTree.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTree.java
index 2745383cd6..b8c4f88324 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTree.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTree.java
@@ -19,42 +19,17 @@
 
 package org.apache.tuscany.sca.binding.corba.impl.types;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
- * @version $Rev$ $Date$ 
- * Helper tree for Java object hierarchy. It's closer to CORBA types structure
- * than plain Java hierarchy - it helps reading and writing complex structures.
+ * @version $Rev$ $Date$
+ *          Helper tree for Java object hierarchy. It's closer to CORBA types
+ *          structure than plain Java hierarchy - it helps reading and writing
+ *          complex structures.
  */
 public class TypeTree {
 
-    private Map<Class<?>, TypeTreeNode> typesUsed = new HashMap<Class<?>, TypeTreeNode>();
     private TypeTreeNode rootNode;
 
     /**
-     * Intent was to cache previously computed type trees. In practice it caused
-     * a bug, and it's not being used right now. TODO: enable type trees caching
-     * 
-     * @param forClass
-     * @param node
-     */
-    public void addUsedType(Class<?> forClass, TypeTreeNode node) {
-        typesUsed.put(forClass, node);
-    }
-
-    /**
-     * Returns node for previously created tree, it's getter for nodes added by
-     * addUsedType method. Not in use right now. TODO: enable type trees caching
-     * 
-     * @param forClass
-     * @return
-     */
-    public TypeTreeNode getNodeForType(Class<?> forClass) {
-        return typesUsed.get(forClass);
-    }
-
-    /**
      * Returns root node.
      * 
      * @return root of type tree
@@ -66,8 +41,7 @@ public class TypeTree {
     /**
      * Sets root of the type tree.
      * 
-     * @param rootNode
-     *            root node.
+     * @param rootNode root node.
      */
     public void setRootNode(TypeTreeNode rootNode) {
         this.rootNode = rootNode;
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java
index 658993f486..4e591eebb1 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java
@@ -33,8 +33,7 @@ import org.apache.tuscany.sca.binding.corba.impl.exceptions.RequestConfiguration
 
 /**
  * @version $Rev$ $Date$
- * Creator of types tree.
- * 
+ *          Creator of types tree.
  */
 public class TypeTreeCreator {
 
@@ -66,8 +65,7 @@ public class TypeTreeCreator {
     /**
      * Creates class for given string argument.
      * 
-     * @param name
-     *            name of type
+     * @param name name of type
      * @return type
      */
     private static Class<?> createClassFromString(String name) {
@@ -115,8 +113,7 @@ public class TypeTreeCreator {
     /**
      * Reduces dimension of array.
      * 
-     * @param forClass
-     *            array class
+     * @param forClass array class
      * @return reduced array
      */
     private static Class<?> reduceArrayDimension(Class<?> forClass) {
@@ -142,7 +139,8 @@ public class TypeTreeCreator {
      * @param forClass
      * @return type tree
      */
-    public static TypeTree createTypeTree(Class<?> forClass, boolean scaBindingRules) throws RequestConfigurationException {
+    public static TypeTree createTypeTree(Class<?> forClass, boolean scaBindingRules)
+        throws RequestConfigurationException {
         TypeTree tree = new TypeTree();
         TypeTreeNode rootNode = null;
         rootNode = inspectClassHierarchy(forClass, tree, scaBindingRules);
@@ -160,25 +158,17 @@ public class TypeTreeCreator {
      */
     private static TypeTreeNode inspectClassHierarchy(Class<?> forClass, TypeTree tree, boolean scaBindingRules)
         throws RequestConfigurationException {
-        // //remains of type tree caching
-        // TypeTreeNode existingNode = tree.getNodeForType(forClass);
-        // if (existingNode != null) {
-        // return existingNode;
-        // }
-
+        
         TypeTreeNode node = null;
         if (scaBindingRules) {
             node = createTypeNode4ScaBinding(forClass);
         } else {
             node = createTypeNode4CorbaBinding(forClass);
         }
-        
+
         NodeType nodeType = node.getNodeType();
         TypeTreeNode[] children = null;
 
-        // //remains of type tree caching
-        // tree.addUsedType(forClass, node);
-
         if (nodeType.equals(NodeType.primitive)) {
             // stop condition for recurrent method
         } else if (nodeType.equals(NodeType.array)) {
@@ -214,8 +204,7 @@ public class TypeTreeCreator {
     /**
      * Creating and configuring TypeTreeNode for given class.
      * 
-     * @param forClass
-     *            class
+     * @param forClass class
      * @return node
      * @throws RequestConfigurationException
      */
@@ -249,7 +238,7 @@ public class TypeTreeCreator {
         }
         return node;
     }
-    
+
     private static TypeTreeNode createTypeNode4ScaBinding(Class<?> forClass) throws RequestConfigurationException {
         TypeTreeNode node = new TypeTreeNode();
         if (forClass.isArray()) {
@@ -298,7 +287,7 @@ public class TypeTreeCreator {
             return false;
         }
         /*
-         * Are constructor args declared as class fields? 
+         * Are constructor args declared as class fields?
          */
         Field[] fields = forClass.getFields();
         Set<Class<?>> fieldsSet = new HashSet<Class<?>>(Arrays.asList(fieldsTypes));
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ArrayTypeHelper.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ArrayTypeHelper.java
index 065ce2c092..47c8bfebe7 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ArrayTypeHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ArrayTypeHelper.java
@@ -20,7 +20,6 @@
 package org.apache.tuscany.sca.binding.corba.impl.types.util;
 
 import org.apache.tuscany.sca.binding.corba.impl.types.TypeTreeNode;
-import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 
@@ -29,11 +28,6 @@ import org.omg.CORBA.portable.OutputStream;
  */
 public class ArrayTypeHelper implements TypeHelper {
 
-    public TypeCode getType(TypeTreeNode node) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
     public Object read(TypeTreeNode node, InputStream is) {
         // TODO Auto-generated method stub
         return null;
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/BooleanTypeHelper.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/BooleanTypeHelper.java
index c9eb70fc35..87d3e93d22 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/BooleanTypeHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/BooleanTypeHelper.java
@@ -20,8 +20,6 @@
 package org.apache.tuscany.sca.binding.corba.impl.types.util;
 
 import org.apache.tuscany.sca.binding.corba.impl.types.TypeTreeNode;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 
@@ -30,10 +28,6 @@ import org.omg.CORBA.portable.OutputStream;
  */
 public class BooleanTypeHelper implements TypeHelper {
 
-    public TypeCode getType(TypeTreeNode node) {
-        return ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.from_int(8));
-    }
-
     public Object read(TypeTreeNode node, InputStream is) {
         return is.read_boolean();
     }
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ByteTypeHelper.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ByteTypeHelper.java
index c97fd75707..eb02f1cbcb 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ByteTypeHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ByteTypeHelper.java
@@ -20,8 +20,6 @@
 package org.apache.tuscany.sca.binding.corba.impl.types.util;
 
 import org.apache.tuscany.sca.binding.corba.impl.types.TypeTreeNode;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 
@@ -30,10 +28,6 @@ import org.omg.CORBA.portable.OutputStream;
  */
 public class ByteTypeHelper implements TypeHelper {
 
-    public TypeCode getType(TypeTreeNode node) {
-        return ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.from_int(10));
-    }
-
     public Object read(TypeTreeNode node, InputStream is) {
         return is.read_octet();
     }
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/CharTypeHelper.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/CharTypeHelper.java
index 9906a19a41..71f8fbfc47 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/CharTypeHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/CharTypeHelper.java
@@ -20,8 +20,6 @@
 package org.apache.tuscany.sca.binding.corba.impl.types.util;
 
 import org.apache.tuscany.sca.binding.corba.impl.types.TypeTreeNode;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 
@@ -30,10 +28,6 @@ import org.omg.CORBA.portable.OutputStream;
  */
 public class CharTypeHelper implements TypeHelper {
 
-    public TypeCode getType(TypeTreeNode node) {
-        return ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.from_int(9));
-    }
-
     public Object read(TypeTreeNode node, InputStream is) {
         return is.read_char();
     }
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/DoubleTypeHelper.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/DoubleTypeHelper.java
index ce8026ab18..c5019c5c0b 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/DoubleTypeHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/DoubleTypeHelper.java
@@ -20,8 +20,6 @@
 package org.apache.tuscany.sca.binding.corba.impl.types.util;
 
 import org.apache.tuscany.sca.binding.corba.impl.types.TypeTreeNode;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 
@@ -30,10 +28,6 @@ import org.omg.CORBA.portable.OutputStream;
  */
 public class DoubleTypeHelper implements TypeHelper {
 
-    public TypeCode getType(TypeTreeNode node) {
-        return ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.from_int(7));
-    }
-
     public Object read(TypeTreeNode node, InputStream is) {
         return is.read_double();
     }
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/EnumTypeHelper.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/EnumTypeHelper.java
index 3d9e9df13a..dc45fde5e5 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/EnumTypeHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/EnumTypeHelper.java
@@ -3,17 +3,14 @@ package org.apache.tuscany.sca.binding.corba.impl.types.util;
 import java.lang.reflect.Method;
 
 import org.apache.tuscany.sca.binding.corba.impl.types.TypeTreeNode;
-import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 
+/**
+ * @version $Rev$ $Date$
+ */
 public class EnumTypeHelper implements TypeHelper {
 
-    public TypeCode getType(TypeTreeNode node) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
     public Object read(TypeTreeNode node, InputStream is) {
         int value = is.read_long();
         Object result = null;
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/FloatTypeHelper.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/FloatTypeHelper.java
index ed00ce4bd4..3214f8b30d 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/FloatTypeHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/FloatTypeHelper.java
@@ -20,8 +20,6 @@
 package org.apache.tuscany.sca.binding.corba.impl.types.util;
 
 import org.apache.tuscany.sca.binding.corba.impl.types.TypeTreeNode;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 
@@ -30,10 +28,6 @@ import org.omg.CORBA.portable.OutputStream;
  */
 public class FloatTypeHelper implements TypeHelper {
 
-    public TypeCode getType(TypeTreeNode node) {
-        return ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.from_int(6));
-    }
-
     public Object read(TypeTreeNode node, InputStream is) {
         return is.read_float();
     }
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/IntTypeHelper.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/IntTypeHelper.java
index 7f8271cb15..b11175064c 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/IntTypeHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/IntTypeHelper.java
@@ -20,8 +20,6 @@
 package org.apache.tuscany.sca.binding.corba.impl.types.util;
 
 import org.apache.tuscany.sca.binding.corba.impl.types.TypeTreeNode;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 
@@ -30,10 +28,6 @@ import org.omg.CORBA.portable.OutputStream;
  */
 public class IntTypeHelper implements TypeHelper {
 
-    public TypeCode getType(TypeTreeNode node) {
-        return ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.from_int(3));
-    }
-
     public Object read(TypeTreeNode node, InputStream is) {
         return is.read_long();
     }
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/LongTypeHelper.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/LongTypeHelper.java
index c6ce0c5cf6..7b4300a1da 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/LongTypeHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/LongTypeHelper.java
@@ -20,8 +20,6 @@
 package org.apache.tuscany.sca.binding.corba.impl.types.util;
 
 import org.apache.tuscany.sca.binding.corba.impl.types.TypeTreeNode;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 
@@ -30,10 +28,6 @@ import org.omg.CORBA.portable.OutputStream;
  */
 public class LongTypeHelper implements TypeHelper {
 
-    public TypeCode getType(TypeTreeNode node) {
-        return ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.from_int(23));
-    }
-
     public Object read(TypeTreeNode node, InputStream is) {
         return is.read_longlong();
     }
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ReferenceTypeHelper.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ReferenceTypeHelper.java
index 70f91fe763..4e0c2893d2 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ReferenceTypeHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ReferenceTypeHelper.java
@@ -22,7 +22,6 @@ package org.apache.tuscany.sca.binding.corba.impl.types.util;
 import org.apache.tuscany.sca.binding.corba.impl.reference.InterfaceInstanceCreator;
 import org.apache.tuscany.sca.binding.corba.impl.types.TypeTreeNode;
 import org.omg.CORBA.Object;
-import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 
@@ -31,11 +30,6 @@ import org.omg.CORBA.portable.OutputStream;
  */
 public class ReferenceTypeHelper implements TypeHelper {
 
-    public TypeCode getType(TypeTreeNode node) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
     public java.lang.Object read(TypeTreeNode node, InputStream is) {
         Object reference = is.read_Object();
         return (java.lang.Object)InterfaceInstanceCreator.createInstance(reference, node.getJavaClass());
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/SequenceTypeHelper.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/SequenceTypeHelper.java
index 86f2577ba5..5862838cd5 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/SequenceTypeHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/SequenceTypeHelper.java
@@ -25,7 +25,6 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.apache.tuscany.sca.binding.corba.impl.types.TypeTreeNode;
-import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 
@@ -34,17 +33,6 @@ import org.omg.CORBA.portable.OutputStream;
  */
 public class SequenceTypeHelper implements TypeHelper {
 
-    public TypeCode getType(TypeTreeNode node) {
-        TypeCode typeCode =
-            org.omg.CORBA.ORB.init().create_alias_tc(node.getJavaClass().getSimpleName(),
-                                                     node.getJavaClass().getSimpleName(),
-                                                     org.omg.CORBA.ORB.init()
-                                                         .create_sequence_tc(0,
-                                                                             TypeHelpersProxy.getType(node
-                                                                                 .getChildren()[0])));
-        return typeCode;
-    }
-
     public Object read(TypeTreeNode node, InputStream is) {
         Object sequence = null;
         try {
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ShortTypeHelper.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ShortTypeHelper.java
index fe6b2cfe9d..9130db65e4 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ShortTypeHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ShortTypeHelper.java
@@ -20,8 +20,6 @@
 package org.apache.tuscany.sca.binding.corba.impl.types.util;
 
 import org.apache.tuscany.sca.binding.corba.impl.types.TypeTreeNode;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 
@@ -30,10 +28,6 @@ import org.omg.CORBA.portable.OutputStream;
  */
 public class ShortTypeHelper implements TypeHelper {
 
-    public TypeCode getType(TypeTreeNode node) {
-        return ORB.init().get_primitive_tc(org.omg.CORBA.TCKind.from_int(2));
-    }
-
     public Object read(TypeTreeNode node, InputStream is) {
         return is.read_short();
     }
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StringTypeHelper.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StringTypeHelper.java
index 934ffe51c9..4d782efcc5 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StringTypeHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StringTypeHelper.java
@@ -20,8 +20,6 @@
 package org.apache.tuscany.sca.binding.corba.impl.types.util;
 
 import org.apache.tuscany.sca.binding.corba.impl.types.TypeTreeNode;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 
@@ -30,10 +28,6 @@ import org.omg.CORBA.portable.OutputStream;
  */
 public class StringTypeHelper implements TypeHelper {
 
-    public TypeCode getType(TypeTreeNode node) {
-        return ORB.init().create_string_tc(0);
-    }
-
     public Object read(TypeTreeNode node, InputStream is) {
         return is.read_string();
     }
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StructTypeHelper.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StructTypeHelper.java
index 1becd46296..a232fff56d 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StructTypeHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StructTypeHelper.java
@@ -22,8 +22,6 @@ package org.apache.tuscany.sca.binding.corba.impl.types.util;
 import java.lang.reflect.Field;
 
 import org.apache.tuscany.sca.binding.corba.impl.types.TypeTreeNode;
-import org.omg.CORBA.StructMember;
-import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 
@@ -32,25 +30,6 @@ import org.omg.CORBA.portable.OutputStream;
  */
 public class StructTypeHelper implements TypeHelper {
 
-    public TypeCode getType(TypeTreeNode node) {
-        TypeTreeNode[] children = node.getChildren();
-        if (children != null) {
-            StructMember[] members = new StructMember[children.length];
-            for (int i = 0; i < children.length; i++) {
-                members[i] =
-                    new StructMember(children[i].getJavaClass().getSimpleName(), TypeHelpersProxy.getType(children[i]),
-                                     null);
-            }
-            TypeCode result =
-                org.omg.CORBA.ORB.init().create_struct_tc(node.getJavaClass().getSimpleName(),
-                                                          node.getJavaClass().getSimpleName(),
-                                                          members);
-            return result;
-        } else {
-            return null;
-        }
-    }
-
     public Object read(TypeTreeNode node, InputStream is) {
         TypeTreeNode[] children = node.getChildren();
         Object result = null;
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelper.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelper.java
index a948b62610..c9d0dd263f 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelper.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelper.java
@@ -20,7 +20,6 @@
 package org.apache.tuscany.sca.binding.corba.impl.types.util;
 
 import org.apache.tuscany.sca.binding.corba.impl.types.TypeTreeNode;
-import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 
@@ -30,13 +29,6 @@ import org.omg.CORBA.portable.OutputStream;
 public interface TypeHelper {
 
     /**
-     * Gets type definition for CORBA API.
-     * @param node 
-     * @return
-     */
-    TypeCode getType(TypeTreeNode node);
-
-    /**
      * Reads CORBA object
      * @param node
      * @param is
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelpersProxy.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelpersProxy.java
index c8be7a299f..a14f311607 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelpersProxy.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelpersProxy.java
@@ -24,7 +24,6 @@ import java.util.Map;
 
 import org.apache.tuscany.sca.binding.corba.impl.types.NodeType;
 import org.apache.tuscany.sca.binding.corba.impl.types.TypeTreeNode;
-import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 
@@ -93,20 +92,6 @@ public class TypeHelpersProxy {
     }
 
     /**
-     * Proxies getType method invocation to appropriate TypeHelper
-     * implementation. It's not being used since I've changed method for passing
-     * arguments. May be useful while implementing CORBA service bindings.
-     * 
-     * @param node
-     * @return
-     */
-    public static final TypeCode getType(TypeTreeNode node) {
-        TypeHelper typeHelper = getTypeHelper(node);
-        TypeCode typeCode = typeHelper.getType(node);
-        return typeCode;
-    }
-
-    /**
      * Proxies read method invocation to appropriate TypeHelper implementation.
      * 
      * @param node
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/Utils.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/Utils.java
index de381f995b..68f71b7169 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/Utils.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/Utils.java
@@ -19,6 +19,10 @@
 
 package org.apache.tuscany.sca.binding.corba.impl.types.util;
 
+/**
+ * @version $Rev$ $Date$
+ * Class for type utilities
+ */
 public class Utils {
 
     /**
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/MethodFinder.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/MethodFinder.java
index ea18a33ce0..912d355641 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/MethodFinder.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/MethodFinder.java
@@ -24,6 +24,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
+ * @version $Rev$ $Date$
  * Utility for finding method in given class.
  */
 public class MethodFinder {
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/OperationMapper.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/OperationMapper.java
index 43a3f41e16..52a3ef45a9 100644
--- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/OperationMapper.java
+++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/OperationMapper.java
@@ -54,11 +54,21 @@ public final class OperationMapper {
         return allInterfaces;
     }
     
+    /**
+     * Maps Java methods to operation names
+     * @param intfClass
+     * @return
+     */
     @SuppressWarnings("unchecked")
     public static Map<Method, String> mapMethodToOperation(Class<?> intfClass) {
         return iiopMap(intfClass, false);
     }
 
+    /**
+     * Maps operation names to Java methods
+     * @param intfClass
+     * @return
+     */
     @SuppressWarnings("unchecked")
     public static Map<String, Method> mapOperationToMethod(Class<?> intfClass) {
         return iiopMap(intfClass, true);
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
index 1ccf22140b..0073726c2d 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
@@ -72,6 +72,10 @@ import org.omg.CosNaming.NameComponent;
 import org.omg.CosNaming.NamingContext;
 import org.omg.CosNaming.NamingContextHelper;
 
+/**
+ * @version $Rev$ $Date$
+ * Tests API for dynamic CORBA servants
+ */
 public class CorbaServantTestCase {
 
     private static ORB orb;
@@ -487,7 +491,7 @@ public class CorbaServantTestCase {
             //expecting exception...
             Class<?> javaClass = ((JavaInterface)service.getInterfaceContract().getInterface()).getJavaClass();
             InvocationProxy proxy = new ComponentInvocationProxy(service, service.getRuntimeWire(null), javaClass);
-            DynaCorbaServant servant = new DynaCorbaServant(proxy, Utils.getTypeId(javaClass));
+            new DynaCorbaServant(proxy, Utils.getTypeId(javaClass));
             fail();
         } catch (Exception e) {
             if (e instanceof RequestConfigurationException) {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
index e41a60d86a..6c7f8f1e8e 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
@@ -66,6 +66,7 @@ import org.omg.CosNaming.NamingContextHelper;
 
 /**
  * @version $Rev$ $Date$
+ * Tests API for dynamic CORBA requests. Tests handling various Java types.
  */
 public class CorbaTypesTestCase {
     private static TransientNameServer server;
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java
index 11bcdc195e..f0dccd9e7e 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java
@@ -20,6 +20,7 @@
 package org.apache.tuscany.sca.binding.corba.testing;
 
 /**
+ * @version $Rev$ $Date$
  * Interface that can be tested for operations mapping
  */
 public interface MappingTestInterface {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java
index fa64afca8b..725ce0ec41 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java
@@ -28,6 +28,7 @@ import org.apache.tuscany.sca.binding.corba.impl.util.MethodFinder;
 import org.junit.Test;
 
 /**
+ * @version $Rev$ $Date$
  * Various tests for MethodFinder
  */
 public class MethodFinderTestCase {
diff --git a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java
index 8d3f34f48c..fe2bf231a3 100644
--- a/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java
+++ b/java/sca/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java
@@ -28,6 +28,7 @@ import org.apache.tuscany.sca.binding.corba.impl.util.OperationMapper;
 import org.junit.Test;
 
 /**
+ * @version $Rev$ $Date$
  * Various tests for OperationsMapping
  */
 public class OperationMappingTestCase {