cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [3/3] git commit: Massive update to the CORBA binding to remove the subclassing of the TExtensibilityElement, cleanup the type hiearchy, and get the tests passing with MOXy
Date Thu, 27 Mar 2014 18:48:53 GMT
Massive update to the CORBA binding to remove the subclassing of the TExtensibilityElement, cleanup the type hiearchy, and get the tests passing with MOXy


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d214d105
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d214d105
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d214d105

Branch: refs/heads/master
Commit: d214d1052a8133571aa1be1dac2896591ca57948
Parents: b52aee8
Author: Daniel Kulp <dkulp@apache.org>
Authored: Thu Mar 27 14:47:57 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Thu Mar 27 14:48:44 2014 -0400

----------------------------------------------------------------------
 .../apache/cxf/binding/corba/CorbaTypeMap.java  |  16 +-
 .../corba/types/CorbaAnyEventProducer.java      |   4 +-
 .../binding/corba/types/CorbaHandlerUtils.java  |  14 +-
 .../binding/corba/types/CorbaObjectHandler.java |   8 +-
 .../corba/types/CorbaSequenceListener.java      |   4 +-
 .../corba/types/CorbaStructListener.java        |   4 +-
 .../cxf/binding/corba/utils/CorbaUtils.java     |   9 +-
 .../cxf/binding/corba/wsdl/CorbaTypeImpl.java   |  47 +-----
 .../corba/wsdl/WSDLExtensionRegister.java       |   5 +-
 .../resources/schemas/wsdl/corba-binding.xjb    |  10 +-
 .../resources/schemas/wsdl/corba-binding.xsd    | 154 +++++++++----------
 .../cxf/binding/corba/CorbaTypeMapTest.java     |  10 +-
 .../tools/corba/common/CorbaPrimitiveMap.java   |   6 +-
 .../corba/processors/idl/ArrayVisitor.java      |  18 +--
 .../corba/processors/idl/AttributeVisitor.java  |   4 +-
 .../corba/processors/idl/DeclaratorVisitor.java |   8 +-
 .../corba/processors/idl/ExceptionVisitor.java  |   6 +-
 .../processors/idl/FixedPtConstVisitor.java     |  10 +-
 .../processors/idl/IDLToWSDLProcessor.java      |  13 +-
 .../processors/idl/ObjectReferenceVisitor.java  |   8 +-
 .../corba/processors/idl/OperationVisitor.java  |   3 +-
 .../corba/processors/idl/ParamDclVisitor.java   |   6 +-
 .../corba/processors/idl/PortTypeVisitor.java   |   3 +-
 .../processors/idl/PrimitiveTypesVisitor.java   |  10 +-
 .../corba/processors/idl/ScopedNameVisitor.java |  28 ++--
 .../corba/processors/idl/SequenceVisitor.java   |  10 +-
 .../corba/processors/idl/StringVisitor.java     |   8 +-
 .../corba/processors/idl/StructVisitor.java     |  10 +-
 .../corba/processors/idl/TypedefVisitor.java    |   8 +-
 .../tools/corba/processors/idl/TypesUtils.java  |   8 +-
 .../corba/processors/idl/UnionVisitor.java      |   8 +-
 .../cxf/tools/corba/processors/idl/Visitor.java |   4 +-
 .../tools/corba/processors/idl/VisitorBase.java |   8 +-
 .../corba/processors/idl/VisitorTypeHolder.java |   8 +-
 .../corba/processors/idl/WSDLSchemaManager.java |  37 +----
 .../corba/processors/wsdl/WSDLParameter.java    |   8 +-
 .../processors/wsdl/WSDLToCorbaBinding.java     |  56 ++-----
 .../processors/wsdl/WSDLToCorbaHelper.java      | 112 +++++++-------
 .../corba/processors/wsdl/WSDLToIDLAction.java  |  56 ++-----
 .../tools/corba/processors/wsdl/WSDLTypes.java  |  28 ++--
 .../corba/common/CorbaPrimitiveMapTest.java     |   6 +-
 .../processors/IDLToWSDLGenerationTest.java     |  10 +-
 .../processors/WSDLToCorbaBindingTest.java      |  16 +-
 .../processors/WSDLToCorbaBindingTypeTest.java  |  16 +-
 .../tools/corba/utils/WSDLGenerationTester.java |  34 +---
 .../test/resources/wsdl/wsaddressing_bank.wsdl  |   2 +-
 46 files changed, 349 insertions(+), 512 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaTypeMap.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaTypeMap.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaTypeMap.java
index 3bd9dd6..857ec73 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaTypeMap.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaTypeMap.java
@@ -25,7 +25,7 @@ import java.util.Set;
 
 import javax.xml.namespace.QName;
 
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 import org.apache.cxf.binding.corba.wsdl.NamedType;
 import org.omg.CORBA.TypeCode;
 
@@ -33,20 +33,20 @@ import org.omg.CORBA.TypeCode;
 public class CorbaTypeMap {
 
     private String targetNamespace;
-    private Map<String, CorbaTypeImpl> typeMap;
+    private Map<String, CorbaType> typeMap;
     private Map<QName, TypeCode> typeCodeMap;
 
     public CorbaTypeMap(String namespace) {
         targetNamespace = namespace;
-        typeMap = new HashMap<String, CorbaTypeImpl>();
+        typeMap = new HashMap<String, CorbaType>();
         typeCodeMap = new HashMap<QName, TypeCode>();
     }
 
-    public void addType(String name, CorbaTypeImpl type) {
+    public void addType(String name, CorbaType type) {
         typeMap.put(name, type);
     }
 
-    public CorbaTypeImpl getType(String name) {
+    public CorbaType getType(String name) {
         assert name != null;
 
         return typeMap.get(name);
@@ -79,9 +79,9 @@ public class CorbaTypeMap {
             return null;
         }
 
-        Set<Map.Entry<String, CorbaTypeImpl>> mapSet = typeMap.entrySet();
-        for (Iterator<Map.Entry<String, CorbaTypeImpl>> i = mapSet.iterator(); i.hasNext();) {
-            Map.Entry<String, CorbaTypeImpl> entry = i.next();
+        Set<Map.Entry<String, CorbaType>> mapSet = typeMap.entrySet();
+        for (Iterator<Map.Entry<String, CorbaType>> i = mapSet.iterator(); i.hasNext();) {
+            Map.Entry<String, CorbaType> entry = i.next();
             if (entry.getValue() instanceof NamedType) {
                 NamedType n = (NamedType)entry.getValue();
                 if (n.getRepositoryID().equals(repId)) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyEventProducer.java
index b0a9db7..8918e30 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyEventProducer.java
@@ -32,7 +32,7 @@ import org.apache.cxf.binding.corba.runtime.CorbaObjectReader;
 import org.apache.cxf.binding.corba.utils.CorbaAnyHelper;
 import org.apache.cxf.binding.corba.utils.CorbaUtils;
 import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 import org.apache.cxf.binding.corba.wsdl.W3CConstants;
 import org.apache.cxf.service.model.ServiceInfo;
 import org.omg.CORBA.Any;
@@ -135,7 +135,7 @@ public class CorbaAnyEventProducer extends AbstractStartEndEventProducer {
         if (CorbaAnyHelper.isPrimitiveIdlType(idlType)) {
             result = CorbaAnyHelper.convertPrimitiveIdlToSchemaType(obj.getIdlType());
         } else {
-            CorbaTypeImpl impl = obj.getType();
+            CorbaType impl = obj.getType();
             result = impl.getType();
         }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtils.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtils.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtils.java
index 65eeb7d..56eed7f 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtils.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtils.java
@@ -31,7 +31,7 @@ import org.apache.cxf.binding.corba.wsdl.Alias;
 import org.apache.cxf.binding.corba.wsdl.Anonarray;
 import org.apache.cxf.binding.corba.wsdl.Anonsequence;
 import org.apache.cxf.binding.corba.wsdl.Array;
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 import org.apache.cxf.binding.corba.wsdl.Exception;
 import org.apache.cxf.binding.corba.wsdl.MemberType;
 import org.apache.cxf.binding.corba.wsdl.Sequence;
@@ -79,7 +79,7 @@ public final class CorbaHandlerUtils {
             handler = new CorbaAnyHandler(name, idlType, tc, null);
             ((CorbaAnyHandler)handler).setTypeMap(typeMap);
         } else {
-            CorbaTypeImpl type = CorbaUtils.getCorbaType(idlType, typeMap);
+            CorbaType type = CorbaUtils.getCorbaType(idlType, typeMap);
             switch (tc.kind().value()) {
             case TCKind._tk_array:
                 handler = new CorbaArrayHandler(name, idlType, tc, type);
@@ -176,7 +176,7 @@ public final class CorbaHandlerUtils {
                                               Map<QName, CorbaObjectHandler> seenTypes) {
         QName arrayElementType = null;
         long arrayBound = 0;
-        CorbaTypeImpl baseType = obj.getType();
+        CorbaType baseType = obj.getType();
         QName elementName;
         if (baseType instanceof Array) {
             Array arrayType = (Array)baseType;
@@ -231,7 +231,7 @@ public final class CorbaHandlerUtils {
                                                  Map<QName, CorbaObjectHandler> seenTypes) {
         QName seqElementType = null;
         long seqBound = 0;
-        CorbaTypeImpl baseType = obj.getType();
+        CorbaType baseType = obj.getType();
         QName elementName;
         if (baseType instanceof Sequence) {
             Sequence seqType = (Sequence)baseType;
@@ -415,7 +415,7 @@ public final class CorbaHandlerUtils {
             handler = new CorbaPrimitiveHandler(name, idlType, tc, null);
             result = new CorbaPrimitiveListener(handler);
         } else {
-            CorbaTypeImpl type = CorbaUtils.getCorbaType(idlType, typeMap);
+            CorbaType type = CorbaUtils.getCorbaType(idlType, typeMap);
             switch (tc.kind().value()) {
             case TCKind._tk_any:
                 handler = new CorbaAnyHandler(name, idlType, tc, type);
@@ -533,7 +533,7 @@ public final class CorbaHandlerUtils {
     }
 
     public static boolean isPrimitiveIDLTypeSequence(CorbaObjectHandler handler) {
-        CorbaTypeImpl seqType = handler.getType();
+        CorbaType seqType = handler.getType();
         QName seqElementType;
         if (seqType instanceof Anonsequence) {
             Anonsequence anonSeqType = (Anonsequence) seqType;
@@ -554,7 +554,7 @@ public final class CorbaHandlerUtils {
         return result;
     }
 
-    public static boolean isOctets(CorbaTypeImpl baseType) {
+    public static boolean isOctets(CorbaType baseType) {
         return baseType.getType().equals(W3CConstants.NT_SCHEMA_BASE64)
             || baseType.getType().equals(W3CConstants.NT_SCHEMA_HBIN);
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectHandler.java
index 9f2ddc5..3c348bb 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectHandler.java
@@ -21,7 +21,7 @@ package org.apache.cxf.binding.corba.types;
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.binding.corba.CorbaStreamable;
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.TCKind;
@@ -34,7 +34,7 @@ public class CorbaObjectHandler {
     protected QName name;
     protected QName idlType;
     protected TypeCode typeCode;
-    protected CorbaTypeImpl type;
+    protected CorbaType type;
     protected boolean isAnon;
     protected boolean isRecursive;
 
@@ -45,7 +45,7 @@ public class CorbaObjectHandler {
         name = objName;
         idlType = objIdlType;
         typeCode = objTC;
-        type = (CorbaTypeImpl)objType;
+        type = (CorbaType)objType;
     }
     
     public QName getName() {
@@ -68,7 +68,7 @@ public class CorbaObjectHandler {
         return typeCode.kind();
     }
     
-    public CorbaTypeImpl getType() {
+    public CorbaType getType() {
         return type;
     }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceListener.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceListener.java
index c62e3b7..a84a80b 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceListener.java
@@ -22,7 +22,7 @@ import javax.xml.namespace.QName;
 
 import org.apache.cxf.binding.corba.CorbaTypeMap;
 import org.apache.cxf.binding.corba.wsdl.Anonsequence;
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 import org.apache.cxf.binding.corba.wsdl.Sequence;
 import org.apache.cxf.service.model.ServiceInfo;
 import org.omg.CORBA.ORB;
@@ -46,7 +46,7 @@ public class CorbaSequenceListener extends AbstractCorbaTypeListener {
         orb = orbRef;
         typeMap = map;
         serviceInfo = sInfo;
-        CorbaTypeImpl seqType = handler.getType();
+        CorbaType seqType = handler.getType();
         QName elementName;
         if (seqType instanceof Anonsequence) {
             Anonsequence anonSeqType = (Anonsequence) seqType;

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructListener.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructListener.java
index c1e91e3..b498817 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructListener.java
@@ -26,7 +26,7 @@ import org.apache.cxf.binding.corba.CorbaTypeMap;
 import org.apache.cxf.binding.corba.utils.CorbaUtils;
 import org.apache.cxf.binding.corba.wsdl.Abstractanonsequence;
 import org.apache.cxf.binding.corba.wsdl.Abstractsequence;
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 import org.apache.cxf.binding.corba.wsdl.MemberType;
 import org.apache.cxf.binding.corba.wsdl.Struct;
 import org.apache.cxf.service.model.ServiceInfo;
@@ -98,7 +98,7 @@ public class CorbaStructListener extends AbstractCorbaTypeListener {
                 currentTypeListener.getCorbaObject().setAnonymousType(true);
                 currentTypeListener.processStartElement(name);
             } else {
-                CorbaTypeImpl type = CorbaUtils.getCorbaType(member.getIdltype(), typeMap);
+                CorbaType type = CorbaUtils.getCorbaType(member.getIdltype(), typeMap);
                 boolean wrapped = true;
                 if (type instanceof Abstractsequence) {
                     wrapped = ((Abstractsequence)type).isWrapped();

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java
index 94560c1..a51354e 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java
@@ -41,7 +41,6 @@ import org.apache.cxf.binding.corba.wsdl.Array;
 import org.apache.cxf.binding.corba.wsdl.CaseType;
 import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
 import org.apache.cxf.binding.corba.wsdl.CorbaType;
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
 import org.apache.cxf.binding.corba.wsdl.Enum;
 import org.apache.cxf.binding.corba.wsdl.Enumerator;
 import org.apache.cxf.binding.corba.wsdl.Exception;
@@ -418,7 +417,7 @@ public final class CorbaUtils {
         return PRIMITIVE_TYPECODES.values().contains(tc.kind());
     }
 
-    public static CorbaTypeImpl getCorbaType(QName idlType, CorbaTypeMap typeMap) {
+    public static CorbaType getCorbaType(QName idlType, CorbaTypeMap typeMap) {
         if (!isPrimitiveIdlType(idlType) && (typeMap != null)) {
             return typeMap.getType(idlType.getLocalPart());
         }
@@ -432,10 +431,10 @@ public final class CorbaUtils {
             TypeMappingType tmType = tmTypes.get(0);
             map = new CorbaTypeMap(tmType.getTargetNamespace());
 
-            List<CorbaTypeImpl> types = tmType.getStructOrExceptionOrUnion();
+            List<CorbaType> types = tmType.getStructOrExceptionOrUnion();
             LOG.fine("Found " + types.size() + " types defined in the typemap");
-            for (Iterator<CorbaTypeImpl> it = types.iterator(); it.hasNext();) {
-                CorbaTypeImpl corbaType = it.next();
+            for (Iterator<CorbaType> it = types.iterator(); it.hasNext();) {
+                CorbaType corbaType = it.next();
                 String name = corbaType.getName();
                 // There can be some instances where a prefix is added to the name by the tool
                 // (e.g. Object Reference Names).  Since the name is read as a string, this

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/CorbaTypeImpl.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/CorbaTypeImpl.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/CorbaTypeImpl.java
index db553b2..8daf9c6 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/CorbaTypeImpl.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/CorbaTypeImpl.java
@@ -19,48 +19,11 @@
 
 package org.apache.cxf.binding.corba.wsdl;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
 import javax.xml.namespace.QName;
 
 
-/**
- * Anonymous IDL type. Has no repository ID.
- *  Used for intermediate types for multidimensional arrays 
- * and sequences of sequences.
- *             
- * 
- * <p>Java class for corbaType complex type.
- * 
- * <p>The following schema fragment specifies the expected i
- * content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="corbaType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="name" use="required" i
- *       type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="type" use="required" i
- *      type="{http://www.w3.org/2001/XMLSchema}QName" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "corbaTypeImpl")
-public class CorbaTypeImpl 
-      extends CorbaType {
-
-
-    @XmlAttribute(required = true)
-    protected QName name;
+public class CorbaTypeImpl {
+    protected QName qname;
     
     /**
      * Gets the value of the qname property.
@@ -71,7 +34,7 @@ public class CorbaTypeImpl
      *     
      */
     public QName getQName() {
-        return name;
+        return qname;
     }
 
     /**
@@ -83,11 +46,11 @@ public class CorbaTypeImpl
      *     
      */
     public void setQName(QName value) {
-        this.name = value;
+        this.qname = value;
     }
 
     public boolean isSetQName() {
-        return this.name != null;
+        return this.qname != null;
     }
     
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/WSDLExtensionRegister.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/WSDLExtensionRegister.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/WSDLExtensionRegister.java
index 5f3d538..ef006d2 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/WSDLExtensionRegister.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/WSDLExtensionRegister.java
@@ -24,7 +24,6 @@ import javax.xml.bind.JAXBException;
 import org.apache.cxf.Bus;
 import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.wsdl.JAXBExtensionHelper;
-import org.apache.cxf.wsdl.TExtensibilityElementImpl;
 import org.apache.cxf.wsdl.WSDLExtensionLoader;
 import org.apache.cxf.wsdl.WSDLManager;
 
@@ -67,7 +66,7 @@ public final class WSDLExtensionRegister implements WSDLExtensionLoader {
     }
     private void createExtensor(WSDLManager manager,
                                 Class<?> parentType,
-                                Class<? extends TExtensibilityElementImpl> elementType) {
+                                Class<?> elementType) {
         try {
             JAXBExtensionHelper.addExtensions(manager.getExtensionRegistry(),
                                               parentType, 
@@ -80,7 +79,7 @@ public final class WSDLExtensionRegister implements WSDLExtensionLoader {
 
     private void createCompatExtensor(WSDLManager manager,
                                       Class<?> parentType,
-                                      Class<? extends TExtensibilityElementImpl> elementType) {
+                                      Class<?> elementType) {
         try {
             JAXBExtensionHelper.addExtensions(manager.getExtensionRegistry(),
                                               parentType, 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/rt/bindings/corba/src/main/resources/schemas/wsdl/corba-binding.xjb
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/resources/schemas/wsdl/corba-binding.xjb b/rt/bindings/corba/src/main/resources/schemas/wsdl/corba-binding.xjb
index 7276431..931daf3 100644
--- a/rt/bindings/corba/src/main/resources/schemas/wsdl/corba-binding.xjb
+++ b/rt/bindings/corba/src/main/resources/schemas/wsdl/corba-binding.xjb
@@ -22,16 +22,8 @@
   xmlns:xs="http://www.w3.org/2001/XMLSchema" 
   xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc" 
   jaxb:extensionBindingPrefixes="xjc">
-    <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd" node="/xs:schema">
-        <jaxb:schemaBindings>
-            <jaxb:package name="org.apache.cxf.wsdl"/>
-        </jaxb:schemaBindings>
-        <jaxb:globalBindings generateIsSetMethod="true"/>
-    </jaxb:bindings>
-    <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd" node="/xs:schema/xs:complexType[@name='tExtensibilityElement']">
-        <jaxb:class implClass="org.apache.cxf.wsdl.TExtensibilityElementImpl"/>
-    </jaxb:bindings>
     <jaxb:bindings schemaLocation="corba-binding.xsd" node="/xs:schema">
+        <jaxb:globalBindings generateIsSetMethod="true"/>
         <jaxb:schemaBindings>
             <jaxb:package name="org.apache.cxf.binding.corba.wsdl"/>
         </jaxb:schemaBindings>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/rt/bindings/corba/src/main/resources/schemas/wsdl/corba-binding.xsd
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/resources/schemas/wsdl/corba-binding.xsd b/rt/bindings/corba/src/main/resources/schemas/wsdl/corba-binding.xsd
index b29598a..668dc51 100644
--- a/rt/bindings/corba/src/main/resources/schemas/wsdl/corba-binding.xsd
+++ b/rt/bindings/corba/src/main/resources/schemas/wsdl/corba-binding.xsd
@@ -20,26 +20,28 @@
 -->
 
 <xs:schema targetNamespace="http://cxf.apache.org/bindings/corba" 
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
     xmlns:corba="http://cxf.apache.org/bindings/corba" 
     xmlns:xs="http://www.w3.org/2001/XMLSchema" 
     xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     jaxb:version="2.0"
     elementFormDefault="qualified" 
     attributeFormDefault="unqualified"> 
-    
-    <xs:import namespace="http://schemas.xmlsoap.org/wsdl/"
-        schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd"/>
-  
+      
+        <xs:complexType name="baseCorbaType">
+                <xs:annotation>
+        			<xs:appinfo>
+            			<jaxb:class ref="org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl"/>                                
+        			</xs:appinfo>      
+                </xs:annotation>
+	    </xs:complexType>  
         <xs:complexType name="corbaType">
                 <xs:annotation>
                         <xs:documentation>Anonymous IDL type. Has no repository ID.
             Used for intermediate types for multidimensional arrays and sequences of sequences.
             </xs:documentation>            
-        <xs:appinfo>
-            <jaxb:class implClass="org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl"/>                                
-        </xs:appinfo>      
                 </xs:annotation>
+                <xs:complexContent>
+                        <xs:extension base="corba:baseCorbaType">
                 <xs:attribute name="name" type="xs:string" use="required">
                   <xs:annotation>
                     <xs:documentation>Specifies a name for the mapped type. Typically this name is derived from the XML Schema type being mapped.</xs:documentation>
@@ -51,6 +53,8 @@
                   </xs:annotation>
                 </xs:attribute>
                 <xs:attribute name="qualified" type="xs:boolean" />
+                </xs:extension>
+                </xs:complexContent>
         </xs:complexType>
         <xs:complexType name="namedType">
                 <xs:annotation>
@@ -258,7 +262,7 @@
                 </xs:annotation>
                 <xs:complexContent>
                         <xs:extension base="corba:corbaType">
-                                <xs:attribute name="bound" type="corba:ulong"/>
+                                <xs:attribute name="bound" type="corba:ulong" use="required"/>
                         </xs:extension>
                 </xs:complexContent>
         </xs:complexType>
@@ -268,7 +272,7 @@
                 </xs:annotation>
                 <xs:complexContent>
                         <xs:extension base="corba:corbaType">
-                                <xs:attribute name="bound" type="corba:ulong"/>
+                                <xs:attribute name="bound" type="corba:ulong" use="required"/>
                         </xs:extension>
                 </xs:complexContent>
         </xs:complexType>
@@ -301,41 +305,33 @@
                 <xs:annotation>
                         <xs:documentation>CXF CORBA WSDL binding type map.</xs:documentation>
                 </xs:annotation>
-                <xs:complexContent>
-                        <xs:extension base="wsdl:tExtensibilityElement">
-                                <xs:sequence>
-                                        <xs:choice maxOccurs="unbounded">
-                                                <xs:element name="struct" type="corba:struct"/>
-                                                <xs:element name="exception" type="corba:exception"/>
-                                                <xs:element name="union" type="corba:union"/>
-                                                <xs:element name="alias" type="corba:alias"/>
-                                                <xs:element name="sequence" type="corba:sequence"/>
-                                                <xs:element name="array" type="corba:array"/>
-                                                <xs:element name="enum" type="corba:enum"/>
-                                                <xs:element name="fixed" type="corba:fixed"/>
-                                                <xs:element name="anonsequence" type="corba:anonsequence"/>
-                                                <xs:element name="anonarray" type="corba:anonarray"/>
-                                                <xs:element name="anonstring" type="corba:anonstring"/>
-                                                <xs:element name="anonwstring" type="corba:anonwstring"/>
-                                                <xs:element name="anonfixed" type="corba:anonfixed"/>
-                                                <xs:element name="const" type="corba:const"/>
-                                                <xs:element name="object" type="corba:object"/>
-                                        </xs:choice>
-                                </xs:sequence>
-                                <xs:attribute name="targetNamespace" type="xs:anyURI" use="required"/>
-                        </xs:extension>
-                </xs:complexContent>
+                <xs:sequence>
+                        <xs:choice maxOccurs="unbounded">
+                                <xs:element name="struct" type="corba:struct"/>
+                                <xs:element name="exception" type="corba:exception"/>
+                                <xs:element name="union" type="corba:union"/>
+                                <xs:element name="alias" type="corba:alias"/>
+                                <xs:element name="sequence" type="corba:sequence"/>
+                                <xs:element name="array" type="corba:array"/>
+                                <xs:element name="enum" type="corba:enum"/>
+                                <xs:element name="fixed" type="corba:fixed"/>
+                                <xs:element name="anonsequence" type="corba:anonsequence"/>
+                                <xs:element name="anonarray" type="corba:anonarray"/>
+                                <xs:element name="anonstring" type="corba:anonstring"/>
+                                <xs:element name="anonwstring" type="corba:anonwstring"/>
+                                <xs:element name="anonfixed" type="corba:anonfixed"/>
+                                <xs:element name="const" type="corba:const"/>
+                                <xs:element name="object" type="corba:object"/>
+                        </xs:choice>
+                </xs:sequence>
+                <xs:attribute name="targetNamespace" type="xs:anyURI" use="required"/>
         </xs:complexType>
         <!-- Begin CORBA Binding Definitions -->
         <xs:complexType name="addressType">
                 <xs:annotation>
                         <xs:documentation>CXF CORBA Address Type</xs:documentation>
                 </xs:annotation>
-                <xs:complexContent>
-                        <xs:extension base="wsdl:tExtensibilityElement">
-                                <xs:attribute name="location" type="xs:string" use="required"/>
-                        </xs:extension>
-                </xs:complexContent>
+                <xs:attribute name="location" type="xs:string" use="required"/>
         </xs:complexType>
         <xs:element name="address" type="corba:addressType"/>
         <xs:complexType name="policyType">
@@ -344,38 +340,34 @@
                 Artix IIOP tunnel policy specification.
             </xs:documentation>
                 </xs:annotation>
-                <xs:complexContent>
-                        <xs:extension base="wsdl:tExtensibilityElement">
-                                <xs:attribute name="poaname" type="xs:string" use="optional">
-                                        <xs:annotation>
-                                                <xs:documentation>
-                                                        Attribute used to set a poaname, otherwise it will
-                                                        default to the service name that this port runs under.
+                <xs:attribute name="poaname" type="xs:string" use="optional">
+                        <xs:annotation>
+                                <xs:documentation>
+                                        Attribute used to set a poaname, otherwise it will
+                                        default to the service name that this port runs under.
 
-                                                        poaname is used for setting certain policies, such
-                                                        as direct persistence and well-known port numbers in
-                                                        the orb config file.
-                                                </xs:documentation>
-                                        </xs:annotation>
-                                </xs:attribute>
-                                <xs:attribute name="serviceid" type="xs:string" use="optional">
-                                        <xs:annotation>
-                                                <xs:documentation>
-                                                        Attribute used to set a serviceid
-                                                        see CORBA documentation for more details.
-                                                </xs:documentation>
-                                        </xs:annotation>
-                                </xs:attribute>
-                                <xs:attribute name="persistent" type="xs:boolean" use="optional" default="false">
-                                        <xs:annotation>
-                                                <xs:documentation>
-                                                        Attribute select whether to use a persistent poa.
-                                                        see CORBA documentation for more details.
-                                                </xs:documentation>
-                                        </xs:annotation>
-                                </xs:attribute>
-                        </xs:extension>
-                </xs:complexContent>
+                                        poaname is used for setting certain policies, such
+                                        as direct persistence and well-known port numbers in
+                                        the orb config file.
+                                </xs:documentation>
+                        </xs:annotation>
+                </xs:attribute>
+                <xs:attribute name="serviceid" type="xs:string" use="optional">
+                        <xs:annotation>
+                                <xs:documentation>
+                                        Attribute used to set a serviceid
+                                        see CORBA documentation for more details.
+                                </xs:documentation>
+                        </xs:annotation>
+                </xs:attribute>
+                <xs:attribute name="persistent" type="xs:boolean" use="optional" default="false">
+                        <xs:annotation>
+                                <xs:documentation>
+                                        Attribute select whether to use a persistent poa.
+                                        see CORBA documentation for more details.
+                                </xs:documentation>
+                        </xs:annotation>
+                </xs:attribute>
         </xs:complexType>
         <xs:element name="policy" type="corba:policyType"/>
 
@@ -386,12 +378,8 @@
                 <xs:annotation>
                         <xs:documentation>CXF CORBA Binding Type</xs:documentation>
                 </xs:annotation>
-                <xs:complexContent>
-                        <xs:extension base="wsdl:tExtensibilityElement">
-                                <xs:attribute name="repositoryID" type="xs:string" use="required"/>
+                <xs:attribute name="repositoryID" type="xs:string" use="required"/>
                 <xs:attribute name="bases" type="corba:basesType" use="optional"/>
-                        </xs:extension>
-                </xs:complexContent>
         </xs:complexType>
         <xs:element name="binding" type="corba:bindingType">
                 <xs:annotation>
@@ -402,16 +390,12 @@
                 <xs:annotation>
                         <xs:documentation>CORBA Operation Type</xs:documentation>
                 </xs:annotation>
-                <xs:complexContent>
-                        <xs:extension base="wsdl:tExtensibilityElement">
-                                <xs:sequence>
-                                        <xs:element name="param" type="corba:paramType" minOccurs="0" maxOccurs="unbounded"/>
-                                        <xs:element name="return" type="corba:argType" minOccurs="0"/>
-                                        <xs:element name="raises" type="corba:raisesType" minOccurs="0" maxOccurs="unbounded"/>
-                                </xs:sequence>
-                                <xs:attribute name="name" type="xs:string" use="required"/>
-                        </xs:extension>
-                </xs:complexContent>
+                <xs:sequence>
+                        <xs:element name="param" type="corba:paramType" minOccurs="0" maxOccurs="unbounded"/>
+                        <xs:element name="return" type="corba:argType" minOccurs="0"/>
+                        <xs:element name="raises" type="corba:raisesType" minOccurs="0" maxOccurs="unbounded"/>
+                </xs:sequence>
+                <xs:attribute name="name" type="xs:string" use="required"/>
         </xs:complexType>
         <xs:element name="operation" type="corba:operationType">
                 <xs:annotation>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java
index 3bd4ecd..766f42e 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java
@@ -20,7 +20,7 @@ package org.apache.cxf.binding.corba;
 
 import javax.xml.namespace.QName;
 
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -33,20 +33,16 @@ public class CorbaTypeMapTest extends Assert {
         String targetNamespace = typeMap.getTargetNamespace();
         assertEquals(targetNamespace, "http://yoko.apache.org/ComplexTypes");
         
-        QName qname = new QName("http://yoko.apache.org/ComplexTypes", 
-                                "Test.MultiPart.Colour", "");
         QName type = new QName("http://yoko.apache.org/ComplexTypes",
                                "xsd1:Test.MultiPart.Colour", "");
                 
-        CorbaTypeImpl corbaTypeImpl = new CorbaTypeImpl();
-        corbaTypeImpl.setQName(qname);
+        CorbaType corbaTypeImpl = new CorbaType();
         corbaTypeImpl.setType(type);
         corbaTypeImpl.setName("Test.MultiPart.Colour");
         typeMap.addType("Test.MultiPart.Colour", corbaTypeImpl);
         
-        CorbaTypeImpl corbatype = typeMap.getType("Test.MultiPart.Colour");
+        CorbaType corbatype = typeMap.getType("Test.MultiPart.Colour");
         assertEquals(corbatype.getName(), "Test.MultiPart.Colour");
-        assertEquals(corbatype.getQName().getNamespaceURI(), "http://yoko.apache.org/ComplexTypes");
         assertEquals(corbatype.getType().getLocalPart(), "xsd1:Test.MultiPart.Colour");
     }
     

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMap.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMap.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMap.java
index 8d41eef..916fd6d 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMap.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMap.java
@@ -24,7 +24,7 @@ import java.util.HashMap;
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 
 public class CorbaPrimitiveMap extends PrimitiveMapBase {
     
@@ -75,11 +75,11 @@ public class CorbaPrimitiveMap extends PrimitiveMapBase {
     }
     
     public Object get(QName key) {
-        CorbaTypeImpl corbaTypeImpl = null;
+        CorbaType corbaTypeImpl = null;
 
         QName type = corbaPrimitiveMap.get(key.getLocalPart());
         if (type != null) {
-            corbaTypeImpl = new CorbaTypeImpl();
+            corbaTypeImpl = new CorbaType();
             corbaTypeImpl.setQName(type);
             corbaTypeImpl.setType(key);
             corbaTypeImpl.setName(key.getLocalPart());

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ArrayVisitor.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ArrayVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ArrayVisitor.java
index b888655..cb2123f 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ArrayVisitor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ArrayVisitor.java
@@ -27,7 +27,7 @@ import antlr.collections.AST;
 
 import org.apache.cxf.binding.corba.wsdl.Anonarray;
 import org.apache.cxf.binding.corba.wsdl.Array;
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 import org.apache.cxf.tools.corba.common.ReferenceConstants;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaComplexType;
@@ -95,7 +95,7 @@ public class ArrayVisitor extends VisitorBase {
         // process first array
         Long size = new Long(firstSizeNode.toString());
         XmlSchemaType stype = null;
-        CorbaTypeImpl ctype = null;
+        CorbaType ctype = null;
         if (identifierNode != null) {
             Scope scopedName = getScope();
             if (result.getSchemaType() != null) {
@@ -144,7 +144,7 @@ public class ArrayVisitor extends VisitorBase {
         setCorbaType(ctype);
     }
 
-    private Types doAnonarray(AST node, XmlSchemaType stype, CorbaTypeImpl ctype) {
+    private Types doAnonarray(AST node, XmlSchemaType stype, CorbaType ctype) {
         Types result = new Types();
 
         if (node != null) {
@@ -218,7 +218,7 @@ public class ArrayVisitor extends VisitorBase {
     }
 
     private Array generateCorbaArray(Scope scopedName, Long size,
-                                     CorbaTypeImpl type, XmlSchemaType stype, Scope fQName) {
+                                     CorbaType type, XmlSchemaType stype, Scope fQName) {
         Array array = new Array();
         array.setQName(new QName(typeMap.getTargetNamespace(), scopedName.toString()));
         array.setBound(size);
@@ -237,7 +237,7 @@ public class ArrayVisitor extends VisitorBase {
     }
 
     private Anonarray generateCorbaAnonarray(String name, Long size,
-                                             CorbaTypeImpl type, XmlSchemaType stype, Scope fQName) {
+                                             CorbaType type, XmlSchemaType stype, Scope fQName) {
         Anonarray anonarray = new Anonarray();
         anonarray.setQName(new QName(typeMap.getTargetNamespace(), name));
         anonarray.setBound(size);
@@ -256,7 +256,7 @@ public class ArrayVisitor extends VisitorBase {
 
     class Types {
         private XmlSchemaType schemaType;
-        private CorbaTypeImpl corbaType;
+        private CorbaType corbaType;
         private Scope fullyQualifiedName;
 
         public Types() {
@@ -264,7 +264,7 @@ public class ArrayVisitor extends VisitorBase {
             corbaType = null;
         }
 
-        public Types(XmlSchemaType stype, CorbaTypeImpl ctype,
+        public Types(XmlSchemaType stype, CorbaType ctype,
                      Scope fqName) {
             schemaType = stype;
             corbaType = ctype;
@@ -275,7 +275,7 @@ public class ArrayVisitor extends VisitorBase {
             schemaType = stype;
         }
 
-        public void setCorbaType(CorbaTypeImpl ctype) {
+        public void setCorbaType(CorbaType ctype) {
             corbaType = ctype;
         }
 
@@ -283,7 +283,7 @@ public class ArrayVisitor extends VisitorBase {
             return schemaType;
         }
 
-        public CorbaTypeImpl getCorbaType() {
+        public CorbaType getCorbaType() {
             return corbaType;
         }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/AttributeVisitor.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/AttributeVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/AttributeVisitor.java
index 1beed04..d53ed6d 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/AttributeVisitor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/AttributeVisitor.java
@@ -21,6 +21,7 @@ package org.apache.cxf.tools.corba.processors.idl;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.wsdl.Binding;
 import javax.wsdl.BindingInput;
 import javax.wsdl.BindingOperation;
@@ -33,6 +34,7 @@ import javax.wsdl.Output;
 import javax.wsdl.Part;
 import javax.wsdl.PortType;
 import javax.wsdl.WSDLException;
+import javax.wsdl.extensions.ExtensibilityElement;
 import javax.wsdl.extensions.ExtensionRegistry;
 import javax.xml.namespace.QName;
 
@@ -388,7 +390,7 @@ public class AttributeVisitor extends VisitorBase {
         bindingOutput.setName(op.getOutput().getName());
 
         BindingOperation bindingOperation = definition.createBindingOperation();
-        bindingOperation.addExtensibilityElement(corbaOp);
+        bindingOperation.addExtensibilityElement((ExtensibilityElement)corbaOp);
         bindingOperation.setOperation(op);
         bindingOperation.setName(op.getName());
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/DeclaratorVisitor.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/DeclaratorVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/DeclaratorVisitor.java
index 117ecdf..f8d623f 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/DeclaratorVisitor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/DeclaratorVisitor.java
@@ -25,7 +25,7 @@ import javax.xml.namespace.QName;
 import antlr.collections.AST;
 
 import org.apache.cxf.binding.corba.wsdl.Alias;
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 import org.apache.cxf.binding.corba.wsdl.Fixed;
 import org.apache.cxf.binding.corba.wsdl.Sequence;
 import org.apache.ws.commons.schema.XmlSchema;
@@ -45,7 +45,7 @@ public class DeclaratorVisitor extends VisitorBase {
                              XmlSchema schemaRef,
                              WSDLASTVisitor wsdlASTVisitor,
                              XmlSchemaType schemaTypeRef,
-                             CorbaTypeImpl corbaTypeRef,
+                             CorbaType corbaTypeRef,
                              Scope fQName) {
         super(scope, defn, schemaRef, wsdlASTVisitor);
         setSchemaType(schemaTypeRef);
@@ -95,10 +95,10 @@ public class DeclaratorVisitor extends VisitorBase {
     }
 
     private void visitNewTypes(Scope newScope) {
-        CorbaTypeImpl nextCorbaType = null;
+        CorbaType nextCorbaType = null;
         XmlSchemaType nextSchemaType = null;
 
-        CorbaTypeImpl oldCorbaType = getCorbaType();
+        CorbaType oldCorbaType = getCorbaType();
 
         QName newQname = new QName(getCorbaType().getQName().getNamespaceURI(), newScope.toString());
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ExceptionVisitor.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ExceptionVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ExceptionVisitor.java
index 24f5643..74c8b47 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ExceptionVisitor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ExceptionVisitor.java
@@ -26,7 +26,7 @@ import javax.xml.namespace.QName;
 
 import antlr.collections.AST;
 
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 import org.apache.cxf.binding.corba.wsdl.MemberType;
 import org.apache.cxf.tools.corba.common.ReferenceConstants;
 import org.apache.ws.commons.schema.XmlSchema;
@@ -108,7 +108,7 @@ public class ExceptionVisitor extends VisitorBase {
                                                     null);
             visitor.visit(memberTypeNode);
             XmlSchemaType stype = visitor.getSchemaType();
-            CorbaTypeImpl ctype = visitor.getCorbaType();
+            CorbaType ctype = visitor.getCorbaType();
             Scope fullyQualifiedName = visitor.getFullyQualifiedName();
 
             // needed for anonymous arrays in exceptions
@@ -188,7 +188,7 @@ public class ExceptionVisitor extends VisitorBase {
         return member;
     }
 
-    private MemberType createMemberType(AST memberNode, CorbaTypeImpl ctype,
+    private MemberType createMemberType(AST memberNode, CorbaType ctype,
                                         Scope fqName) {
         // corba:member
         MemberType memberType = new MemberType();

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/FixedPtConstVisitor.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/FixedPtConstVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/FixedPtConstVisitor.java
index 10f7e73..f8904c2 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/FixedPtConstVisitor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/FixedPtConstVisitor.java
@@ -25,7 +25,7 @@ import javax.xml.namespace.QName;
 import antlr.collections.AST;
 
 import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaCollection;
 import org.apache.ws.commons.schema.XmlSchemaType;
@@ -34,7 +34,7 @@ import org.apache.ws.commons.schema.constants.Constants;
 public class FixedPtConstVisitor implements Visitor {
         
     private XmlSchemaType schemaType;
-    private CorbaTypeImpl corbaType;
+    private CorbaType corbaType;
     private Scope scope;
     private XmlSchemaCollection schemas;
     
@@ -59,7 +59,7 @@ public class FixedPtConstVisitor implements Visitor {
         //      <fixed_pt_const_type> ::= "fixed"
                 
         XmlSchemaType stype = null; 
-        CorbaTypeImpl ctype = null;
+        CorbaType ctype = null;
         
         QName corbaTypeQName =  CorbaConstants.NE_CORBA_FIXED; 
         
@@ -68,7 +68,7 @@ public class FixedPtConstVisitor implements Visitor {
             if (schemaTypeQName != null) {        
                 stype = schemas.getTypeByQName(schemaTypeQName);
                 if (stype != null) {
-                    ctype = new CorbaTypeImpl();
+                    ctype = new CorbaType();
                     ctype.setQName(corbaTypeQName);
                     ctype.setType(stype.getQName());
                     ctype.setName(stype.getQName().getLocalPart());
@@ -84,7 +84,7 @@ public class FixedPtConstVisitor implements Visitor {
         return schemaType;
     }
     
-    public CorbaTypeImpl getCorbaType() {
+    public CorbaType getCorbaType() {
         return corbaType;
     }
     

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java
index 3cbace6..f56b167 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java
@@ -40,6 +40,7 @@ import javax.wsdl.Definition;
 import javax.wsdl.Port;
 import javax.wsdl.Service;
 import javax.wsdl.Types;
+import javax.wsdl.extensions.ExtensibilityElement;
 import javax.wsdl.extensions.schema.Schema;
 import javax.wsdl.extensions.schema.SchemaImport;
 import javax.xml.namespace.QName;
@@ -48,7 +49,7 @@ import antlr.collections.AST;
 
 import org.apache.cxf.binding.corba.wsdl.AddressType;
 import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 import org.apache.cxf.binding.corba.wsdl.TypeMappingType;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.tools.common.ToolConstants;
@@ -521,17 +522,17 @@ public class IDLToWSDLProcessor extends IDLProcessor {
                 addr = "IOR:";
             }
             address.setLocation(addr);
-            port.addExtensibilityElement(address);
+            port.addExtensibilityElement((ExtensibilityElement)address);
             service.addPort(port);
             port.setBinding(bindings[i]);
         }
     }
 
     public void cleanUpTypeMap(TypeMappingType typeMap) {
-        List<CorbaTypeImpl> types = typeMap.getStructOrExceptionOrUnion();
+        List<CorbaType> types = typeMap.getStructOrExceptionOrUnion();
         if (types != null) {
             for (int i = 0; i < types.size(); i++) {
-                CorbaTypeImpl type = types.get(i);
+                CorbaType type = types.get(i);
                 if (type.getQName() != null) {
                     type.setName(type.getQName().getLocalPart());
                     type.setQName(null);
@@ -541,7 +542,7 @@ public class IDLToWSDLProcessor extends IDLProcessor {
     }
     
     public void addTypeMapSchemaImports(Definition def, WSDLASTVisitor visitor) {
-        List<CorbaTypeImpl> types = visitor.getTypeMap().getStructOrExceptionOrUnion();
+        List<CorbaType> types = visitor.getTypeMap().getStructOrExceptionOrUnion();
         ModuleToNSMapper mapper = visitor.getModuleToNSMapper();
         WSDLSchemaManager manager = visitor.getManager();
         Collection<String> namespaces = CastUtils.cast(def.getNamespaces().values());
@@ -549,7 +550,7 @@ public class IDLToWSDLProcessor extends IDLProcessor {
         
         if (types != null) {
             for (int i = 0; i < types.size(); i++) {
-                CorbaTypeImpl type = types.get(i);
+                CorbaType type = types.get(i);
                 QName schemaType = type.getType();
                 if (schemaType != null) {
                     String typeNamespace = schemaType.getNamespaceURI();

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ObjectReferenceVisitor.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ObjectReferenceVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ObjectReferenceVisitor.java
index f163248..5f2bcf7 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ObjectReferenceVisitor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ObjectReferenceVisitor.java
@@ -36,7 +36,7 @@ import org.w3c.dom.Element;
 import antlr.collections.AST;
 
 import org.apache.cxf.binding.corba.wsdl.BindingType;
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 import org.apache.cxf.binding.corba.wsdl.Object;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.tools.corba.common.ReferenceConstants;
@@ -292,9 +292,9 @@ public class ObjectReferenceVisitor extends VisitorBase {
         // Get the list of all corba types already defined and look for the provided
         // QName.  If we have defined this type, we don't need to add it to the typemap
         // again.
-        List<CorbaTypeImpl> allTypes = typeMap.getStructOrExceptionOrUnion();
-        for (Iterator<CorbaTypeImpl> iter = allTypes.iterator(); iter.hasNext();) {
-            CorbaTypeImpl impl = iter.next();
+        List<CorbaType> allTypes = typeMap.getStructOrExceptionOrUnion();
+        for (Iterator<CorbaType> iter = allTypes.iterator(); iter.hasNext();) {
+            CorbaType impl = iter.next();
             if (impl.getQName().equals(objectReferenceName))  {
                 return true;
             }

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/OperationVisitor.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/OperationVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/OperationVisitor.java
index b64ef26..5d5343f 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/OperationVisitor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/OperationVisitor.java
@@ -33,6 +33,7 @@ import javax.wsdl.Output;
 import javax.wsdl.Part;
 import javax.wsdl.PortType;
 import javax.wsdl.WSDLException;
+import javax.wsdl.extensions.ExtensibilityElement;
 import javax.wsdl.extensions.ExtensionRegistry;
 import javax.xml.namespace.QName;
 
@@ -233,7 +234,7 @@ public class OperationVisitor extends VisitorBase {
             throw new RuntimeException(ex);
         }
         corbaOperation.setName(corbaOpName);
-        bindingOperation.addExtensibilityElement(corbaOperation);
+        bindingOperation.addExtensibilityElement((ExtensibilityElement)corbaOperation);
         bindingOperation.setOperation(op);
         bindingOperation.setName(op.getName());
         binding.addBindingOperation(bindingOperation);

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ParamDclVisitor.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ParamDclVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ParamDclVisitor.java
index 01186a1..3d5736a 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ParamDclVisitor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ParamDclVisitor.java
@@ -23,7 +23,7 @@ import javax.wsdl.Definition;
 
 import antlr.collections.AST;
 
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 import org.apache.cxf.binding.corba.wsdl.ModeType;
 import org.apache.cxf.binding.corba.wsdl.OperationType;
 import org.apache.cxf.binding.corba.wsdl.ParamType;
@@ -77,7 +77,7 @@ public class ParamDclVisitor extends VisitorBase {
                                                                 wsdlVisitor);
         visitor.visit(typeNode);
         XmlSchemaType schemaType = visitor.getSchemaType();
-        CorbaTypeImpl corbaType = visitor.getCorbaType();
+        CorbaType corbaType = visitor.getCorbaType();
         Scope fullyQualifiedName = visitor.getFullyQualifiedName();
 
         switch (node.getType()) {
@@ -135,7 +135,7 @@ public class ParamDclVisitor extends VisitorBase {
         return element;
     }
 
-    private void addCorbaParam(CorbaTypeImpl corbaType, ModeType mode,
+    private void addCorbaParam(CorbaType corbaType, ModeType mode,
                                String partName, Scope fullyQualifiedName) {
         ParamType param = new ParamType();
         param.setName(partName);

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PortTypeVisitor.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PortTypeVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PortTypeVisitor.java
index 487cc7d..d443847 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PortTypeVisitor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PortTypeVisitor.java
@@ -31,6 +31,7 @@ import javax.wsdl.Fault;
 import javax.wsdl.Operation;
 import javax.wsdl.PortType;
 import javax.wsdl.WSDLException;
+import javax.wsdl.extensions.ExtensibilityElement;
 import javax.wsdl.extensions.ExtensionRegistry;
 import javax.xml.namespace.QName;
 
@@ -254,7 +255,7 @@ public class PortTypeVisitor extends VisitorBase {
                                         + pragmaPrefix
                                         + scopedPortTypeName.replace('.', '/')
                                         + CorbaConstants.IDL_VERSION);
-            binding.addExtensibilityElement(bindingType);
+            binding.addExtensibilityElement((ExtensibilityElement)bindingType);
         } catch (WSDLException ex) {
             throw new RuntimeException(ex);
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PrimitiveTypesVisitor.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PrimitiveTypesVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PrimitiveTypesVisitor.java
index 131ce1b..d81c999 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PrimitiveTypesVisitor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PrimitiveTypesVisitor.java
@@ -28,7 +28,7 @@ import javax.xml.namespace.QName;
 import antlr.collections.AST;
 
 import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 import org.apache.cxf.tools.corba.common.XmlSchemaPrimitiveMap;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaCollection;
@@ -55,7 +55,7 @@ public class PrimitiveTypesVisitor implements Visitor {
     }
 
     private XmlSchemaType schemaType;
-    private CorbaTypeImpl corbaType;
+    private CorbaType corbaType;
     private Scope scope;
     private XmlSchemaCollection schemas;
     
@@ -106,7 +106,7 @@ public class PrimitiveTypesVisitor implements Visitor {
  
         
         XmlSchemaType stype = null; 
-        CorbaTypeImpl ctype = null;
+        CorbaType ctype = null;
         QName corbaTypeQName = PrimitiveTypesVisitor.getPrimitiveType(node);
         if (corbaTypeQName != null) {
             QName schemaTypeQName = xmlSchemaPrimitiveMap.get(corbaTypeQName);
@@ -114,7 +114,7 @@ public class PrimitiveTypesVisitor implements Visitor {
                 //XmlSchemaCollection schemas = new XmlSchemaCollection();
                 stype = schemas.getTypeByQName(schemaTypeQName);
                 if (stype != null) {
-                    ctype = new CorbaTypeImpl();
+                    ctype = new CorbaType();
                     ctype.setQName(corbaTypeQName);
                     ctype.setType(stype.getQName());
                     ctype.setName(stype.getQName().getLocalPart());
@@ -131,7 +131,7 @@ public class PrimitiveTypesVisitor implements Visitor {
         return schemaType;
     }
     
-    public CorbaTypeImpl getCorbaType() {
+    public CorbaType getCorbaType() {
         return corbaType;
     }
     

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ScopedNameVisitor.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ScopedNameVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ScopedNameVisitor.java
index aec3ff8..2d1fb67 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ScopedNameVisitor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ScopedNameVisitor.java
@@ -32,7 +32,7 @@ import org.apache.cxf.binding.corba.wsdl.Anonarray;
 import org.apache.cxf.binding.corba.wsdl.Anonsequence;
 import org.apache.cxf.binding.corba.wsdl.Array;
 import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 import org.apache.cxf.binding.corba.wsdl.Sequence;
 import org.apache.cxf.binding.corba.wsdl.TypeMappingType;
 import org.apache.cxf.tools.corba.common.XmlSchemaPrimitiveMap;
@@ -95,7 +95,7 @@ public class ScopedNameVisitor extends VisitorBase {
         //                 | <scoped_name> "::" <identifier>
 
         XmlSchemaType stype = null;
-        CorbaTypeImpl ctype = null;        
+        CorbaType ctype = null;        
         if (PrimitiveTypesVisitor.accept(node)) {
             // primitive type            
             PrimitiveTypesVisitor primitiveVisitor =
@@ -147,13 +147,13 @@ public class ScopedNameVisitor extends VisitorBase {
         
     }
 
-    private static CorbaTypeImpl getCorbaSchemaType(XmlSchema xmlSchema,
+    private static CorbaType getCorbaSchemaType(XmlSchema xmlSchema,
                                                     TypeMappingType typeMap,
                                                     XmlSchemaType stype,
                                                     Scope scopedName) {       
-        CorbaTypeImpl ctype = null;
+        CorbaType ctype = null;
         if (stype.getQName().equals(Constants.XSD_STRING)) {
-            ctype = new CorbaTypeImpl();
+            ctype = new CorbaType();
             ctype.setName(CorbaConstants.NT_CORBA_STRING.getLocalPart());
             ctype.setQName(CorbaConstants.NT_CORBA_STRING);
             ctype.setType(Constants.XSD_STRING);
@@ -518,11 +518,11 @@ public class ScopedNameVisitor extends VisitorBase {
     
     
     
-    public static CorbaTypeImpl findCorbaTypeForSchemaType(TypeMappingType typeMap, 
+    public static CorbaType findCorbaTypeForSchemaType(TypeMappingType typeMap, 
                                                            QName schemaTypeName,
                                                            Scope scopedName) {
-        CorbaTypeImpl result = null;
-        for (CorbaTypeImpl type : typeMap.getStructOrExceptionOrUnion()) {         
+        CorbaType result = null;
+        for (CorbaType type : typeMap.getStructOrExceptionOrUnion()) {         
             if ((type instanceof Sequence)
                 || (type instanceof Array)
                 || (type.getType() == null)
@@ -550,9 +550,9 @@ public class ScopedNameVisitor extends VisitorBase {
         return result;
     }  
 
-    public static CorbaTypeImpl findCorbaType(TypeMappingType typeMap, QName typeName) {
-        CorbaTypeImpl result = null;
-        for (CorbaTypeImpl type : typeMap.getStructOrExceptionOrUnion()) {
+    public static CorbaType findCorbaType(TypeMappingType typeMap, QName typeName) {
+        CorbaType result = null;
+        for (CorbaType type : typeMap.getStructOrExceptionOrUnion()) {
             if (type.getQName().equals(typeName)) {
                 result = type;
                 break;
@@ -596,7 +596,7 @@ public class ScopedNameVisitor extends VisitorBase {
         XmlSchemaCollection schemas = wsdlVisitor.getSchemas();
 
         QName qname = new QName(typeMap.getTargetNamespace(), name);
-        CorbaTypeImpl corbaType = findCorbaType(typeMap, qname);
+        CorbaType corbaType = findCorbaType(typeMap, qname);
         if (corbaType != null) {
             if (corbaType instanceof Alias) {
                 result = true;
@@ -617,7 +617,7 @@ public class ScopedNameVisitor extends VisitorBase {
         return result;
     }
 
-    protected static void populateAliasSchemaType(CorbaTypeImpl corbaType,
+    protected static void populateAliasSchemaType(CorbaType corbaType,
                                                   WSDLASTVisitor wsdlVisitor,
                                                   VisitorTypeHolder holder) {
         XmlSchemaCollection schemas = wsdlVisitor.getSchemas();
@@ -625,7 +625,7 @@ public class ScopedNameVisitor extends VisitorBase {
         holder.setCorbaType(corbaType);
         Alias alias = (Alias) corbaType;
         //loop through alias base types, till you get a non-alias corba type
-        CorbaTypeImpl type = findCorbaType(typeMap, alias.getBasetype());
+        CorbaType type = findCorbaType(typeMap, alias.getBasetype());
         while ((type != null) && (type instanceof Alias)) {
             alias = (Alias) type;
             type = findCorbaType(typeMap, alias.getBasetype());

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SequenceVisitor.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SequenceVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SequenceVisitor.java
index 6acb650..384583c 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SequenceVisitor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SequenceVisitor.java
@@ -25,7 +25,7 @@ import javax.xml.namespace.QName;
 import antlr.collections.AST;
 
 import org.apache.cxf.binding.corba.wsdl.Anonsequence;
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 import org.apache.cxf.binding.corba.wsdl.Sequence;
 import org.apache.cxf.tools.corba.common.ReferenceConstants;
 import org.apache.ws.commons.schema.XmlSchema;
@@ -83,7 +83,7 @@ public class SequenceVisitor extends VisitorBase {
         visitor.visit(simpleTypeSpecNode);
 
         XmlSchemaType stype = visitor.getSchemaType();
-        CorbaTypeImpl ctype = visitor.getCorbaType();
+        CorbaType ctype = visitor.getCorbaType();
         Scope fullyQualifiedName = visitor.getFullyQualifiedName();
 
 
@@ -119,7 +119,7 @@ public class SequenceVisitor extends VisitorBase {
             schemaType = generateSchemaType(null, scopedName, bound, fullyQualifiedName);
         }
 
-        CorbaTypeImpl corbaType = null;
+        CorbaType corbaType = null;
         if (identifierNode == null) {
             corbaType = generateCorbaAnonsequence(ctype,
                                                   schemaType,
@@ -168,7 +168,7 @@ public class SequenceVisitor extends VisitorBase {
         return ct;
     }
 
-    private CorbaTypeImpl generateCorbaSequence(CorbaTypeImpl ctype,
+    private CorbaType generateCorbaSequence(CorbaType ctype,
                                                 XmlSchemaType schemaType,
                                                 Scope scopedName,
                                                 long bound,
@@ -195,7 +195,7 @@ public class SequenceVisitor extends VisitorBase {
         return corbaSeq;
     }
 
-    private Anonsequence generateCorbaAnonsequence(CorbaTypeImpl ctype,
+    private Anonsequence generateCorbaAnonsequence(CorbaType ctype,
                                                    XmlSchemaType schemaType,
                                                    Scope scopedName,
                                                    long bound,

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StringVisitor.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StringVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StringVisitor.java
index 4bd0a02..f4ef3b4 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StringVisitor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StringVisitor.java
@@ -28,7 +28,7 @@ import org.apache.cxf.binding.corba.wsdl.Alias;
 import org.apache.cxf.binding.corba.wsdl.Anonstring;
 import org.apache.cxf.binding.corba.wsdl.Anonwstring;
 import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaMaxLengthFacet;
 import org.apache.ws.commons.schema.XmlSchemaSimpleType;
@@ -130,7 +130,7 @@ public class StringVisitor extends VisitorBase {
 
         setSchemaType(simpleType);
 
-        CorbaTypeImpl anon = null;
+        CorbaType anon = null;
         if (stringNode.getType() == IDLTokenTypes.LITERAL_string) {
             // corba:anonstring
             Anonstring anonstring = new Anonstring();
@@ -175,7 +175,7 @@ public class StringVisitor extends VisitorBase {
 
         Scope anonstringScopedName = new Scope(getScope(), "_Anon1_" + stringScopedName.tail());
         String anonstringName = anonstringScopedName.toString();
-        CorbaTypeImpl anon = null;
+        CorbaType anon = null;
         if (stringNode.getType() == IDLTokenTypes.LITERAL_string) {
             // corba:anonstring
             Anonstring anonstring = new Anonstring();
@@ -219,7 +219,7 @@ public class StringVisitor extends VisitorBase {
 
 
         // corba type
-        CorbaTypeImpl corbaString = new CorbaTypeImpl();
+        CorbaType corbaString = new CorbaType();
         if (stringNode.getType() == IDLTokenTypes.LITERAL_string) {
             corbaString.setQName(CorbaConstants.NT_CORBA_STRING);
             corbaString.setName(CorbaConstants.NT_CORBA_STRING.getLocalPart());

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StructVisitor.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StructVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StructVisitor.java
index c112f5a..cb2d23f 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StructVisitor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StructVisitor.java
@@ -27,7 +27,7 @@ import javax.xml.namespace.QName;
 
 import antlr.collections.AST;
 
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 import org.apache.cxf.binding.corba.wsdl.MemberType;
 import org.apache.cxf.binding.corba.wsdl.Struct;
 import org.apache.cxf.tools.corba.common.ReferenceConstants;
@@ -114,7 +114,7 @@ public class StructVisitor extends VisitorBase {
             AST memberNode = TypesUtils.getCorbaTypeNameNode(memberTypeNode);
 
             XmlSchemaType schemaType = null;
-            CorbaTypeImpl corbaType = null;
+            CorbaType corbaType = null;
             Scope fqName = null;
             try {
                 TypesVisitor visitor = new TypesVisitor(structScope,
@@ -141,7 +141,7 @@ public class StructVisitor extends VisitorBase {
                    && !ScopedNameVisitor.accept(structScope, definition, schema, memberNode, wsdlVisitor, true)) {
 
                 XmlSchemaType memberSchemaType = schemaType;
-                CorbaTypeImpl memberCorbaType = corbaType;
+                CorbaType memberCorbaType = corbaType;
                 // needed for anonymous arrays in structs
                 if (ArrayVisitor.accept(memberNode)) {
                     Scope anonScope = new Scope(structScope,
@@ -195,7 +195,7 @@ public class StructVisitor extends VisitorBase {
     }
 
     private MemberType createMemberType(AST memberNode,
-                                        CorbaTypeImpl corbaType,
+                                        CorbaType corbaType,
                                         Scope fqName) {
         // corba:member
         String memberName = memberNode.toString();
@@ -227,7 +227,7 @@ public class StructVisitor extends VisitorBase {
             List<DeferredAction> list = deferredActions.getActions(structScope);
             if ((list != null) && !list.isEmpty()) {
                 XmlSchemaType stype = getSchemaType();
-                CorbaTypeImpl ctype = getCorbaType();
+                CorbaType ctype = getCorbaType();
                 Iterator<DeferredAction> iterator = list.iterator();
                 while (iterator.hasNext()) {
                     SchemaDeferredAction action = (SchemaDeferredAction)iterator.next();

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypedefVisitor.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypedefVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypedefVisitor.java
index 62bca4d..97bf6f5 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypedefVisitor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypedefVisitor.java
@@ -26,7 +26,7 @@ import antlr.collections.AST;
 
 import org.apache.cxf.binding.corba.wsdl.Alias;
 import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaType;
 import org.apache.ws.commons.schema.constants.Constants;
@@ -61,7 +61,7 @@ public class TypedefVisitor extends VisitorBase {
         typesVisitor.visit(typeDeclaratorNode);
 
         XmlSchemaType schemaType = typesVisitor.getSchemaType();
-        CorbaTypeImpl corbaType = typesVisitor.getCorbaType();
+        CorbaType corbaType = typesVisitor.getCorbaType();
         Scope fullyQualifiedName = typesVisitor.getFullyQualifiedName();
         Scope typedefScope = new Scope(getScope(), identifierNode);
         
@@ -150,7 +150,7 @@ public class TypedefVisitor extends VisitorBase {
     
     private void generateAlias(AST identifierNode,
                                XmlSchemaType schemaType,
-                               CorbaTypeImpl corbaType,
+                               CorbaType corbaType,
                                Scope fqName) {
     
         Scope scopedName = new Scope(getScope(), identifierNode);
@@ -174,7 +174,7 @@ public class TypedefVisitor extends VisitorBase {
     private void generateStringAlias(AST typeDeclaratorNode,
                                      AST identifierNode,
                                      XmlSchemaType schemaType,
-                                     CorbaTypeImpl corbaType,
+                                     CorbaType corbaType,
                                      Scope fqName) {
         
         Scope typedefScope = new Scope(getScope(), identifierNode);

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypesUtils.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypesUtils.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypesUtils.java
index 01e4a18..9e96820 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypesUtils.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypesUtils.java
@@ -27,7 +27,7 @@ import javax.xml.namespace.QName;
 import antlr.collections.AST;
 
 import org.apache.cxf.binding.corba.wsdl.Const;
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 import org.apache.cxf.binding.corba.wsdl.TypeMappingType;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaType;
@@ -103,9 +103,9 @@ public final class TypesUtils {
     }
     
     public static String getConstValueByName(AST node, TypeMappingType typeMap) {
-        List<CorbaTypeImpl> types = typeMap.getStructOrExceptionOrUnion();
-        for (Iterator<CorbaTypeImpl> it = types.iterator(); it.hasNext();) {
-            CorbaTypeImpl corbaType = it.next();
+        List<CorbaType> types = typeMap.getStructOrExceptionOrUnion();
+        for (Iterator<CorbaType> it = types.iterator(); it.hasNext();) {
+            CorbaType corbaType = it.next();
             if (corbaType instanceof Const) {
                 Const corbaConst = (Const) corbaType;
                 String name = corbaConst.getQName().getLocalPart();

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/UnionVisitor.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/UnionVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/UnionVisitor.java
index 09cfcf5..1b06f0b 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/UnionVisitor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/UnionVisitor.java
@@ -28,7 +28,7 @@ import javax.xml.namespace.QName;
 import antlr.collections.AST;
 
 import org.apache.cxf.binding.corba.wsdl.CaseType;
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 import org.apache.cxf.binding.corba.wsdl.Union;
 import org.apache.cxf.binding.corba.wsdl.Unionbranch;
 import org.apache.cxf.tools.corba.common.ReferenceConstants;
@@ -93,7 +93,7 @@ public class UnionVisitor extends VisitorBase {
         // it should be visited by a SwitchTypeSpecVisitor
         TypesVisitor visitor = new TypesVisitor(getScope(), definition, schema, wsdlVisitor, null);
         visitor.visit(discriminatorNode);
-        CorbaTypeImpl ctype = visitor.getCorbaType();
+        CorbaType ctype = visitor.getCorbaType();
         Scope fullyQualifiedName = visitor.getFullyQualifiedName();
 
         XmlSchemaChoice choice = new XmlSchemaChoice();
@@ -181,7 +181,7 @@ public class UnionVisitor extends VisitorBase {
                                                     null);
             visitor.visit(typeNode);
             XmlSchemaType stype = visitor.getSchemaType();
-            CorbaTypeImpl ctype = visitor.getCorbaType();
+            CorbaType ctype = visitor.getCorbaType();
             Scope fullyQualifiedName = visitor.getFullyQualifiedName();
 
 
@@ -271,7 +271,7 @@ public class UnionVisitor extends VisitorBase {
             List<DeferredAction> list = deferredActions.getActions(unionScope);
             if ((list != null) && !list.isEmpty()) {
                 XmlSchemaType stype = getSchemaType();
-                CorbaTypeImpl ctype = getCorbaType();
+                CorbaType ctype = getCorbaType();
                 Iterator<DeferredAction> iterator = list.iterator();
                 while (iterator.hasNext()) {
                     SchemaDeferredAction action = (SchemaDeferredAction)iterator.next();

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Visitor.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Visitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Visitor.java
index 8ca3625..2c8ce01 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Visitor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Visitor.java
@@ -21,7 +21,7 @@ package org.apache.cxf.tools.corba.processors.idl;
 
 import antlr.collections.AST;
 
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 import org.apache.ws.commons.schema.XmlSchemaType;
 
 public interface Visitor {
@@ -29,7 +29,7 @@ public interface Visitor {
     void visit(AST node);
     
     XmlSchemaType getSchemaType();
-    CorbaTypeImpl getCorbaType();
+    CorbaType getCorbaType();
 
     Scope getScope();  
     Scope getFullyQualifiedName();  

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/VisitorBase.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/VisitorBase.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/VisitorBase.java
index c93bb63..2372b54 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/VisitorBase.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/VisitorBase.java
@@ -23,7 +23,7 @@ import javax.wsdl.Definition;
 
 import antlr.collections.AST;
 
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 import org.apache.cxf.binding.corba.wsdl.TypeMappingType;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaCollection;
@@ -42,7 +42,7 @@ public abstract class VisitorBase implements Visitor {
     protected Definition definition;
     
     private XmlSchemaType schemaType;
-    private CorbaTypeImpl corbaType;
+    private CorbaType corbaType;
     private Scope fullyQualifiedName;
 
     private Scope scope;
@@ -79,11 +79,11 @@ public abstract class VisitorBase implements Visitor {
         return schemaType;
     }
     
-    protected void setCorbaType(CorbaTypeImpl type) {
+    protected void setCorbaType(CorbaType type) {
         corbaType = type;
     }
     
-    public CorbaTypeImpl getCorbaType() {
+    public CorbaType getCorbaType() {
         return corbaType;        
     }
     


Mime
View raw message