cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [2/3] 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:52 GMT
http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/VisitorTypeHolder.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/VisitorTypeHolder.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/VisitorTypeHolder.java
index 1796971..10bb8db 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/VisitorTypeHolder.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/VisitorTypeHolder.java
@@ -19,15 +19,15 @@
 
 package org.apache.cxf.tools.corba.processors.idl;
 
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 import org.apache.ws.commons.schema.XmlSchemaType;
 
 public class VisitorTypeHolder {
 
-    CorbaTypeImpl ctype;
+    CorbaType ctype;
     XmlSchemaType stype;
 
-    public CorbaTypeImpl getCorbaType() {
+    public CorbaType getCorbaType() {
         return ctype;
     }
 
@@ -35,7 +35,7 @@ public class VisitorTypeHolder {
         return stype;
     }
 
-    public void setCorbaType(CorbaTypeImpl type) {
+    public void setCorbaType(CorbaType type) {
         ctype = type;
     }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java
index 355cb37..4379b19 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java
@@ -26,27 +26,22 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
 import javax.wsdl.Definition;
 import javax.wsdl.Import;
-import javax.wsdl.Port;
 import javax.wsdl.Types;
 import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensionRegistry;
+import javax.wsdl.extensions.ExtensibilityElement;
 import javax.wsdl.extensions.schema.Schema;
 import javax.wsdl.extensions.schema.SchemaImport;
 import javax.wsdl.factory.WSDLFactory;
 import javax.xml.bind.JAXBException;
 import javax.xml.namespace.QName;
 
-import org.apache.cxf.binding.corba.wsdl.AddressType;
-import org.apache.cxf.binding.corba.wsdl.BindingType;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
-import org.apache.cxf.binding.corba.wsdl.OperationType;
 import org.apache.cxf.binding.corba.wsdl.TypeMappingType;
-import org.apache.cxf.wsdl.JAXBExtensionHelper;
 import org.apache.cxf.wsdl.WSDLConstants;
+import org.apache.cxf.wsdl.WSDLManager;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaCollection;
 import org.apache.ws.commons.schema.XmlSchemaExternal;
@@ -84,15 +79,16 @@ public class WSDLSchemaManager {
     }
 
     public Definition createWSDLDefinition(String tns) throws WSDLException, JAXBException {
-        WSDLFactory wsdlFactory = WSDLFactory.newInstance();
+        WSDLManager wm = BusFactory.getThreadDefaultBus().getExtension(WSDLManager.class);
+        WSDLFactory wsdlFactory = wm.getWSDLFactory();
         Definition wsdlDefinition = wsdlFactory.newDefinition();
+        wsdlDefinition.setExtensionRegistry(wm.getExtensionRegistry());
         wsdlDefinition.setTargetNamespace(tns);
         wsdlDefinition.addNamespace("wsdl", "http://schemas.xmlsoap.org/wsdl/");
         wsdlDefinition.addNamespace(WSDLConstants.NP_SCHEMA_XSD, WSDLConstants.NS_SCHEMA_XSD);
         wsdlDefinition.addNamespace(WSDLConstants.SOAP11_PREFIX, WSDLConstants.NS_SOAP11);
         wsdlDefinition.addNamespace("tns", tns);
         wsdlDefinition.addNamespace(CorbaConstants.NP_WSDL_CORBA, CorbaConstants.NU_WSDL_CORBA);
-        addCorbaExtensions(wsdlDefinition.getExtensionRegistry());
         defns.put(tns, wsdlDefinition);
         return wsdlDefinition;
     }
@@ -231,25 +227,6 @@ public class WSDLSchemaManager {
         }
     }
 
-    private void addCorbaExtensions(ExtensionRegistry extReg) throws JAXBException {
-        try {
-            JAXBExtensionHelper.addExtensions(extReg, Binding.class, BindingType.class);
-            JAXBExtensionHelper.addExtensions(extReg, BindingOperation.class, OperationType.class);
-            JAXBExtensionHelper.addExtensions(extReg, Definition.class, TypeMappingType.class);
-            JAXBExtensionHelper.addExtensions(extReg, Port.class, AddressType.class);
-
-            extReg.mapExtensionTypes(Binding.class, CorbaConstants.NE_CORBA_BINDING, BindingType.class);
-            extReg.mapExtensionTypes(BindingOperation.class, CorbaConstants.NE_CORBA_OPERATION,
-                                     org.apache.cxf.binding.corba.wsdl.OperationType.class);
-            extReg.mapExtensionTypes(Definition.class, CorbaConstants.NE_CORBA_TYPEMAPPING,
-                                     TypeMappingType.class);
-            extReg.mapExtensionTypes(Port.class, CorbaConstants.NE_CORBA_ADDRESS,
-                                     org.apache.cxf.binding.corba.wsdl.AddressType.class);
-        } catch (javax.xml.bind.JAXBException ex) {
-            throw new JAXBException(ex.getMessage());
-        }
-    }
-
     public void deferAttachSchemaToWSDL(Definition definition, XmlSchema schema, boolean isSchemaGenerated)
         throws Exception {
         DeferredSchemaAttachment attachment = new DeferredSchemaAttachment();
@@ -321,7 +298,7 @@ public class WSDLSchemaManager {
         } else {
             typeMap.setTargetNamespace(corbatypemaptns);
         }
-        definition.addExtensibilityElement(typeMap);
+        definition.addExtensibilityElement((ExtensibilityElement)typeMap);
         return typeMap;
     }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java
index adbe9ae..6b93661 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java
@@ -32,7 +32,7 @@ import javax.wsdl.Part;
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.binding.corba.wsdl.ArgType;
-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.ParamType;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
@@ -436,9 +436,9 @@ public final class WSDLParameter {
     private static QName getIdlType(WSDLToCorbaBinding wsdlToCorbaBinding, XmlSchemaType schemaType,
                                     QName typeName, boolean nill) throws Exception {
         QName idltype = null;
-        CorbaTypeImpl corbaTypeImpl = null;
+        CorbaType corbaTypeImpl = null;
         if (schemaType == null) {
-            corbaTypeImpl = (CorbaTypeImpl)WSDLToCorbaHelper.CORBAPRIMITIVEMAP.get(typeName);
+            corbaTypeImpl = (CorbaType)WSDLToCorbaHelper.CORBAPRIMITIVEMAP.get(typeName);
             if (nill) {
                 QName qname = corbaTypeImpl.getQName();
                 idltype = wsdlToCorbaBinding.getHelper().createQNameCorbaNamespace(qname.getLocalPart()
@@ -487,7 +487,7 @@ public final class WSDLParameter {
                                            XmlSchemaAnnotation annotation, QName typeName, boolean nill)
         throws Exception {
         QName idltype = null;
-        CorbaTypeImpl corbaTypeImpl = null;
+        CorbaType corbaTypeImpl = null;
 
         corbaTypeImpl = wsdlToCorbaBinding.getHelper().convertSchemaToCorbaType(schemaType, typeName, null,
                                                                                 annotation, false);

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
index 9659444..3b602d7 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
@@ -44,19 +44,18 @@ import javax.wsdl.Port;
 import javax.wsdl.PortType;
 import javax.wsdl.Service;
 import javax.wsdl.WSDLException;
+import javax.wsdl.extensions.ExtensibilityElement;
 import javax.wsdl.extensions.ExtensionRegistry;
-import javax.xml.bind.JAXBException;
 import javax.xml.namespace.QName;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-
 import org.apache.cxf.binding.corba.wsdl.AddressType;
 import org.apache.cxf.binding.corba.wsdl.ArgType;
 import org.apache.cxf.binding.corba.wsdl.BindingType;
 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.MemberType;
 import org.apache.cxf.binding.corba.wsdl.OperationType;
 import org.apache.cxf.binding.corba.wsdl.ParamType;
@@ -67,7 +66,6 @@ import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.tools.common.ToolException;
-import org.apache.cxf.wsdl.JAXBExtensionHelper;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaAnnotation;
 import org.apache.ws.commons.schema.XmlSchemaAnnotationItem;
@@ -225,7 +223,6 @@ public class WSDLToCorbaBinding {
 
         if (extReg == null) {
             extReg = def.getExtensionRegistry();
-            addExtensions(extReg);
         }
 
         bindingNames = new ArrayList<String>();
@@ -287,7 +284,7 @@ public class WSDLToCorbaBinding {
                                         + binding.getPortType().getQName().getLocalPart().replace('.', '/')
                                         + WSDLToCorbaHelper.IDL_VERSION);
 
-            binding.addExtensibilityElement(bindingType);
+            binding.addExtensibilityElement((ExtensibilityElement)bindingType);
         } catch (WSDLException ex) {
             ex.printStackTrace();
         }
@@ -309,7 +306,6 @@ public class WSDLToCorbaBinding {
                                                 Binding binding) throws Exception {
         if (extReg == null) {
             extReg = def.getExtensionRegistry();
-            addExtensions(extReg);
         }
 
         String interfaceName = portType.getQName().getLocalPart();
@@ -362,7 +358,7 @@ public class WSDLToCorbaBinding {
                 addr = "file:./" + interfaceName + ".ref";
             }
             addressType.setLocation(addr);
-            servicePort.addExtensibilityElement(addressType);
+            servicePort.addExtensibilityElement((ExtensibilityElement)addressType);
         } catch (WSDLException ex) {
             throw new Exception("Failed to create CORBA address for service", ex);
         }
@@ -409,28 +405,6 @@ public class WSDLToCorbaBinding {
         }
     }
 
-    public void addExtensions(ExtensionRegistry extRegistry) throws JAXBException {
-        try {
-            JAXBExtensionHelper.addExtensions(extReg, Binding.class, BindingType.class);
-            JAXBExtensionHelper.addExtensions(extReg, BindingOperation.class,
-                                              org.apache.cxf.binding.corba.wsdl.OperationType.class);
-            JAXBExtensionHelper.addExtensions(extReg, Definition.class, TypeMappingType.class);
-            JAXBExtensionHelper.addExtensions(extReg, Port.class,
-                                              org.apache.cxf.binding.corba.wsdl.AddressType.class);
-
-            extReg.mapExtensionTypes(Binding.class, CorbaConstants.NE_CORBA_BINDING, BindingType.class);
-            extReg.mapExtensionTypes(BindingOperation.class, CorbaConstants.NE_CORBA_OPERATION,
-                                     org.apache.cxf.binding.corba.wsdl.OperationType.class);
-            extReg.mapExtensionTypes(Definition.class, CorbaConstants.NE_CORBA_TYPEMAPPING,
-                                     TypeMappingType.class);
-            extReg.mapExtensionTypes(Port.class, CorbaConstants.NE_CORBA_ADDRESS,
-                                     org.apache.cxf.binding.corba.wsdl.AddressType.class);
-        } catch (javax.xml.bind.JAXBException ex) {
-            LOG.log(Level.SEVERE, "Failing to serialize/deserialize extensions", ex);
-            throw new JAXBException(ex.getMessage());
-        }
-    }
-
     private void addCorbaOperationExtElement(BindingOperation bo, Operation op)
         throws Exception {
 
@@ -459,14 +433,14 @@ public class WSDLToCorbaBinding {
         Collection<Fault> faults = CastUtils.cast(op.getFaults().values());
         for (Fault fault : faults) {
             RaisesType raisestype = new RaisesType();
-            CorbaTypeImpl extype = convertFaultToCorbaType(xmlSchemaType, fault);
+            CorbaType extype = convertFaultToCorbaType(xmlSchemaType, fault);
             if (extype != null) {
                 raisestype.setException(helper.createQNameCorbaNamespace(extype.getName()));
                 operationType.getRaises().add(raisestype);
             }
         }
 
-        bo.addExtensibilityElement(operationType);
+        bo.addExtensibilityElement((ExtensibilityElement)operationType);
     }
 
 
@@ -485,7 +459,7 @@ public class WSDLToCorbaBinding {
             typeMappingType = (TypeMappingType)extReg.createExtension(Definition.class,
                                                                       CorbaConstants.NE_CORBA_TYPEMAPPING);
             typeMappingType.setTargetNamespace(getIdlNamespace());
-            definition.addExtensibilityElement(typeMappingType);
+            definition.addExtensibilityElement((ExtensibilityElement)typeMappingType);
         }
         helper.setTypeMap(typeMappingType);
         addCorbaTypes(definition);
@@ -513,7 +487,7 @@ public class WSDLToCorbaBinding {
 
     private void addCorbaTypes(XmlSchema xmlSchemaTypes) throws Exception {
         Map<QName, XmlSchemaType> objs = xmlSchemaTypes.getSchemaTypes();
-        CorbaTypeImpl corbaTypeImpl = null;
+        CorbaType corbaTypeImpl = null;
         for (XmlSchemaType type : objs.values()) {
             boolean anonymous = WSDLTypes.isAnonymous(type.getName());
             corbaTypeImpl = helper.convertSchemaToCorbaType(type, type.getQName(), null,
@@ -527,7 +501,7 @@ public class WSDLToCorbaBinding {
     }
 
 
-    private void addCorbaElements(CorbaTypeImpl corbaTypeImpl,
+    private void addCorbaElements(CorbaType corbaTypeImpl,
                                   XmlSchema xmlSchemaTypes) throws Exception {
         Map<QName, XmlSchemaElement> elements = xmlSchemaTypes.getElements();
         for (XmlSchemaElement el : elements.values()) {
@@ -597,7 +571,7 @@ public class WSDLToCorbaBinding {
         }
     }
 
-    private CorbaTypeImpl convertFaultToCorbaType(XmlSchema xmlSchema, Fault fault) throws Exception {
+    private CorbaType convertFaultToCorbaType(XmlSchema xmlSchema, Fault fault) throws Exception {
         org.apache.cxf.binding.corba.wsdl.Exception corbaex = null;
         XmlSchemaType schemaType = null;
         Iterator<Part> parts = CastUtils.cast(fault.getMessage().getParts().values().iterator());
@@ -628,7 +602,7 @@ public class WSDLToCorbaBinding {
                 QName faultMsgName = helper.createQNameCorbaNamespace(faultName);
                 corbaex.setName(faultName);
                 corbaex.setQName(faultMsgName);
-                CorbaTypeImpl corbaTypeImpl =
+                CorbaType corbaTypeImpl =
                     helper.convertSchemaToCorbaType(schemaType, name, null, null, false);
                 if (corbaTypeImpl != null) {
                     MemberType member = new MemberType();
@@ -664,9 +638,9 @@ public class WSDLToCorbaBinding {
                 + corbaex.getName().replace('.', '/')
                 + WSDLToCorbaHelper.IDL_VERSION;
             corbaex.setRepositoryID(repoId);
-            CorbaTypeImpl corbaTypeImpl = corbaex;
+            CorbaType corbaTypeImpl = corbaex;
             if (!helper.isDuplicate(corbaTypeImpl)) {
-                CorbaTypeImpl dup = helper.isDuplicateException(corbaTypeImpl);
+                CorbaType dup = helper.isDuplicateException(corbaTypeImpl);
                 if (dup != null) {
                     typeMappingType.getStructOrExceptionOrUnion().remove(dup);
                     typeMappingType.getStructOrExceptionOrUnion().add(corbaTypeImpl);
@@ -872,10 +846,10 @@ public class WSDLToCorbaBinding {
     }
 
     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);

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
index f288110..ad5fdfb 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
@@ -40,7 +40,7 @@ import org.apache.cxf.binding.corba.wsdl.Abstractanonsequence;
 import org.apache.cxf.binding.corba.wsdl.Abstractsequence;
 import org.apache.cxf.binding.corba.wsdl.CaseType;
 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.Enum;
 import org.apache.cxf.binding.corba.wsdl.Enumerator;
 import org.apache.cxf.binding.corba.wsdl.MemberType;
@@ -104,7 +104,7 @@ public class WSDLToCorbaHelper {
     SchemaCollection xmlSchemaList;
     TypeMappingType typeMappingType;
     Definition def;
-    Map<QName, CorbaTypeImpl> recursionMap = new HashMap<QName, CorbaTypeImpl>();
+    Map<QName, CorbaType> recursionMap = new HashMap<QName, CorbaType>();
 
     public void setTypeMap(TypeMappingType map) {
         typeMappingType = map;
@@ -130,13 +130,13 @@ public class WSDLToCorbaHelper {
         def = defn;
     }
 
-    public CorbaTypeImpl convertSchemaToCorbaType(XmlSchemaType stype,
+    public CorbaType convertSchemaToCorbaType(XmlSchemaType stype,
                                                   QName defaultName,
                                                   XmlSchemaType parent,
                                                   XmlSchemaAnnotation annotation,
                                                   boolean anonymous)
         throws Exception {
-        CorbaTypeImpl corbaTypeImpl = null;
+        CorbaType corbaTypeImpl = null;
         if (!isAddressingNamespace(stype.getQName())) {
             // need to determine if its a primitive type.
             if (stype instanceof XmlSchemaComplexType) {
@@ -189,7 +189,7 @@ public class WSDLToCorbaHelper {
 
             if (container instanceof XmlSchemaSequence) {
                 XmlSchemaSequence sequence = (XmlSchemaSequence)container;
-                CorbaTypeImpl memberType =
+                CorbaType memberType =
                     processSequenceType(sequence, defaultName, schemaTypeName);
                 QName typeName = memberType.getQName();
                 if (memberType instanceof Struct
@@ -219,7 +219,7 @@ public class WSDLToCorbaHelper {
             } else if (container instanceof XmlSchemaElement) {
                 XmlSchemaElement element = (XmlSchemaElement)container;
 
-                CorbaTypeImpl corbatype = processLocalElement(defaultName, element, schemaTypeName.getNamespaceURI());
+                CorbaType corbatype = processLocalElement(defaultName, element, schemaTypeName.getNamespaceURI());
                 QName elName = element.getQName();
                 if (elName == null) {
                     elName = element.getRef().getTargetQName();
@@ -246,7 +246,7 @@ public class WSDLToCorbaHelper {
     private MemberType processChoiceMember(XmlSchemaChoice choice, QName defaultName,
         QName schemaTypeName) throws Exception {
 
-        CorbaTypeImpl corbatype = processChoice(choice, defaultName, schemaTypeName);
+        CorbaType corbatype = processChoice(choice, defaultName, schemaTypeName);
         MemberType member = new MemberType();
         member.setName(corbatype.getQName().getLocalPart());
         member.setIdltype(corbatype.getQName());
@@ -259,7 +259,7 @@ public class WSDLToCorbaHelper {
     private MemberType processAllMember(XmlSchemaAll all, QName defaultName,
         QName schemaTypeName) throws Exception {
 
-        CorbaTypeImpl corbatype = processAllType(all, defaultName, schemaTypeName);
+        CorbaType corbatype = processAllType(all, defaultName, schemaTypeName);
         MemberType member = new MemberType();
         member.setName(corbatype.getQName().getLocalPart());
         member.setIdltype(corbatype.getQName());
@@ -270,7 +270,7 @@ public class WSDLToCorbaHelper {
     }
 
 
-    private CorbaTypeImpl processChoice(XmlSchemaChoice choice,
+    private CorbaType processChoice(XmlSchemaChoice choice,
                                         QName defaultName,
                                         QName schemaTypeName)
         throws Exception {
@@ -283,14 +283,14 @@ public class WSDLToCorbaHelper {
         }
         choicename = checkPrefix(choicename);
 
-        CorbaTypeImpl corbatype = createUnion(choicename, choice, defaultName, schemaTypeName);
+        CorbaType corbatype = createUnion(choicename, choice, defaultName, schemaTypeName);
         String repoId = REPO_STRING + corbatype.getQName().getLocalPart().replace('.', '/')
             + IDL_VERSION;
         ((Union)corbatype).setRepositoryID(repoId);
 
         if (!(choice.getMaxOccurs() == 1) || !(choice.getMinOccurs() == 1)) {
             QName name = createQNameTargetNamespace(corbatype.getQName().getLocalPart() + "Array");
-            CorbaTypeImpl arrayType =
+            CorbaType arrayType =
                 createArray(name, corbatype.getQName(), corbatype.getQName(),
                             choice.getMaxOccurs(), choice.getMinOccurs(), false);
 
@@ -302,9 +302,9 @@ public class WSDLToCorbaHelper {
         return corbatype;
     }
 
-    private CorbaTypeImpl processLocalElement(QName containingTypeName,
+    private CorbaType processLocalElement(QName containingTypeName,
                                               XmlSchemaElement element, String uri) throws Exception {
-        CorbaTypeImpl membertype = new CorbaTypeImpl();
+        CorbaType membertype = new CorbaType();
 
         XmlSchemaType schemaType = element.getSchemaType();
         QName schemaName = element.getQName();
@@ -327,14 +327,14 @@ public class WSDLToCorbaHelper {
 
         QName memName = null;
         if (element.isNillable()) {
-            CorbaTypeImpl elemtype = convertSchemaToCorbaType(schemaType, elemName,
+            CorbaType elemtype = convertSchemaToCorbaType(schemaType, elemName,
                                                               schemaType, null, true);
             QName name = createQNameTargetNamespace(elemtype.getQName().getLocalPart() + "_nil");
             QName elName = checkPrefix(elemName);
             if (elName ==  null) {
                 elName = createQNameTargetNamespace(elemName.getLocalPart());
             }
-            CorbaTypeImpl memtype = createNillableUnion(elName,
+            CorbaType memtype = createNillableUnion(elName,
                                           name,
                                           elemtype.getQName(),
                                           elementQualified);
@@ -368,7 +368,7 @@ public class WSDLToCorbaHelper {
         if (!(element.getMaxOccurs() == 1) || !(element.getMinOccurs() == 1)) {
             QName name = createQNameCorbaNamespace(getModulePrefix(membertype)
                                                     + elemName.getLocalPart() + "Array");
-            CorbaTypeImpl arraytype = null;
+            CorbaType arraytype = null;
             if (memName != null) {
                 arraytype = createArray(name, /*schemaName*/name, memName, elemName,
                                         element.getMaxOccurs(), element.getMinOccurs(), false);
@@ -418,17 +418,17 @@ public class WSDLToCorbaHelper {
         return type;
     }
 
-    private String getModulePrefix(CorbaTypeImpl type) {
+    private String getModulePrefix(CorbaType type) {
         String name = type.getQName().getLocalPart();
         int dotPos = name.lastIndexOf(".");
         return dotPos == -1 ? "" : name.substring(0, dotPos + 1);
     }
 
 
-    protected CorbaTypeImpl processSequenceType(XmlSchemaSequence seq,
+    protected CorbaType processSequenceType(XmlSchemaSequence seq,
                                                 QName defaultName, QName schemaTypeName)
         throws Exception {
-        CorbaTypeImpl type = null;
+        CorbaType type = null;
         QName seqName = null;
         if (schemaTypeName == null) {
             seqName = createQNameCorbaNamespace(defaultName.getLocalPart() + "SequenceStruct");
@@ -452,7 +452,7 @@ public class WSDLToCorbaHelper {
 
         if (seq.getMaxOccurs() != 1 || seq.getMinOccurs() != 1) {
             QName name = createQNameTargetNamespace(type.getQName().getLocalPart() + "Array");
-            CorbaTypeImpl atype = createArray(name, type.getQName(), type.getQName(),
+            CorbaType atype = createArray(name, type.getQName(), type.getQName(),
                                               seq.getMaxOccurs(), seq.getMinOccurs(), false);
 
             if (atype != null
@@ -473,7 +473,7 @@ public class WSDLToCorbaHelper {
     }
 
 
-    protected CorbaTypeImpl processAllType(XmlSchemaAll seq, QName defaultName,
+    protected CorbaType processAllType(XmlSchemaAll seq, QName defaultName,
                                            QName schematypeName) throws Exception {
         QName allName = null;
         Struct type = null;
@@ -499,12 +499,12 @@ public class WSDLToCorbaHelper {
         return type;
     }
 
-    private CorbaTypeImpl processPrimitiveType(QName typeName) {
+    private CorbaType processPrimitiveType(QName typeName) {
         QName qName = createQNameXmlSchemaNamespace(typeName.getLocalPart());
-        CorbaTypeImpl corbatype = (CorbaTypeImpl)CORBAPRIMITIVEMAP.get(qName);
+        CorbaType corbatype = (CorbaType)CORBAPRIMITIVEMAP.get(qName);
         if (corbatype == null) {
             //REVISIT, bravi, not an ideal way to add the fixed & octet type to the typemap.
-            CorbaTypeImpl type = null;
+            CorbaType type = null;
             if (typeName.equals(W3CConstants.NT_SCHEMA_DECIMAL)) {
                 QName name = new QName(idlNamespace, "fixed_1");
                 type = WSDLTypes.getFixedCorbaType(name, typeName, 31, 6);
@@ -538,11 +538,11 @@ public class WSDLToCorbaHelper {
             if (attrName.getNamespaceURI().equals("")) {
                 attrName = new QName(uri, attrName.getLocalPart());
             }
-            CorbaTypeImpl membertype = null;
+            CorbaType membertype = null;
             boolean attrQualified = getAttributeQualification(attribute, uri);
             if (attribute.getUse() == XmlSchemaUse.NONE
                 || attribute.getUse() == XmlSchemaUse.OPTIONAL) {
-                CorbaTypeImpl attType = null;
+                CorbaType attType = null;
                 if (attribute.getSchemaType() != null) {
                     // REVISIT, edell bug in XmlSchema 1.2.
                     // https://issues.apache.org/jira/browse/WSCOMMONS-208
@@ -616,7 +616,7 @@ public class WSDLToCorbaHelper {
         return members;
     }
 
-    private CorbaTypeImpl processElementType(XmlSchemaElement stype, QName defaultName, String uri)
+    private CorbaType processElementType(XmlSchemaElement stype, QName defaultName, String uri)
         throws Exception {
 
         String name = null;
@@ -636,18 +636,18 @@ public class WSDLToCorbaHelper {
         if (schemaTypeName == null) {
             schemaTypeName = createQNameTargetNamespace(name);
         }
-        CorbaTypeImpl result = convertSchemaToCorbaType(schemaType, schemaTypeName,
+        CorbaType result = convertSchemaToCorbaType(schemaType, schemaTypeName,
                                                         schemaType, null, false);
 
         result.setQualified(getElementQualification(stype, uri));
         return result;
     }
 
-    private CorbaTypeImpl processSimpleType(XmlSchemaSimpleType stype, QName defaultName,
+    private CorbaType processSimpleType(XmlSchemaSimpleType stype, QName defaultName,
                                             boolean anonymous)
         throws Exception {
 
-        CorbaTypeImpl corbaTypeImpl = null;
+        CorbaType corbaTypeImpl = null;
         QName name;
         QName schematypeName = null;
 
@@ -670,7 +670,7 @@ public class WSDLToCorbaHelper {
             corbaTypeImpl = processSimpleRestrictionType(stype, name, schematypeName, anonymous);
         } else if (stype.getContent() instanceof XmlSchemaSimpleTypeList) {
             XmlSchemaSimpleTypeList ltype = (XmlSchemaSimpleTypeList)stype.getContent();
-            CorbaTypeImpl itemType = null;
+            CorbaType itemType = null;
             if (ltype.getItemType() != null) {
                 itemType = convertSchemaToCorbaType(ltype.getItemType(), name, stype, null, false);
                 if (itemType != null) {
@@ -704,11 +704,11 @@ public class WSDLToCorbaHelper {
 
     }
 
-    private CorbaTypeImpl processSimpleRestrictionType(XmlSchemaSimpleType stype,
+    private CorbaType processSimpleRestrictionType(XmlSchemaSimpleType stype,
                                                        QName name, QName schematypeName,
                                                        boolean anonymous)
         throws Exception {
-        CorbaTypeImpl corbaTypeImpl = null;
+        CorbaType corbaTypeImpl = null;
 
         // checks if enumeration
         XmlSchemaSimpleTypeRestriction restrictionType = (XmlSchemaSimpleTypeRestriction)stype
@@ -765,7 +765,7 @@ public class WSDLToCorbaHelper {
         return corbaTypeImpl;
     }
 
-    private CorbaTypeImpl getLocalType(QName qname) {
+    private CorbaType getLocalType(QName qname) {
         return processPrimitiveType(qname);
     }
 
@@ -908,7 +908,7 @@ public class WSDLToCorbaHelper {
      * maxOccurs == 1 then log warning and return null. Else if minOccurs is
      * equal to maxOccurs then create an Array. Else create a Sequence
      */
-    protected CorbaTypeImpl createArray(QName name, QName schematypeName, QName arrayType,
+    protected CorbaType createArray(QName name, QName schematypeName, QName arrayType,
                                         Long maxOccurs, Long minOccurs, boolean anonymous) {
         return createArray(name, schematypeName, arrayType, null, maxOccurs, minOccurs, anonymous);
     }
@@ -917,7 +917,7 @@ public class WSDLToCorbaHelper {
      * maxOccurs == 1 then log warning and return null. Else if minOccurs is
      * equal to maxOccurs then create an Array. Else create a Sequence
      */
-    protected CorbaTypeImpl createArray(QName name, QName schematypeName, QName arrayType, QName elName,
+    protected CorbaType createArray(QName name, QName schematypeName, QName arrayType, QName elName,
                                         Long maxOccurs, Long minOccurs, boolean anonymous) {
 
         int max = maxOccurs.intValue();
@@ -949,10 +949,10 @@ public class WSDLToCorbaHelper {
     }
 
 
-    private CorbaTypeImpl processComplexType(XmlSchemaComplexType complex, QName defaultName,
+    private CorbaType processComplexType(XmlSchemaComplexType complex, QName defaultName,
                                              XmlSchemaAnnotation annotation,
                                              boolean anonymous) throws Exception {
-        CorbaTypeImpl corbatype = null;
+        CorbaType corbatype = null;
         if (isLiteralArray(complex)) {
             corbatype = processLiteralArray(complex, defaultName, anonymous);
         } else if (WSDLTypes.isOMGUnion(complex)) {
@@ -971,7 +971,7 @@ public class WSDLToCorbaHelper {
     }
 
 
-    private CorbaTypeImpl processStruct(XmlSchemaComplexType complex, QName defaultName)
+    private CorbaType processStruct(XmlSchemaComplexType complex, QName defaultName)
         throws Exception {
         QName name;
         Struct corbaStruct = null;
@@ -1045,7 +1045,7 @@ public class WSDLToCorbaHelper {
         throws Exception {
         XmlSchemaType base = null;
         List<MemberType> attrMembers = null;
-        CorbaTypeImpl basetype = null;
+        CorbaType basetype = null;
 
         String uri;
         if (schematypeName != null) {
@@ -1191,7 +1191,7 @@ public class WSDLToCorbaHelper {
                                                  QName defaultName, QName schematypeName)
         throws Exception {
 
-        CorbaTypeImpl seqtype =
+        CorbaType seqtype =
             processSequenceType(seq, defaultName, schematypeName);
 
         MemberType seqmem = new MemberType();
@@ -1214,7 +1214,7 @@ public class WSDLToCorbaHelper {
                                                   QName defaultName, QName schematypeName)
         throws Exception {
 
-        CorbaTypeImpl alltype = processAllType(all, defaultName, schematypeName);
+        CorbaType alltype = processAllType(all, defaultName, schematypeName);
         MemberType allmem = new MemberType();
         allmem.setName(alltype.getQName().getLocalPart() + "_f");
         allmem.setIdltype(alltype.getQName());
@@ -1255,7 +1255,7 @@ public class WSDLToCorbaHelper {
         return choicemem;
     }
 
-    protected CorbaTypeImpl createNillableUnion(QName name,
+    protected CorbaType createNillableUnion(QName name,
                                                 QName schemaType,
                                                 QName membertype,
                                                 boolean isQualified) {
@@ -1283,7 +1283,7 @@ public class WSDLToCorbaHelper {
         return nilUnion;
     }
 
-    private CorbaTypeImpl processLiteralArray(XmlSchemaComplexType complex, QName defaultName,
+    private CorbaType processLiteralArray(XmlSchemaComplexType complex, QName defaultName,
                                               boolean anonymous) throws Exception {
         // NEED TO DO
         QName name;
@@ -1301,7 +1301,7 @@ public class WSDLToCorbaHelper {
             name = checkPrefix(name);
         }
 
-        CorbaTypeImpl arrayType = null;
+        CorbaType arrayType = null;
         XmlSchemaElement arrayEl = null;
         QName elName = null;
         if (complex.getParticle() instanceof XmlSchemaSequence) {
@@ -1370,7 +1370,7 @@ public class WSDLToCorbaHelper {
                            maxOccurs, minOccurs, anonymous);
     }
 
-    private CorbaTypeImpl processOMGUnion(XmlSchemaComplexType complex, QName defaultName) throws Exception {
+    private CorbaType processOMGUnion(XmlSchemaComplexType complex, QName defaultName) throws Exception {
         QName name;
         Union corbaUnion = null;
         QName schematypeName = checkPrefix(complex.getQName());
@@ -1404,7 +1404,7 @@ public class WSDLToCorbaHelper {
             choice = (XmlSchemaChoice)st1;
         }
 
-        CorbaTypeImpl disctype = convertSchemaToCorbaType(discEl.getSchemaType(), discEl.getQName(), discEl
+        CorbaType disctype = convertSchemaToCorbaType(discEl.getSchemaType(), discEl.getQName(), discEl
             .getSchemaType(), null, false);
         corbaUnion.setDiscriminator(disctype.getQName());
 
@@ -1453,7 +1453,7 @@ public class WSDLToCorbaHelper {
     }
 
 
-    private CorbaTypeImpl processRegularUnion(XmlSchemaComplexType complex,
+    private CorbaType processRegularUnion(XmlSchemaComplexType complex,
                                               QName defaultName) throws Exception {
         //NEED TO DO
         QName name = null;
@@ -1512,18 +1512,18 @@ public class WSDLToCorbaHelper {
         return corbaUnion;
     }
 
-    protected boolean isDuplicate(CorbaTypeImpl corbaTypeImpl) {
+    protected boolean isDuplicate(CorbaType corbaTypeImpl) {
         String corbaName = corbaTypeImpl.getName();
         QName corbaType = corbaTypeImpl.getType();
 
         QName primName = createQNameXmlSchemaNamespace(corbaName);
-        if ((CorbaTypeImpl)CORBAPRIMITIVEMAP.get(primName) != null) {
+        if ((CorbaType)CORBAPRIMITIVEMAP.get(primName) != null) {
             return true;
         }
         if (!typeMappingType.getStructOrExceptionOrUnion().isEmpty()) {
-            Iterator<CorbaTypeImpl> i = typeMappingType.getStructOrExceptionOrUnion().iterator();
+            Iterator<CorbaType> i = typeMappingType.getStructOrExceptionOrUnion().iterator();
             while (i.hasNext()) {
-                CorbaTypeImpl type = i.next();
+                CorbaType type = i.next();
                 if ((corbaName != null) && type.getType() != null && corbaType != null
                     && (corbaName.equals(type.getName()))
                     && (corbaType.getLocalPart().equals(type.getType().getLocalPart()))
@@ -1536,14 +1536,14 @@ public class WSDLToCorbaHelper {
     }
 
 
-    protected CorbaTypeImpl isDuplicateException(CorbaTypeImpl corbaTypeImpl) {
-        CorbaTypeImpl duplicate = null;
+    protected CorbaType isDuplicateException(CorbaType corbaTypeImpl) {
+        CorbaType duplicate = null;
         String corbaName = corbaTypeImpl.getName();
         String corbaType = corbaTypeImpl.getType().getLocalPart();
         if (!typeMappingType.getStructOrExceptionOrUnion().isEmpty()) {
-            Iterator<CorbaTypeImpl> i = typeMappingType.getStructOrExceptionOrUnion().iterator();
+            Iterator<CorbaType> i = typeMappingType.getStructOrExceptionOrUnion().iterator();
             while (i.hasNext()) {
-                CorbaTypeImpl type = i.next();
+                CorbaType type = i.next();
                 if (corbaName.equals(type.getName())
                     && corbaType.equals(type.getType().getLocalPart())
                     && type instanceof Struct) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java
index ac8e106..502cdf7 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java
@@ -27,15 +27,11 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.wsdl.Binding;
 import javax.wsdl.BindingOperation;
 import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.extensions.ExtensionRegistry;
-import javax.xml.bind.JAXBException;
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.binding.corba.wsdl.Alias;
@@ -49,7 +45,7 @@ import org.apache.cxf.binding.corba.wsdl.BindingType;
 import org.apache.cxf.binding.corba.wsdl.CaseType;
 import org.apache.cxf.binding.corba.wsdl.Const;
 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.Enum;
 import org.apache.cxf.binding.corba.wsdl.Enumerator;
 import org.apache.cxf.binding.corba.wsdl.Fixed;
@@ -91,7 +87,6 @@ import org.apache.cxf.tools.corba.common.idltypes.IdlUnion;
 import org.apache.cxf.tools.corba.common.idltypes.IdlUnionBranch;
 import org.apache.cxf.tools.corba.utils.FileOutputStreamFactory;
 import org.apache.cxf.tools.corba.utils.OutputStreamFactory;
-import org.apache.cxf.wsdl.JAXBExtensionHelper;
 
 public class WSDLToIDLAction {
         
@@ -106,7 +101,6 @@ public class WSDLToIDLAction {
     private Definition def;
     private IdlRoot root = IdlRoot.create();
     private IdlInterface intf;
-    private ExtensionRegistry extReg;
     private WSDLToTypeProcessor typeProcessor = new WSDLToTypeProcessor(); 
     private boolean generateAllBindings;    
 
@@ -120,8 +114,6 @@ public class WSDLToIDLAction {
         } else {
             def = definition;
         }
-        extReg = def.getExtensionRegistry();
-
         if (printWriter == null) {
             printWriter = createPrintWriter(outputFile);
         }
@@ -163,32 +155,6 @@ public class WSDLToIDLAction {
         
     }
 
-    
-    public void addExtensions(ExtensionRegistry extRegistry) throws JAXBException {
-        extReg = extRegistry;
-        try {
-                      
-            JAXBExtensionHelper.addExtensions(extReg, Binding.class, BindingType.class);
-            JAXBExtensionHelper.addExtensions(extReg, BindingOperation.class,
-                                              org.apache.cxf.binding.corba.wsdl.OperationType.class);
-            JAXBExtensionHelper.addExtensions(extReg, Definition.class, TypeMappingType.class);
-            JAXBExtensionHelper.addExtensions(extReg, Port.class,
-                                              org.apache.cxf.binding.corba.wsdl.AddressType.class);
-
-            extReg.mapExtensionTypes(Binding.class, CorbaConstants.NE_CORBA_BINDING, BindingType.class);
-            extReg.mapExtensionTypes(BindingOperation.class, CorbaConstants.NE_CORBA_OPERATION,
-                                     org.apache.cxf.binding.corba.wsdl.OperationType.class);
-            extReg.mapExtensionTypes(Definition.class, CorbaConstants.NE_CORBA_TYPEMAPPING,
-                                     TypeMappingType.class);
-            extReg.mapExtensionTypes(Port.class, CorbaConstants.NE_CORBA_ADDRESS,
-                                     org.apache.cxf.binding.corba.wsdl.AddressType.class);
-
-        } catch (javax.xml.bind.JAXBException ex) {
-            LOG.log(Level.SEVERE, "Failing to serialize/deserialize extensions", ex);
-            throw new JAXBException(ex.getMessage());
-        }
-    }    
-
     private void generateIDL(Definition definition, Binding binding) {
         List<?> ext = binding.getExtensibilityElements();
         if (!(ext.get(0) instanceof BindingType)) {
@@ -326,7 +292,7 @@ public class WSDLToIDLAction {
         try {
             TypeMappingType typeMappingType = getTypeMappingType();
             if (typeMappingType != null) {
-                for (CorbaTypeImpl corbaTypeImpl 
+                for (CorbaType corbaTypeImpl 
                     : typeMappingType.getStructOrExceptionOrUnion()) {                                
                     findCorbaIdlType(corbaTypeImpl);
                 }
@@ -336,13 +302,13 @@ public class WSDLToIDLAction {
         }
     }
 
-    private CorbaTypeImpl getCorbaType(QName qname) throws Exception {    
-        CorbaTypeImpl corbaTypeImpl = null;
+    private CorbaType getCorbaType(QName qname) throws Exception {    
+        CorbaType corbaTypeImpl = null;
 
         try {
             TypeMappingType typeMappingType = getTypeMappingType();
             if (typeMappingType != null) {
-                for (CorbaTypeImpl corbaType : typeMappingType.getStructOrExceptionOrUnion()) {
+                for (CorbaType corbaType : typeMappingType.getStructOrExceptionOrUnion()) {
                     if (corbaType.getName().equals(qname.getLocalPart())) {                    
                         return corbaType;
                     }
@@ -368,13 +334,13 @@ public class WSDLToIDLAction {
         return findIdlType(local, qname, null);                
     }
 
-    private IdlType findCorbaIdlType(CorbaTypeImpl corbaTypeImpl) throws Exception {        
+    private IdlType findCorbaIdlType(CorbaType corbaTypeImpl) throws Exception {        
         String local = corbaTypeImpl.getName();        
         return findIdlType(local, corbaTypeImpl.getType(), corbaTypeImpl);                
     }
     
     private IdlType findIdlType(String local, QName ntype, 
-                                  CorbaTypeImpl corbatypeImpl) throws Exception {
+                                  CorbaType corbatypeImpl) throws Exception {
         IdlType idlType = null;
         
         if (ntype.getNamespaceURI().equals(CorbaConstants.NU_WSDL_CORBA)) {
@@ -432,12 +398,12 @@ public class WSDLToIDLAction {
         return (IdlType)result;
     }
        
-    protected IdlType createType(QName idlType, String name[], CorbaTypeImpl corbaType) throws Exception {
+    protected IdlType createType(QName idlType, String name[], CorbaType corbaType) throws Exception {
         if (idlType.getLocalPart().equals("CORBA.Object")) {
             return IdlInterface.create(null, "Object");
         }        
 
-        CorbaTypeImpl  corbaTypeImpl = corbaType;
+        CorbaType  corbaTypeImpl = corbaType;
         if (corbaTypeImpl == null) {
             corbaTypeImpl = getCorbaType(idlType);
         }
@@ -479,7 +445,7 @@ public class WSDLToIDLAction {
                 // Check to see if CORBAType exists. If so, create type for it
                 // otherwise
                 // create module for this scope               
-                CorbaTypeImpl possibleCorbaType = getCorbaType(qname);
+                CorbaType possibleCorbaType = getCorbaType(qname);
 
                 if (possibleCorbaType != null) {
                     idlDef = findType(qname);                    
@@ -534,7 +500,7 @@ public class WSDLToIDLAction {
         return result; 
     }
 
-    private IdlType checkAnon(CorbaTypeImpl corbaTypeImpl, IdlScopeBase scope, 
+    private IdlType checkAnon(CorbaType corbaTypeImpl, IdlScopeBase scope, 
                               String local) throws Exception {
         IdlType result = null;
         

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLTypes.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLTypes.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLTypes.java
index 5e1ffa2..36fafb3 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLTypes.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLTypes.java
@@ -41,7 +41,7 @@ import org.apache.cxf.binding.corba.wsdl.Array;
 import org.apache.cxf.binding.corba.wsdl.BindingType;
 import org.apache.cxf.binding.corba.wsdl.CaseType;
 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.Fixed;
 import org.apache.cxf.binding.corba.wsdl.MemberType;
 import org.apache.cxf.binding.corba.wsdl.Sequence;
@@ -70,11 +70,11 @@ public final class WSDLTypes {
     private WSDLTypes() {
     }
 
-    public static CorbaTypeImpl processObject(Definition definition, XmlSchemaComplexType complex,
+    public static CorbaType processObject(Definition definition, XmlSchemaComplexType complex,
                                               XmlSchemaAnnotation annotation, QName typeName,
                                               QName defaultName, String idlNamespace)
         throws Exception {
-        CorbaTypeImpl corbaTypeImpl = null;
+        CorbaType corbaTypeImpl = null;
 
         if (annotation != null) {
             for (XmlSchemaAnnotationItem item : annotation.getItems()) {
@@ -142,7 +142,7 @@ public final class WSDLTypes {
     }
 
 
-    public static CorbaTypeImpl processStringType(CorbaTypeImpl corbaTypeImpl, QName name,
+    public static CorbaType processStringType(CorbaType corbaTypeImpl, QName name,
                                                   String maxLength, String length) throws Exception {
         boolean boundedString = true;
         int bound = 0;
@@ -173,9 +173,9 @@ public final class WSDLTypes {
         return corbaTypeImpl;
     }
 
-    public static CorbaTypeImpl mapToArray(QName name, QName schematypeName, QName arrayType,
+    public static CorbaType mapToArray(QName name, QName schematypeName, QName arrayType,
                                            QName elName, int bound, boolean anonymous) {
-        CorbaTypeImpl corbatype = null;
+        CorbaType corbatype = null;
 
         //schematypeName = checkPrefix(schematypeName);
 
@@ -206,9 +206,9 @@ public final class WSDLTypes {
         return corbatype;
     }
 
-    public static CorbaTypeImpl mapToSequence(QName name, QName schematypeName, QName arrayType,
+    public static CorbaType mapToSequence(QName name, QName schematypeName, QName arrayType,
                                               QName elName, int bound, boolean anonymous) {
-        CorbaTypeImpl corbaTypeImpl = null;
+        CorbaType corbaTypeImpl = null;
 
         //schematypeName = checkPrefix(schematypeName);
         if (!anonymous) {
@@ -302,8 +302,8 @@ public final class WSDLTypes {
     }
 
 
-    public static CorbaTypeImpl processDecimalType(XmlSchemaSimpleTypeRestriction restrictionType,
-                                                   QName name, CorbaTypeImpl corbaTypeImpl,
+    public static CorbaType processDecimalType(XmlSchemaSimpleTypeRestriction restrictionType,
+                                                   QName name, CorbaType corbaTypeImpl,
                                                    boolean anonymous) throws Exception {
 
         String tdigits = null;
@@ -395,7 +395,7 @@ public final class WSDLTypes {
     }
 
 
-    public static CorbaTypeImpl processBase64Type(CorbaTypeImpl corbaTypeImpl, QName name,
+    public static CorbaType processBase64Type(CorbaType corbaTypeImpl, QName name,
                                                   String maxLength, String length)
         throws Exception {
         int bound = 0;
@@ -442,7 +442,7 @@ public final class WSDLTypes {
         return anonymous;
     }
 
-    public static CorbaTypeImpl getFixedCorbaType(QName name, QName stype, int digits, int scale) {
+    public static CorbaType getFixedCorbaType(QName name, QName stype, int digits, int scale) {
         Fixed fixed = new Fixed();
         fixed.setName(name.getLocalPart());
         fixed.setQName(name);
@@ -455,7 +455,7 @@ public final class WSDLTypes {
         return fixed;
     }
 
-    public static CorbaTypeImpl getAnonFixedCorbaType(QName name, QName stype, int digits, int scale) {
+    public static CorbaType getAnonFixedCorbaType(QName name, QName stype, int digits, int scale) {
         Anonfixed fixed = new Anonfixed();
         fixed.setName(name.getLocalPart());
         fixed.setQName(name);
@@ -465,7 +465,7 @@ public final class WSDLTypes {
         return fixed;
     }
 
-    public static CorbaTypeImpl getOctetCorbaType(QName name, QName stype, int bound) {
+    public static CorbaType getOctetCorbaType(QName name, QName stype, int bound) {
         Sequence seq = new Sequence();
         seq.setName(name.getLocalPart());
         seq.setQName(name);

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMapTest.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMapTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMapTest.java
index f81830f..bf278cb 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMapTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMapTest.java
@@ -25,17 +25,17 @@ import javax.xml.namespace.QName;
 
 import junit.framework.TestCase;
 
-import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.CorbaType;
 
 public class CorbaPrimitiveMapTest extends TestCase {
 
     public void testMap() {
 
-        Map<QName, CorbaTypeImpl> map = new HashMap<QName, CorbaTypeImpl>();
+        Map<QName, CorbaType> map = new HashMap<QName, CorbaType>();
         QName corbaName = new QName("http://cxf.apache.org/bindings/corba", "string", "corba");
         QName typeName = new QName("http://www.w3.org/2001/XMLSchema", "string");
 
-        CorbaTypeImpl corbaTypeImpl = new CorbaTypeImpl();
+        CorbaType corbaTypeImpl = new CorbaType();
         corbaTypeImpl.setQName(corbaName);
         corbaTypeImpl.setType(typeName);
         corbaTypeImpl.setName(corbaName.getLocalPart());

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/IDLToWSDLGenerationTest.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/IDLToWSDLGenerationTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/IDLToWSDLGenerationTest.java
index 1289919..e3de3e1 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/IDLToWSDLGenerationTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/IDLToWSDLGenerationTest.java
@@ -61,6 +61,7 @@ public class IDLToWSDLGenerationTest extends ProcessorTestBase {
         addQNameAttribute(new QName(CorbaConstants.NU_WSDL_CORBA, "object"), "binding");
         addQNameAttribute(new QName(CorbaConstants.NU_WSDL_CORBA, "enum"), "type");
         addQNameAttribute(new QName(CorbaConstants.NU_WSDL_CORBA, "union"), "type");
+        addQNameAttribute(new QName(CorbaConstants.NU_WSDL_CORBA, "union"), "discriminator");
         addQNameAttribute(new QName(CorbaConstants.NU_WSDL_CORBA, "unionbranch"), "idltype");
         addQNameAttribute(new QName(CorbaConstants.NU_WSDL_CORBA, "anonstring"), "type");
         addQNameAttribute(new QName(CorbaConstants.NU_WSDL_CORBA, "anonwstring"), "type");
@@ -75,6 +76,11 @@ public class IDLToWSDLGenerationTest extends ProcessorTestBase {
         addQNameAttribute(new QName(CorbaConstants.NU_WSDL_CORBA, "alias"), "basetype");
         addQNameAttribute(new QName(CorbaConstants.NU_WSDL_CORBA, "anonsequence"), "type");
         addQNameAttribute(new QName(CorbaConstants.NU_WSDL_CORBA, "anonsequence"), "elemtype");
+        addQNameAttribute(new QName(CorbaConstants.NU_WSDL_CORBA, "anonarray"), "type");
+        addQNameAttribute(new QName(CorbaConstants.NU_WSDL_CORBA, "anonarray"), "elemtype");
+        addQNameAttribute(new QName(CorbaConstants.NU_WSDL_CORBA, "param"), "idltype");
+        addQNameAttribute(new QName(CorbaConstants.NU_WSDL_CORBA, "return"), "idltype");
+        addQNameAttribute(new QName(CorbaConstants.NU_WSDL_CORBA, "raises"), "exception");
 
     }
 
@@ -96,11 +102,11 @@ public class IDLToWSDLGenerationTest extends ProcessorTestBase {
         processor.setOutputWriter(out);        
         processor.process();
 
-        InputStream origStream = getClass().getResourceAsStream(expectedWsdlFilename);  
+        URL orig = getClass().getResource(expectedWsdlFilename);  
         InputStream actualStream = new ByteArrayInputStream(out.toString().getBytes());
 
         System.out.println(out.toString());
-        assertWsdlEquals(origStream, actualStream, DEFAULT_IGNORE_ATTR, DEFAULT_IGNORE_TAG);
+        assertWsdlEquals(orig.openStream(), actualStream, DEFAULT_IGNORE_ATTR, DEFAULT_IGNORE_TAG);
     }
     
     @Test

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java
index bfea341..616e939 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java
@@ -45,7 +45,7 @@ import org.apache.cxf.binding.corba.wsdl.Anonsequence;
 import org.apache.cxf.binding.corba.wsdl.Array;
 import org.apache.cxf.binding.corba.wsdl.BindingType;
 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.Fixed;
 import org.apache.cxf.binding.corba.wsdl.OperationType;
 import org.apache.cxf.binding.corba.wsdl.ParamType;
@@ -144,8 +144,8 @@ public class WSDLToCorbaBindingTest extends Assert {
                                 "YCORBABinding", "tns");
         Binding binding = model.getBinding(bName);
         TypeMappingType mapType = (TypeMappingType)model.getExtensibilityElements().get(0);
-        Map<String, CorbaTypeImpl> tmap = new HashMap<String, CorbaTypeImpl>();
-        for (CorbaTypeImpl type : mapType.getStructOrExceptionOrUnion()) {
+        Map<String, CorbaType> tmap = new HashMap<String, CorbaType>();
+        for (CorbaType type : mapType.getStructOrExceptionOrUnion()) {
             tmap.put(type.getName(), type);
         }
         
@@ -168,7 +168,7 @@ public class WSDLToCorbaBindingTest extends Assert {
     }
      
     private void checkSequenceType(BindingOperation bindingOperation,
-                                   Map<String, CorbaTypeImpl> mapType) {
+                                   Map<String, CorbaType> mapType) {
         for (ExtensibilityElement extElement : getExtensibilityElements(bindingOperation)) {
             if (extElement.getElementType().getLocalPart().equals("operation")) {
                 OperationType corbaOpType = (OperationType)extElement;
@@ -185,7 +185,7 @@ public class WSDLToCorbaBindingTest extends Assert {
     }
     
     private void checkFixedTypeOne(BindingOperation bindingOperation,
-                                   Map<String, CorbaTypeImpl>  mapType) {
+                                   Map<String, CorbaType>  mapType) {
 
         assertEquals(bindingOperation.getBindingInput().getName(), "op_k");
         assertEquals(bindingOperation.getBindingOutput().getName(), "op_kResponse");
@@ -208,7 +208,7 @@ public class WSDLToCorbaBindingTest extends Assert {
     }
     
     private void checkFixedTypeTwo(BindingOperation bindingOperation,
-                                   Map<String, CorbaTypeImpl>  mapType) {
+                                   Map<String, CorbaType>  mapType) {
         for (ExtensibilityElement extElement : getExtensibilityElements(bindingOperation)) {
             if (extElement.getElementType().getLocalPart().equals("operation")) {
                 OperationType corbaOpType = (OperationType)extElement;
@@ -227,7 +227,7 @@ public class WSDLToCorbaBindingTest extends Assert {
     }
     
     private void checkFixedTypeThree(BindingOperation bindingOperation,
-                                     Map<String, CorbaTypeImpl>  mapType) {
+                                     Map<String, CorbaType>  mapType) {
         for (ExtensibilityElement extElement : getExtensibilityElements(bindingOperation)) {
             if (extElement.getElementType().getLocalPart().equals("operation")) {
                 OperationType corbaOpType = (OperationType)extElement;
@@ -246,7 +246,7 @@ public class WSDLToCorbaBindingTest extends Assert {
     }
     
     private void checkFixedTypeFour(BindingOperation bindingOperation,
-                                    Map<String, CorbaTypeImpl>  mapType) {
+                                    Map<String, CorbaType>  mapType) {
         for (ExtensibilityElement extElement : getExtensibilityElements(bindingOperation)) {
             if (extElement.getElementType().getLocalPart().equals("operation")) {
                 OperationType corbaOpType = (OperationType)extElement;

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
index cc05a0c..8692e45 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
@@ -42,7 +42,7 @@ import org.apache.cxf.binding.corba.wsdl.Anonfixed;
 import org.apache.cxf.binding.corba.wsdl.Anonsequence;
 import org.apache.cxf.binding.corba.wsdl.Anonstring;
 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.Struct;
 import org.apache.cxf.binding.corba.wsdl.TypeMappingType;
 import org.apache.cxf.binding.corba.wsdl.Union;
@@ -386,9 +386,9 @@ public class WSDLToCorbaBindingTypeTest extends Assert {
             idlgen.setOutputFile("typeInherit.idl");
             idlgen.generateIDL(model);
 
-            List<CorbaTypeImpl> types = mapType.getStructOrExceptionOrUnion();
+            List<CorbaType> types = mapType.getStructOrExceptionOrUnion();
             for (int i = 0; i < types.size(); i++) {
-                CorbaTypeImpl type = types.get(i);
+                CorbaType type = types.get(i);
                 if ("Type5SequenceStruct".equals(type.getName())) {
                     assertTrue("Name is incorrect for Type5SequenceStruct Type", type instanceof Struct);
                     assertEquals("Type is incorrect for AnonSequence Type", "Type5", 
@@ -435,9 +435,9 @@ public class WSDLToCorbaBindingTypeTest extends Assert {
             idlgen.setOutputFile("atype.idl");
             idlgen.generateIDL(model);
 
-            List<CorbaTypeImpl> types = mapType.getStructOrExceptionOrUnion();
+            List<CorbaType> types = mapType.getStructOrExceptionOrUnion();
             for (int i = 0; i < types.size(); i++) {
-                CorbaTypeImpl type = types.get(i);
+                CorbaType type = types.get(i);
                 if (type instanceof Anonstring) {
                     Anonstring str = (Anonstring)type;
                     assertEquals("Name is incorrect for Array Type", "X._1_S", 
@@ -513,8 +513,8 @@ public class WSDLToCorbaBindingTypeTest extends Assert {
             assertEquals(2, typemap.getElementsByTagName("corba:struct").getLength());            
 
             TypeMappingType mapType = (TypeMappingType)model.getExtensibilityElements().get(0);
-            Map<String, CorbaTypeImpl> tmap = new HashMap<String, CorbaTypeImpl>();
-            for (CorbaTypeImpl type : mapType.getStructOrExceptionOrUnion()) {
+            Map<String, CorbaType> tmap = new HashMap<String, CorbaType>();
+            for (CorbaType type : mapType.getStructOrExceptionOrUnion()) {
                 tmap.put(type.getName(), type);
             }
 
@@ -576,7 +576,7 @@ public class WSDLToCorbaBindingTypeTest extends Assert {
             assertEquals(5, mapType.getStructOrExceptionOrUnion().size());
             int strcnt = 0;
             int unioncnt = 0;
-            for (CorbaTypeImpl corbaType : mapType.getStructOrExceptionOrUnion()) {
+            for (CorbaType corbaType : mapType.getStructOrExceptionOrUnion()) {
                 if (corbaType instanceof Struct) {
                     strcnt++;
                 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/WSDLGenerationTester.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/WSDLGenerationTester.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/WSDLGenerationTester.java
index 3af588b..6f65764 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/WSDLGenerationTester.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/WSDLGenerationTester.java
@@ -23,21 +23,15 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
 
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
 import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.extensions.ExtensionRegistry;
 import javax.wsdl.factory.WSDLFactory;
 import javax.wsdl.xml.WSDLReader;
 import javax.wsdl.xml.WSDLWriter;
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.cxf.binding.corba.wsdl.BindingType;
-import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
-import org.apache.cxf.binding.corba.wsdl.TypeMappingType;
-import org.apache.cxf.wsdl.JAXBExtensionHelper;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.wsdl.WSDLManager;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaCollection;
 
@@ -159,16 +153,16 @@ public class WSDLGenerationTester {
     }
 
     public File writeDefinition(File targetDir, File defnFile) throws Exception {
+        WSDLManager wm = BusFactory.getThreadDefaultBus().getExtension(WSDLManager.class);
         File bkFile = new File(targetDir, "bk_" + defnFile.getName());
         FileWriter writer = new FileWriter(bkFile);
         WSDLFactory factory
             = WSDLFactory.newInstance("org.apache.cxf.tools.corba.utils.TestWSDLCorbaFactoryImpl");
         WSDLReader reader = factory.newWSDLReader();
         reader.setFeature("javax.wsdl.importDocuments", false);
-        ExtensionRegistry extReg = new ExtensionRegistry();
-        addExtensions(extReg);
-        reader.setExtensionRegistry(extReg);
+        reader.setExtensionRegistry(wm.getExtensionRegistry());
         Definition wsdlDefn = reader.readWSDL(defnFile.toString());
+        
         WSDLWriter wsdlWriter = factory.newWSDLWriter();
         wsdlWriter.writeWSDL(wsdlDefn, writer);
         writer.close();
@@ -189,22 +183,4 @@ public class WSDLGenerationTester {
         reader = null;
         return bkFile;
     }
-
-    private void addExtensions(ExtensionRegistry extReg) throws Exception {
-        JAXBExtensionHelper.addExtensions(extReg, Binding.class, BindingType.class);
-        JAXBExtensionHelper.addExtensions(extReg, BindingOperation.class,
-                                          org.apache.cxf.binding.corba.wsdl.OperationType.class);
-        JAXBExtensionHelper.addExtensions(extReg, Definition.class, TypeMappingType.class);
-        JAXBExtensionHelper.addExtensions(extReg, Port.class,
-                                          org.apache.cxf.binding.corba.wsdl.AddressType.class);
-
-        extReg.mapExtensionTypes(Binding.class, CorbaConstants.NE_CORBA_BINDING, BindingType.class);
-        extReg.mapExtensionTypes(BindingOperation.class, CorbaConstants.NE_CORBA_OPERATION,
-                                 org.apache.cxf.binding.corba.wsdl.OperationType.class);
-        extReg.mapExtensionTypes(Definition.class, CorbaConstants.NE_CORBA_TYPEMAPPING,
-                                 TypeMappingType.class);
-        extReg.mapExtensionTypes(Port.class, CorbaConstants.NE_CORBA_ADDRESS,
-                                 org.apache.cxf.binding.corba.wsdl.AddressType.class);
-    }
-
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/d214d105/tools/corba/src/test/resources/wsdl/wsaddressing_bank.wsdl
----------------------------------------------------------------------
diff --git a/tools/corba/src/test/resources/wsdl/wsaddressing_bank.wsdl b/tools/corba/src/test/resources/wsdl/wsaddressing_bank.wsdl
index def4802..bc104d4 100644
--- a/tools/corba/src/test/resources/wsdl/wsaddressing_bank.wsdl
+++ b/tools/corba/src/test/resources/wsdl/wsaddressing_bank.wsdl
@@ -20,7 +20,7 @@
 <definitions xmlns:tns="http://www.apache.org/bus/demos/bank" xmlns:bank="http://www.apache.org/bus/demos/bank" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:corba="http://cxf.apache.org/bindings/corba" xmlns:ns1="http://www.apache.org/corba/typemap/BasePortType.idl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://www.apache.org/bus/demos/bank/corba/typemap/" xmlns:xsd1="http://soapinterop.org/xsd" xmlns="http://schemas.xmlsoap.org/wsdl/" name="BaseService" targetNamespace="http://www.apache.org/bus/demos/bank">
     <corba:typeMapping targetNamespace="http://www.apache.org/bus/demos/bank/corba/typemap/">
         <corba:sequence xmlns:tns="http://www.apache.org/bus/demos/bank" elemtype="corba:string" bound="0" repositoryID="IDL:AccountNames:1.0" type="tns:AccountNames" name="AccountNames"/>
-        <corba:object xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns="" xmlns:ns3="http://schemas.xmlsoap.org/wsdl/" binding="" repositoryID="IDL:omg.org/CORBA/Object/1.0" type="wsa:EndpointReferenceType" name="CORBA.Object"/>
+        <corba:object xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns="" xmlns:ns3="http://schemas.xmlsoap.org/wsdl/" repositoryID="IDL:omg.org/CORBA/Object/1.0" type="wsa:EndpointReferenceType" name="CORBA.Object"/>
     </corba:typeMapping>
     <types>
         <schema xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.apache.org/bus/demos/bank">


Mime
View raw message