cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r619634 [2/3] - in /incubator/cxf/trunk/tools/corba/src: main/generated/org/apache/yoko/tools/processors/idl/ main/java/org/apache/cxf/ main/java/org/apache/cxf/tools/ main/java/org/apache/cxf/tools/corba/ main/java/org/apache/cxf/tools/cor...
Date Thu, 07 Feb 2008 20:54:55 GMT
Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/FixedPtConstVisitor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/FixedPtConstVisitor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/FixedPtConstVisitor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/FixedPtConstVisitor.java Thu Feb  7 12:54:29 2008
@@ -17,19 +17,20 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import javax.wsdl.Definition;
 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.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaCollection;
 import org.apache.ws.commons.schema.XmlSchemaType;
 import org.apache.ws.commons.schema.constants.Constants;
-import org.apache.yoko.wsdl.CorbaConstants;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
+import org.apache.yoko.tools.processors.idl.IDLTokenTypes;
 
 public class FixedPtConstVisitor implements Visitor {
         

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/FixedVisitor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/FixedVisitor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/FixedVisitor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/FixedVisitor.java Thu Feb  7 12:54:29 2008
@@ -17,22 +17,21 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import javax.wsdl.Definition;
-
 import javax.xml.namespace.QName;
 
 import antlr.collections.AST;
 
-import org.apache.schemas.yoko.bindings.corba.Fixed;
-
+import org.apache.cxf.binding.corba.wsdl.Fixed;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaFractionDigitsFacet;
 import org.apache.ws.commons.schema.XmlSchemaSimpleType;
 import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
 import org.apache.ws.commons.schema.XmlSchemaTotalDigitsFacet;
 import org.apache.ws.commons.schema.constants.Constants;
+import org.apache.yoko.tools.processors.idl.IDLTokenTypes;
 
 public class FixedVisitor extends VisitorBase {
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLModuleProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLModuleProcessor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLModuleProcessor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLModuleProcessor.java Thu Feb  7 12:54:29 2008
@@ -16,13 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import java.util.Map;
 
 import antlr.collections.AST;
 
-import org.apache.yoko.tools.common.ToolCorbaConstants;
+import org.apache.cxf.tools.corba.common.ToolCorbaConstants;
+import org.apache.yoko.tools.processors.idl.IDLTokenTypes;
 
 
 public class IDLModuleProcessor extends IDLProcessor {

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLProcessor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLProcessor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLProcessor.java Thu Feb  7 12:54:29 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import java.io.File;
 import java.net.URL;
@@ -27,13 +27,15 @@
 import antlr.collections.AST;
 
 import org.apache.cxf.tools.common.ToolException;
-
-import org.apache.yoko.tools.common.Processor;
-import org.apache.yoko.tools.common.ProcessorEnvironment;
-import org.apache.yoko.tools.common.ToolCorbaConstants;
-import org.apache.yoko.tools.idlpreprocessor.DefaultIncludeResolver;
-import org.apache.yoko.tools.idlpreprocessor.DefineState;
-import org.apache.yoko.tools.idlpreprocessor.IdlPreprocessorReader;
+import org.apache.cxf.tools.corba.common.Processor;
+import org.apache.cxf.tools.corba.common.ProcessorEnvironment;
+import org.apache.cxf.tools.corba.common.ToolCorbaConstants;
+import org.apache.cxf.tools.corba.idlpreprocessor.DefaultIncludeResolver;
+import org.apache.cxf.tools.corba.idlpreprocessor.DefineState;
+import org.apache.cxf.tools.corba.idlpreprocessor.IdlPreprocessorReader;
+import org.apache.yoko.tools.processors.idl.IDLLexer;
+import org.apache.yoko.tools.processors.idl.IDLParser;
+import org.apache.yoko.tools.processors.idl.IDLTokenTypes;
 
 public class IDLProcessor implements Processor {
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java Thu Feb  7 12:54:29 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -45,19 +45,18 @@
 
 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.TypeMappingType;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.tools.common.ToolConstants;
 import org.apache.cxf.tools.common.ToolException;
+import org.apache.cxf.tools.corba.common.ReferenceConstants;
+import org.apache.cxf.tools.corba.common.ToolCorbaConstants;
 import org.apache.cxf.tools.util.FileWriterUtil;
-
-import org.apache.schemas.yoko.bindings.corba.AddressType;
-import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.constants.Constants;
-import org.apache.yoko.tools.common.ReferenceConstants;
-import org.apache.yoko.tools.common.ToolCorbaConstants;
-import org.apache.yoko.wsdl.CorbaConstants;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
 
 public class IDLToWSDLProcessor extends IDLProcessor {
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ModuleToNSMapper.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ModuleToNSMapper.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ModuleToNSMapper.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ModuleToNSMapper.java Thu Feb  7 12:54:29 2008
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.yoko.tools.common.ToolCorbaConstants;
+import org.apache.cxf.tools.corba.common.ToolCorbaConstants;
 
 public class ModuleToNSMapper {
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ModuleVisitor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ModuleVisitor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ModuleVisitor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ModuleVisitor.java Thu Feb  7 12:54:29 2008
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import javax.wsdl.Definition;
 
 import antlr.collections.AST;
 
+import org.apache.cxf.tools.corba.common.ToolCorbaConstants;
 import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.yoko.tools.common.ToolCorbaConstants;
 
 public class ModuleVisitor extends VisitorBase {       
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ObjectReferenceVisitor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ObjectReferenceVisitor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ObjectReferenceVisitor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ObjectReferenceVisitor.java Thu Feb  7 12:54:29 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -35,9 +35,10 @@
 
 import antlr.collections.AST;
 
-import org.apache.schemas.yoko.bindings.corba.BindingType;
-import org.apache.schemas.yoko.bindings.corba.Object;
-
+import org.apache.cxf.binding.corba.wsdl.BindingType;
+import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.Object;
+import org.apache.cxf.tools.corba.common.ReferenceConstants;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaAnnotation;
 import org.apache.ws.commons.schema.XmlSchemaAppInfo;
@@ -47,9 +48,7 @@
 import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
 import org.apache.ws.commons.schema.XmlSchemaType;
 import org.apache.ws.commons.schema.utils.NamespaceMap;
-
-import org.apache.yoko.tools.common.ReferenceConstants;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
+import org.apache.yoko.tools.processors.idl.IDLTokenTypes;
 
 public class ObjectReferenceVisitor extends VisitorBase {
     

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/OperationDeferredAction.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/OperationDeferredAction.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/OperationDeferredAction.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/OperationDeferredAction.java Thu Feb  7 12:54:29 2008
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
-import org.apache.schemas.yoko.bindings.corba.ArgType;
+import org.apache.cxf.binding.corba.wsdl.ArgType;
+import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.tools.corba.common.ReferenceConstants;
 import org.apache.ws.commons.schema.XmlSchemaElement;
 import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.yoko.tools.common.ReferenceConstants;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
 
 public class OperationDeferredAction implements SchemaDeferredAction {
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/OperationVisitor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/OperationVisitor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/OperationVisitor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/OperationVisitor.java Thu Feb  7 12:54:29 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import javax.wsdl.Binding;
 import javax.wsdl.BindingFault;
@@ -38,19 +38,18 @@
 
 import antlr.collections.AST;
 
-import org.apache.schemas.yoko.bindings.corba.ArgType;
-import org.apache.schemas.yoko.bindings.corba.OperationType;
-import org.apache.schemas.yoko.bindings.corba.RaisesType;
-
+import org.apache.cxf.binding.corba.wsdl.ArgType;
+import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
+import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.OperationType;
+import org.apache.cxf.binding.corba.wsdl.RaisesType;
+import org.apache.cxf.tools.corba.common.ReferenceConstants;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaComplexType;
 import org.apache.ws.commons.schema.XmlSchemaElement;
 import org.apache.ws.commons.schema.XmlSchemaSequence;
 import org.apache.ws.commons.schema.XmlSchemaType;
-
-import org.apache.yoko.tools.common.ReferenceConstants;
-import org.apache.yoko.wsdl.CorbaConstants;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
+import org.apache.yoko.tools.processors.idl.IDLTokenTypes;
 
 public class OperationVisitor extends VisitorBase {
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ParamDclVisitor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ParamDclVisitor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ParamDclVisitor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ParamDclVisitor.java Thu Feb  7 12:54:29 2008
@@ -17,23 +17,22 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import javax.wsdl.Definition;
 
 import antlr.collections.AST;
 
-import org.apache.schemas.yoko.bindings.corba.ModeType;
-import org.apache.schemas.yoko.bindings.corba.OperationType;
-import org.apache.schemas.yoko.bindings.corba.ParamType;
-
+import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.ModeType;
+import org.apache.cxf.binding.corba.wsdl.OperationType;
+import org.apache.cxf.binding.corba.wsdl.ParamType;
+import org.apache.cxf.tools.corba.common.ReferenceConstants;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaElement;
 import org.apache.ws.commons.schema.XmlSchemaSequence;
 import org.apache.ws.commons.schema.XmlSchemaType;
-
-import org.apache.yoko.tools.common.ReferenceConstants;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
+import org.apache.yoko.tools.processors.idl.IDLTokenTypes;
 
 public class ParamDclVisitor extends VisitorBase {
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ParamDeferredAction.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ParamDeferredAction.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ParamDeferredAction.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ParamDeferredAction.java Thu Feb  7 12:54:29 2008
@@ -17,18 +17,18 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import java.util.Iterator;
 
-import org.apache.schemas.yoko.bindings.corba.ParamType;
+import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.ParamType;
+import org.apache.cxf.tools.corba.common.ReferenceConstants;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaCollection;
 import org.apache.ws.commons.schema.XmlSchemaElement;
 import org.apache.ws.commons.schema.XmlSchemaImport;
 import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.yoko.tools.common.ReferenceConstants;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
 
 public class ParamDeferredAction implements SchemaDeferredAction {
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ParamTypeSpecVisitor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ParamTypeSpecVisitor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ParamTypeSpecVisitor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ParamTypeSpecVisitor.java Thu Feb  7 12:54:29 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import javax.wsdl.Definition;
 import antlr.collections.AST;

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PortTypeVisitor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PortTypeVisitor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PortTypeVisitor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PortTypeVisitor.java Thu Feb  7 12:54:29 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -32,18 +32,17 @@
 import javax.wsdl.PortType;
 import javax.wsdl.WSDLException;
 import javax.wsdl.extensions.ExtensionRegistry;
-
 import javax.xml.namespace.QName;
 
 import antlr.collections.AST;
 
+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.helpers.CastUtils;
-import org.apache.schemas.yoko.bindings.corba.BindingType;
-
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.yoko.wsdl.CorbaConstants;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
+import org.apache.yoko.tools.processors.idl.IDLTokenTypes;
 
 public class PortTypeVisitor extends VisitorBase {   
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PrimitiveTypesVisitor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PrimitiveTypesVisitor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PrimitiveTypesVisitor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PrimitiveTypesVisitor.java Thu Feb  7 12:54:29 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,12 +27,13 @@
 
 import antlr.collections.AST;
 
+import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
+import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.tools.corba.common.XmlSchemaPrimitiveMap;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaCollection;
 import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.yoko.tools.common.XmlSchemaPrimitiveMap;
-import org.apache.yoko.wsdl.CorbaConstants;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
+import org.apache.yoko.tools.processors.idl.IDLTokenTypes;
 
 public class PrimitiveTypesVisitor implements Visitor {
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SchemaDeferredAction.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SchemaDeferredAction.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SchemaDeferredAction.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SchemaDeferredAction.java Thu Feb  7 12:54:29 2008
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
+import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
 import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
 
 public interface SchemaDeferredAction extends DeferredAction {
     void execute(XmlSchemaType stype, CorbaTypeImpl ctype);

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Scope.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Scope.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Scope.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Scope.java Thu Feb  7 12:54:29 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -25,7 +25,7 @@
 
 import antlr.collections.AST;
 
-import org.apache.yoko.wsdl.CorbaConstants;
+import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
 
 public final class Scope implements Comparable {
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ScopeNameCollection.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ScopeNameCollection.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ScopeNameCollection.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ScopeNameCollection.java Thu Feb  7 12:54:29 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import java.util.HashMap;
 import java.util.Map;

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ScopedNameVisitor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ScopedNameVisitor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ScopedNameVisitor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ScopedNameVisitor.java Thu Feb  7 12:54:29 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -28,19 +28,20 @@
 
 import antlr.collections.AST;
 
-import org.apache.schemas.yoko.bindings.corba.Alias;
-import org.apache.schemas.yoko.bindings.corba.Anonarray;
-import org.apache.schemas.yoko.bindings.corba.Anonsequence;
-import org.apache.schemas.yoko.bindings.corba.Array;
-import org.apache.schemas.yoko.bindings.corba.Sequence;
-import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
+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.CorbaConstants;
+import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.Sequence;
+import org.apache.cxf.binding.corba.wsdl.TypeMappingType;
+import org.apache.cxf.tools.corba.common.XmlSchemaPrimitiveMap;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaCollection;
 import org.apache.ws.commons.schema.XmlSchemaType;
 import org.apache.ws.commons.schema.constants.Constants;
-import org.apache.yoko.tools.common.XmlSchemaPrimitiveMap;
-import org.apache.yoko.wsdl.CorbaConstants;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
+import org.apache.yoko.tools.processors.idl.IDLTokenTypes;
 
 public class ScopedNameVisitor extends VisitorBase {        
     private static boolean exceptionMode;

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SequenceDeferredAction.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SequenceDeferredAction.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SequenceDeferredAction.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SequenceDeferredAction.java Thu Feb  7 12:54:29 2008
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
-import org.apache.schemas.yoko.bindings.corba.Anonsequence;
-import org.apache.schemas.yoko.bindings.corba.Sequence;
+import org.apache.cxf.binding.corba.wsdl.Anonsequence;
+import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.Sequence;
+import org.apache.cxf.tools.corba.common.ReferenceConstants;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaCollection;
 import org.apache.ws.commons.schema.XmlSchemaElement;
 import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.yoko.tools.common.ReferenceConstants;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
 
 public class SequenceDeferredAction implements SchemaDeferredAction {
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SequenceVisitor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SequenceVisitor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SequenceVisitor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SequenceVisitor.java Thu Feb  7 12:54:29 2008
@@ -17,25 +17,24 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import javax.wsdl.Definition;
 import javax.xml.namespace.QName;
 
 import antlr.collections.AST;
 
-import org.apache.schemas.yoko.bindings.corba.Anonsequence;
-import org.apache.schemas.yoko.bindings.corba.Sequence;
-
+import org.apache.cxf.binding.corba.wsdl.Anonsequence;
+import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.Sequence;
+import org.apache.cxf.tools.corba.common.ReferenceConstants;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaComplexType;
 import org.apache.ws.commons.schema.XmlSchemaElement;
 import org.apache.ws.commons.schema.XmlSchemaSequence;
 import org.apache.ws.commons.schema.XmlSchemaType;
 import org.apache.ws.commons.schema.constants.Constants;
-
-import org.apache.yoko.tools.common.ReferenceConstants;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
+import org.apache.yoko.tools.processors.idl.IDLTokenTypes;
 
 public class SequenceVisitor extends VisitorBase {
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SimpleTypeSpecVisitor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SimpleTypeSpecVisitor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SimpleTypeSpecVisitor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SimpleTypeSpecVisitor.java Thu Feb  7 12:54:29 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import javax.wsdl.Definition;
 import antlr.collections.AST;

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StringVisitor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StringVisitor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StringVisitor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StringVisitor.java Thu Feb  7 12:54:29 2008
@@ -17,26 +17,24 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import javax.wsdl.Definition;
 import javax.xml.namespace.QName;
 
 import antlr.collections.AST;
 
-import org.apache.schemas.yoko.bindings.corba.Alias;
-import org.apache.schemas.yoko.bindings.corba.Anonstring;
-import org.apache.schemas.yoko.bindings.corba.Anonwstring;
-
+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.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaMaxLengthFacet;
 import org.apache.ws.commons.schema.XmlSchemaSimpleType;
 import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
-
 import org.apache.ws.commons.schema.constants.Constants;
-
-import org.apache.yoko.wsdl.CorbaConstants;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
+import org.apache.yoko.tools.processors.idl.IDLTokenTypes;
 
 public class StringVisitor extends VisitorBase {
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StructDeferredAction.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StructDeferredAction.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StructDeferredAction.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StructDeferredAction.java Thu Feb  7 12:54:29 2008
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
-import org.apache.schemas.yoko.bindings.corba.MemberType;
+import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.MemberType;
+import org.apache.cxf.tools.corba.common.ReferenceConstants;
 import org.apache.ws.commons.schema.XmlSchemaElement;
 import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.yoko.tools.common.ReferenceConstants;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
 
 public class StructDeferredAction implements SchemaDeferredAction {
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StructVisitor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StructVisitor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StructVisitor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/StructVisitor.java Thu Feb  7 12:54:29 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import java.util.Iterator;
 import java.util.List;
@@ -27,17 +27,16 @@
 
 import antlr.collections.AST;
 
-import org.apache.schemas.yoko.bindings.corba.MemberType;
-import org.apache.schemas.yoko.bindings.corba.Struct;
-
+import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.MemberType;
+import org.apache.cxf.binding.corba.wsdl.Struct;
+import org.apache.cxf.tools.corba.common.ReferenceConstants;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaComplexType;
 import org.apache.ws.commons.schema.XmlSchemaElement;
 import org.apache.ws.commons.schema.XmlSchemaSequence;
 import org.apache.ws.commons.schema.XmlSchemaType;
-
-import org.apache.yoko.tools.common.ReferenceConstants;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
+import org.apache.yoko.tools.processors.idl.IDLTokenTypes;
 
 public class StructVisitor extends VisitorBase {
     

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TemplateTypeSpecVisitor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TemplateTypeSpecVisitor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TemplateTypeSpecVisitor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TemplateTypeSpecVisitor.java Thu Feb  7 12:54:29 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import javax.wsdl.Definition;
 import antlr.collections.AST;

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypeDclVisitor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypeDclVisitor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypeDclVisitor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypeDclVisitor.java Thu Feb  7 12:54:29 2008
@@ -17,11 +17,14 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import javax.wsdl.Definition;
+
 import antlr.collections.AST;
+
 import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.yoko.tools.processors.idl.IDLTokenTypes;
 
 public class TypeDclVisitor extends VisitorBase {
     

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypedefDeferredAction.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypedefDeferredAction.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypedefDeferredAction.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypedefDeferredAction.java Thu Feb  7 12:54:29 2008
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
-import org.apache.schemas.yoko.bindings.corba.Alias;
+import org.apache.cxf.binding.corba.wsdl.Alias;
+import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
 import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
 
 public class TypedefDeferredAction implements SchemaDeferredAction {
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypedefVisitor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypedefVisitor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypedefVisitor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypedefVisitor.java Thu Feb  7 12:54:29 2008
@@ -17,21 +17,20 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import javax.wsdl.Definition;
 import javax.xml.namespace.QName;
 
 import antlr.collections.AST;
 
-import org.apache.schemas.yoko.bindings.corba.Alias;
-
+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.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaType;
 import org.apache.ws.commons.schema.constants.Constants;
-
-import org.apache.yoko.wsdl.CorbaConstants;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
+import org.apache.yoko.tools.processors.idl.IDLTokenTypes;
 
 public class TypedefVisitor extends VisitorBase {
     

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypesUtils.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypesUtils.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypesUtils.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypesUtils.java Thu Feb  7 12:54:29 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import javax.xml.namespace.QName;
 
@@ -25,6 +25,7 @@
 
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaType;
+import org.apache.yoko.tools.processors.idl.IDLTokenTypes;
 
 public final class TypesUtils {
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypesVisitor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypesVisitor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypesVisitor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypesVisitor.java Thu Feb  7 12:54:29 2008
@@ -17,14 +17,13 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import javax.wsdl.Definition;
 
 import antlr.collections.AST;
 
-import org.apache.schemas.yoko.bindings.corba.ArgType;
-
+import org.apache.cxf.binding.corba.wsdl.ArgType;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaObject;
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypesVisitorBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypesVisitorBase.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypesVisitorBase.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypesVisitorBase.java Thu Feb  7 12:54:29 2008
@@ -17,19 +17,18 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import javax.xml.namespace.QName;
 
 import antlr.ASTVisitor;
 import antlr.collections.AST;
 
-import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
-
+import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.TypeMappingType;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaCollection;
 import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
 
 public abstract class TypesVisitorBase implements ASTVisitor {
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/UnionDeferredAction.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/UnionDeferredAction.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/UnionDeferredAction.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/UnionDeferredAction.java Thu Feb  7 12:54:29 2008
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
-import org.apache.schemas.yoko.bindings.corba.Union;
-import org.apache.schemas.yoko.bindings.corba.Unionbranch;
+import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.Union;
+import org.apache.cxf.binding.corba.wsdl.Unionbranch;
+import org.apache.cxf.tools.corba.common.ReferenceConstants;
 import org.apache.ws.commons.schema.XmlSchemaElement;
 import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.yoko.tools.common.ReferenceConstants;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
 
 public class UnionDeferredAction implements SchemaDeferredAction {
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/UnionVisitor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/UnionVisitor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/UnionVisitor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/UnionVisitor.java Thu Feb  7 12:54:29 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import java.util.Iterator;
 import java.util.List;
@@ -27,18 +27,17 @@
 
 import antlr.collections.AST;
 
-import org.apache.schemas.yoko.bindings.corba.CaseType;
-import org.apache.schemas.yoko.bindings.corba.Union;
-import org.apache.schemas.yoko.bindings.corba.Unionbranch;
-
+import org.apache.cxf.binding.corba.wsdl.CaseType;
+import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.Union;
+import org.apache.cxf.binding.corba.wsdl.Unionbranch;
+import org.apache.cxf.tools.corba.common.ReferenceConstants;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaChoice;
 import org.apache.ws.commons.schema.XmlSchemaComplexType;
 import org.apache.ws.commons.schema.XmlSchemaElement;
 import org.apache.ws.commons.schema.XmlSchemaType;
-
-import org.apache.yoko.tools.common.ReferenceConstants;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
+import org.apache.yoko.tools.processors.idl.IDLTokenTypes;
 
 public class UnionVisitor extends VisitorBase {
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Visitor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Visitor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Visitor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Visitor.java Thu Feb  7 12:54:29 2008
@@ -17,13 +17,12 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import antlr.collections.AST;
 
+import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
 import org.apache.ws.commons.schema.XmlSchemaType;
-
-import org.apache.yoko.wsdl.CorbaTypeImpl;
 
 public interface Visitor {
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/VisitorBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/VisitorBase.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/VisitorBase.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/VisitorBase.java Thu Feb  7 12:54:29 2008
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import javax.wsdl.Definition;
 
 import antlr.collections.AST;
 
-import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
+import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.TypeMappingType;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaCollection;
 import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
 
 public abstract class VisitorBase implements Visitor {
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/VisitorTypeHolder.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/VisitorTypeHolder.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/VisitorTypeHolder.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/VisitorTypeHolder.java Thu Feb  7 12:54:29 2008
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
+import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
 import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
 
 public class VisitorTypeHolder {
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLASTVisitor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLASTVisitor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLASTVisitor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLASTVisitor.java Thu Feb  7 12:54:29 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import java.io.Writer;
 import java.util.ArrayList;
@@ -40,16 +40,16 @@
 import antlr.ASTVisitor;
 import antlr.collections.AST;
 
+import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
+import org.apache.cxf.binding.corba.wsdl.TypeMappingType;
 import org.apache.cxf.tools.common.ToolException;
-import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
+import org.apache.cxf.tools.corba.common.ToolCorbaConstants;
+import org.apache.cxf.tools.corba.common.WSDLUtils;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaCollection;
 import org.apache.ws.commons.schema.XmlSchemaForm;
 import org.apache.ws.commons.schema.XmlSchemaType;
 import org.apache.ws.commons.schema.constants.Constants;
-import org.apache.yoko.tools.common.ToolCorbaConstants;
-import org.apache.yoko.tools.common.WSDLUtils;
-import org.apache.yoko.wsdl.CorbaConstants;
 
 public final class WSDLASTVisitor implements ASTVisitor {
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java Thu Feb  7 12:54:29 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.idl;
+package org.apache.cxf.tools.corba.processors.idl;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -40,13 +40,14 @@
 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.binding.corba.wsdl.CorbaConstants;
+import org.apache.cxf.binding.corba.wsdl.OperationType;
+import org.apache.cxf.binding.corba.wsdl.TypeMappingType;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.wsdl.JAXBExtensionHelper;
 import org.apache.cxf.wsdl.WSDLConstants;
-import org.apache.schemas.yoko.bindings.corba.AddressType;
-import org.apache.schemas.yoko.bindings.corba.BindingType;
-import org.apache.schemas.yoko.bindings.corba.OperationType;
-import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaCollection;
 import org.apache.ws.commons.schema.XmlSchemaImport;
@@ -55,8 +56,6 @@
 import org.apache.ws.commons.schema.constants.Constants;
 import org.apache.ws.commons.schema.utils.NamespaceMap;
 
-import org.apache.yoko.wsdl.CorbaConstants;
-
 public class WSDLSchemaManager {
 
     Map<String, Definition> defns;
@@ -256,11 +255,11 @@
 
             extReg.mapExtensionTypes(Binding.class, CorbaConstants.NE_CORBA_BINDING, BindingType.class);
             extReg.mapExtensionTypes(BindingOperation.class, CorbaConstants.NE_CORBA_OPERATION,
-                                     org.apache.schemas.yoko.bindings.corba.OperationType.class);
+                                     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.schemas.yoko.bindings.corba.AddressType.class);
+                                     org.apache.cxf.binding.corba.wsdl.AddressType.class);
         } catch (javax.xml.bind.JAXBException ex) {
             throw new JAXBException(ex.getMessage());
         }

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java Thu Feb  7 12:54:29 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.wsdl;
+package org.apache.cxf.tools.corba.processors.wsdl;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -32,9 +32,10 @@
 import javax.wsdl.Part;
 import javax.xml.namespace.QName;
 
-import org.apache.schemas.yoko.bindings.corba.ArgType;
-import org.apache.schemas.yoko.bindings.corba.ModeType;
-import org.apache.schemas.yoko.bindings.corba.ParamType;
+import org.apache.cxf.binding.corba.wsdl.ArgType;
+import org.apache.cxf.binding.corba.wsdl.CorbaTypeImpl;
+import org.apache.cxf.binding.corba.wsdl.ModeType;
+import org.apache.cxf.binding.corba.wsdl.ParamType;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaAnnotation;
 import org.apache.ws.commons.schema.XmlSchemaAppInfo;
@@ -47,7 +48,6 @@
 import org.apache.ws.commons.schema.XmlSchemaObjectTable;
 import org.apache.ws.commons.schema.XmlSchemaSequence;
 import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
 
 public final class WSDLParameter {
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java Thu Feb  7 12:54:29 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.wsdl;
+package org.apache.cxf.tools.corba.processors.wsdl;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -50,30 +50,29 @@
 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.MemberType;
+import org.apache.cxf.binding.corba.wsdl.OperationType;
+import org.apache.cxf.binding.corba.wsdl.ParamType;
+import org.apache.cxf.binding.corba.wsdl.RaisesType;
+import org.apache.cxf.binding.corba.wsdl.TypeMappingType;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.tools.common.ToolException;
 import org.apache.cxf.wsdl.JAXBExtensionHelper;
-import org.apache.schemas.yoko.bindings.corba.AddressType;
-import org.apache.schemas.yoko.bindings.corba.ArgType;
-import org.apache.schemas.yoko.bindings.corba.BindingType;
-import org.apache.schemas.yoko.bindings.corba.MemberType;
-import org.apache.schemas.yoko.bindings.corba.OperationType;
-import org.apache.schemas.yoko.bindings.corba.ParamType;
-import org.apache.schemas.yoko.bindings.corba.RaisesType;
-import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
-
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaAnnotation;
 import org.apache.ws.commons.schema.XmlSchemaAppInfo;
 import org.apache.ws.commons.schema.XmlSchemaComplexType;
 import org.apache.ws.commons.schema.XmlSchemaElement;
 import org.apache.ws.commons.schema.XmlSchemaExternal;
-//import org.apache.ws.commons.schema.XmlSchemaImport;
 import org.apache.ws.commons.schema.XmlSchemaObjectTable;
 import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.yoko.wsdl.CorbaConstants;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
 
 public class WSDLToCorbaBinding {
     
@@ -445,18 +444,18 @@
         try {                      
             JAXBExtensionHelper.addExtensions(extReg, Binding.class, BindingType.class);
             JAXBExtensionHelper.addExtensions(extReg, BindingOperation.class,
-                                              org.apache.schemas.yoko.bindings.corba.OperationType.class);
+                                              org.apache.cxf.binding.corba.wsdl.OperationType.class);
             JAXBExtensionHelper.addExtensions(extReg, Definition.class, TypeMappingType.class);
             JAXBExtensionHelper.addExtensions(extReg, Port.class,
-                                              org.apache.schemas.yoko.bindings.corba.AddressType.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.schemas.yoko.bindings.corba.OperationType.class);
+                                     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.schemas.yoko.bindings.corba.AddressType.class);
+                                     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());
@@ -647,7 +646,7 @@
     }    
 
     private CorbaTypeImpl convertFaultToCorbaType(XmlSchema xmlSchema, Fault fault) throws Exception {
-        org.apache.schemas.yoko.bindings.corba.Exception corbaex = null;
+        org.apache.cxf.binding.corba.wsdl.Exception corbaex = null;
         XmlSchemaType schemaType = null;
         Iterator parts = fault.getMessage().getParts().values().iterator();
         
@@ -667,7 +666,7 @@
                 name = part.getElementName();
             }
             if (!helper.isSchemaTypeException(schemaType)) {
-                corbaex = new org.apache.schemas.yoko.bindings.corba.Exception();
+                corbaex = new org.apache.cxf.binding.corba.wsdl.Exception();
                 String faultName = fault.getMessage().getQName().getLocalPart();
                 int pos = faultName.indexOf("_exception.");             
                 if (pos != -1) {
@@ -727,16 +726,16 @@
         return corbaex;
     }
     
-    private org.apache.schemas.yoko.bindings.corba.Exception createCorbaException(QName schemaTypeName,
+    private org.apache.cxf.binding.corba.wsdl.Exception createCorbaException(QName schemaTypeName,
                                                                                   XmlSchemaType stype)
         throws Exception {
-        org.apache.schemas.yoko.bindings.corba.Exception corbaex = null;
+        org.apache.cxf.binding.corba.wsdl.Exception corbaex = null;
         XmlSchemaComplexType complex = null;
 
         if (stype instanceof XmlSchemaComplexType) {
             QName defaultName = schemaTypeName;
             complex = (XmlSchemaComplexType)stype;
-            corbaex = new org.apache.schemas.yoko.bindings.corba.Exception();
+            corbaex = new org.apache.cxf.binding.corba.wsdl.Exception();
             corbaex.setQName(schemaTypeName);
             corbaex.setType(helper.checkPrefix(schemaTypeName));
             corbaex.setName(schemaTypeName.getLocalPart());

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java Thu Feb  7 12:54:29 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.wsdl;
+package org.apache.cxf.tools.corba.processors.wsdl;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -33,19 +33,23 @@
 import javax.wsdl.Binding;
 import javax.wsdl.Definition;
 import javax.wsdl.Part;
-
 import javax.xml.namespace.QName;
 
+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.Enum;
+import org.apache.cxf.binding.corba.wsdl.Enumerator;
+import org.apache.cxf.binding.corba.wsdl.MemberType;
+import org.apache.cxf.binding.corba.wsdl.Struct;
+import org.apache.cxf.binding.corba.wsdl.TypeMappingType;
+import org.apache.cxf.binding.corba.wsdl.Union;
+import org.apache.cxf.binding.corba.wsdl.Unionbranch;
+import org.apache.cxf.binding.corba.wsdl.W3CConstants;
 import org.apache.cxf.common.logging.LogUtils;
-import org.apache.schemas.yoko.bindings.corba.CaseType;
-import org.apache.schemas.yoko.bindings.corba.Enum;
-import org.apache.schemas.yoko.bindings.corba.Enumerator;
-import org.apache.schemas.yoko.bindings.corba.MemberType;
-import org.apache.schemas.yoko.bindings.corba.Struct;
-import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
-import org.apache.schemas.yoko.bindings.corba.Union;
-import org.apache.schemas.yoko.bindings.corba.Unionbranch;
-
+import org.apache.cxf.tools.corba.common.CorbaPrimitiveMap;
+import org.apache.cxf.tools.corba.common.ReferenceConstants;
+import org.apache.cxf.tools.corba.common.WSDLUtils;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaAll;
 import org.apache.ws.commons.schema.XmlSchemaAnnotation;
@@ -72,12 +76,6 @@
 import org.apache.ws.commons.schema.XmlSchemaSimpleTypeList;
 import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
 import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.yoko.tools.common.CorbaPrimitiveMap;
-import org.apache.yoko.tools.common.ReferenceConstants;
-import org.apache.yoko.tools.common.WSDLUtils;
-import org.apache.yoko.wsdl.CorbaConstants;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
-import org.apache.yoko.wsdl.W3CConstants;
 
 public class WSDLToCorbaHelper {
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaProcessor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaProcessor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaProcessor.java Thu Feb  7 12:54:29 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.wsdl;
+package org.apache.cxf.tools.corba.processors.wsdl;
 
 import java.io.File;
 import java.util.StringTokenizer;
@@ -32,9 +32,9 @@
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.tools.common.ToolConstants;
 import org.apache.cxf.tools.common.ToolException; 
-import org.apache.yoko.tools.common.ProcessorEnvironment;
-import org.apache.yoko.tools.common.ToolCorbaConstants;
-import org.apache.yoko.tools.common.WSDLUtils;
+import org.apache.cxf.tools.corba.common.ProcessorEnvironment;
+import org.apache.cxf.tools.corba.common.ToolCorbaConstants;
+import org.apache.cxf.tools.corba.common.WSDLUtils;
 
 public class WSDLToCorbaProcessor extends WSDLToProcessor {
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java Thu Feb  7 12:54:29 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.wsdl;
+package org.apache.cxf.tools.corba.processors.wsdl;
 
 import java.io.File;
 import java.io.OutputStream;
@@ -38,61 +38,60 @@
 import javax.xml.bind.JAXBException;
 import javax.xml.namespace.QName;
 
+import org.apache.cxf.binding.corba.wsdl.Alias;
+import org.apache.cxf.binding.corba.wsdl.Anonarray;
+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.ArgType;
+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.Const;
+import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
+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.Fixed;
+import org.apache.cxf.binding.corba.wsdl.MemberType;
+import org.apache.cxf.binding.corba.wsdl.ParamType;
+import org.apache.cxf.binding.corba.wsdl.RaisesType;
+import org.apache.cxf.binding.corba.wsdl.Sequence;
+import org.apache.cxf.binding.corba.wsdl.Struct;
+import org.apache.cxf.binding.corba.wsdl.TypeMappingType;
+import org.apache.cxf.binding.corba.wsdl.Union;
+import org.apache.cxf.binding.corba.wsdl.Unionbranch;
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.tools.corba.common.idltypes.CorbaUtils;
+import org.apache.cxf.tools.corba.common.idltypes.IdlAnonArray;
+import org.apache.cxf.tools.corba.common.idltypes.IdlAnonFixed;
+import org.apache.cxf.tools.corba.common.idltypes.IdlAnonSequence;
+import org.apache.cxf.tools.corba.common.idltypes.IdlArray;
+import org.apache.cxf.tools.corba.common.idltypes.IdlAttribute;
+import org.apache.cxf.tools.corba.common.idltypes.IdlConst;
+import org.apache.cxf.tools.corba.common.idltypes.IdlDefn;
+import org.apache.cxf.tools.corba.common.idltypes.IdlEnum;
+import org.apache.cxf.tools.corba.common.idltypes.IdlEnumerator;
+import org.apache.cxf.tools.corba.common.idltypes.IdlException;
+import org.apache.cxf.tools.corba.common.idltypes.IdlField;
+import org.apache.cxf.tools.corba.common.idltypes.IdlFixed;
+import org.apache.cxf.tools.corba.common.idltypes.IdlInterface;
+import org.apache.cxf.tools.corba.common.idltypes.IdlModule;
+import org.apache.cxf.tools.corba.common.idltypes.IdlOperation;
+import org.apache.cxf.tools.corba.common.idltypes.IdlParam;
+import org.apache.cxf.tools.corba.common.idltypes.IdlRoot;
+import org.apache.cxf.tools.corba.common.idltypes.IdlScopeBase;
+import org.apache.cxf.tools.corba.common.idltypes.IdlSequence;
+import org.apache.cxf.tools.corba.common.idltypes.IdlString;
+import org.apache.cxf.tools.corba.common.idltypes.IdlStruct;
+import org.apache.cxf.tools.corba.common.idltypes.IdlType;
+import org.apache.cxf.tools.corba.common.idltypes.IdlTypedef;
+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;
 
-import org.apache.schemas.yoko.bindings.corba.Alias;
-import org.apache.schemas.yoko.bindings.corba.Anonarray;
-import org.apache.schemas.yoko.bindings.corba.Anonfixed;
-import org.apache.schemas.yoko.bindings.corba.Anonsequence;
-import org.apache.schemas.yoko.bindings.corba.Anonstring;
-import org.apache.schemas.yoko.bindings.corba.ArgType;
-import org.apache.schemas.yoko.bindings.corba.Array;
-import org.apache.schemas.yoko.bindings.corba.BindingType;
-import org.apache.schemas.yoko.bindings.corba.CaseType;
-import org.apache.schemas.yoko.bindings.corba.Const;
-import org.apache.schemas.yoko.bindings.corba.Enum;
-import org.apache.schemas.yoko.bindings.corba.Enumerator;
-import org.apache.schemas.yoko.bindings.corba.Fixed;
-import org.apache.schemas.yoko.bindings.corba.MemberType;
-import org.apache.schemas.yoko.bindings.corba.ParamType;
-import org.apache.schemas.yoko.bindings.corba.RaisesType;
-import org.apache.schemas.yoko.bindings.corba.Sequence;
-import org.apache.schemas.yoko.bindings.corba.Struct;
-import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
-import org.apache.schemas.yoko.bindings.corba.Union;
-import org.apache.schemas.yoko.bindings.corba.Unionbranch;
-import org.apache.yoko.tools.common.idltypes.CorbaUtils;
-import org.apache.yoko.tools.common.idltypes.IdlAnonArray;
-import org.apache.yoko.tools.common.idltypes.IdlAnonFixed;
-import org.apache.yoko.tools.common.idltypes.IdlAnonSequence;
-import org.apache.yoko.tools.common.idltypes.IdlArray;
-import org.apache.yoko.tools.common.idltypes.IdlAttribute;
-import org.apache.yoko.tools.common.idltypes.IdlConst;
-import org.apache.yoko.tools.common.idltypes.IdlDefn;
-import org.apache.yoko.tools.common.idltypes.IdlEnum;
-import org.apache.yoko.tools.common.idltypes.IdlEnumerator;
-import org.apache.yoko.tools.common.idltypes.IdlException;
-import org.apache.yoko.tools.common.idltypes.IdlField;
-import org.apache.yoko.tools.common.idltypes.IdlFixed;
-import org.apache.yoko.tools.common.idltypes.IdlInterface;
-import org.apache.yoko.tools.common.idltypes.IdlModule;
-import org.apache.yoko.tools.common.idltypes.IdlOperation;
-import org.apache.yoko.tools.common.idltypes.IdlParam;
-import org.apache.yoko.tools.common.idltypes.IdlRoot;
-import org.apache.yoko.tools.common.idltypes.IdlScopeBase;
-import org.apache.yoko.tools.common.idltypes.IdlSequence;
-import org.apache.yoko.tools.common.idltypes.IdlString;
-import org.apache.yoko.tools.common.idltypes.IdlStruct;
-import org.apache.yoko.tools.common.idltypes.IdlType;
-import org.apache.yoko.tools.common.idltypes.IdlTypedef;
-import org.apache.yoko.tools.common.idltypes.IdlUnion;
-import org.apache.yoko.tools.common.idltypes.IdlUnionBranch;
-import org.apache.yoko.tools.utils.FileOutputStreamFactory;
-import org.apache.yoko.tools.utils.OutputStreamFactory;
-import org.apache.yoko.wsdl.CorbaConstants;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
-
 public class WSDLToIDLAction {
         
     protected static final Logger LOG = LogUtils.getL7dLogger(WSDLToIDLAction.class);
@@ -177,18 +176,18 @@
                       
             JAXBExtensionHelper.addExtensions(extReg, Binding.class, BindingType.class);
             JAXBExtensionHelper.addExtensions(extReg, BindingOperation.class,
-                                              org.apache.schemas.yoko.bindings.corba.OperationType.class);
+                                              org.apache.cxf.binding.corba.wsdl.OperationType.class);
             JAXBExtensionHelper.addExtensions(extReg, Definition.class, TypeMappingType.class);
             JAXBExtensionHelper.addExtensions(extReg, Port.class,
-                                              org.apache.schemas.yoko.bindings.corba.AddressType.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.schemas.yoko.bindings.corba.OperationType.class);
+                                     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.schemas.yoko.bindings.corba.AddressType.class);
+                                     org.apache.cxf.binding.corba.wsdl.AddressType.class);
 
         } catch (javax.xml.bind.JAXBException ex) {
             LOG.log(Level.SEVERE, "Failing to serialize/deserialize extensions", ex);
@@ -252,8 +251,8 @@
         String name = null;
         Iterator i = bindingOperation.getExtensibilityElements().iterator();
         while (i.hasNext()) {
-            org.apache.schemas.yoko.bindings.corba.OperationType opType = 
-                (org.apache.schemas.yoko.bindings.corba.OperationType)i
+            org.apache.cxf.binding.corba.wsdl.OperationType opType = 
+                (org.apache.cxf.binding.corba.wsdl.OperationType)i
                 .next();
             name = opType.getName();
 
@@ -266,7 +265,7 @@
         }
     }
 
-    public void createIdlAttribute(org.apache.schemas.yoko.bindings.corba.OperationType 
+    public void createIdlAttribute(org.apache.cxf.binding.corba.wsdl.OperationType 
                                    opType, String name) throws Exception {          
         String attrNm = name.substring(5, name.length());
         IdlAttribute attr;
@@ -292,7 +291,7 @@
         }
     }
 
-    public void createIdlOperation(org.apache.schemas.yoko.bindings.corba.OperationType opType, String name,
+    public void createIdlOperation(org.apache.cxf.binding.corba.wsdl.OperationType opType, String name,
                                    boolean isOneway) throws Exception {
 
         IdlOperation idlOp = IdlOperation.create(intf, opType.getName(), isOneway);
@@ -525,7 +524,7 @@
         } else if (corbaTypeImpl instanceof Anonsequence) {
             result = createAnonSequence(corbaTypeImpl, scope, local);
         } else if (corbaTypeImpl 
-            instanceof org.apache.schemas.yoko.bindings.corba.Exception) {
+            instanceof org.apache.cxf.binding.corba.wsdl.Exception) {
             result = createIdlException(corbaTypeImpl, scope, local);
         } else if (corbaTypeImpl instanceof Struct) {
             result = createStruct(corbaTypeImpl, scope, local);            
@@ -573,8 +572,8 @@
     
         IdlType result = null;
         
-        org.apache.schemas.yoko.bindings.corba.Object obj = 
-            (org.apache.schemas.yoko.bindings.corba.Object)ctype;
+        org.apache.cxf.binding.corba.wsdl.Object obj = 
+            (org.apache.cxf.binding.corba.wsdl.Object)ctype;
         QName bqname = obj.getBinding();        
 
         Binding binding = def.getBinding(bqname);
@@ -606,8 +605,8 @@
     private IdlType createIdlException(CorbaTypeImpl ctype, IdlScopeBase scope, 
                                        String local) throws Exception {
         IdlType result = null;
-        org.apache.schemas.yoko.bindings.corba.Exception e = 
-            (org.apache.schemas.yoko.bindings.corba.Exception)ctype;
+        org.apache.cxf.binding.corba.wsdl.Exception e = 
+            (org.apache.cxf.binding.corba.wsdl.Exception)ctype;
 
         Object obj = scope.lookup(local);
 

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToProcessor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToProcessor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToProcessor.java Thu Feb  7 12:54:29 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.wsdl;
+package org.apache.cxf.tools.corba.processors.wsdl;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -45,11 +45,9 @@
 import org.apache.cxf.tools.common.Processor;
 import org.apache.cxf.tools.common.ToolContext;
 import org.apache.cxf.tools.common.ToolException;
-
+import org.apache.cxf.tools.corba.common.ProcessorEnvironment;
 import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaCollection; 
-
-import org.apache.yoko.tools.common.ProcessorEnvironment;
+import org.apache.ws.commons.schema.XmlSchemaCollection;
 
 public class WSDLToProcessor implements Processor {
     

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToTypeProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToTypeProcessor.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToTypeProcessor.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToTypeProcessor.java Thu Feb  7 12:54:29 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.wsdl;
+package org.apache.cxf.tools.corba.processors.wsdl;
 
 public class WSDLToTypeProcessor extends WSDLToProcessor {    
 }

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLTypes.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLTypes.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLTypes.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLTypes.java Thu Feb  7 12:54:29 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.processors.wsdl;
+package org.apache.cxf.tools.corba.processors.wsdl;
 
 import java.util.Iterator;
 import java.util.List;
@@ -33,19 +33,22 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import org.apache.cxf.binding.corba.wsdl.Anonarray;
+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.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.Fixed;
+import org.apache.cxf.binding.corba.wsdl.MemberType;
+import org.apache.cxf.binding.corba.wsdl.Sequence;
+import org.apache.cxf.binding.corba.wsdl.Union;
+import org.apache.cxf.binding.corba.wsdl.Unionbranch;
+import org.apache.cxf.binding.corba.wsdl.W3CConstants;
 import org.apache.cxf.common.logging.LogUtils;
-import org.apache.schemas.yoko.bindings.corba.Anonarray;
-import org.apache.schemas.yoko.bindings.corba.Anonfixed;
-import org.apache.schemas.yoko.bindings.corba.Anonsequence;
-import org.apache.schemas.yoko.bindings.corba.Anonstring;
-import org.apache.schemas.yoko.bindings.corba.Array;
-import org.apache.schemas.yoko.bindings.corba.BindingType;
-import org.apache.schemas.yoko.bindings.corba.CaseType;
-import org.apache.schemas.yoko.bindings.corba.Fixed;
-import org.apache.schemas.yoko.bindings.corba.MemberType;
-import org.apache.schemas.yoko.bindings.corba.Sequence;
-import org.apache.schemas.yoko.bindings.corba.Union;
-import org.apache.schemas.yoko.bindings.corba.Unionbranch;
 import org.apache.ws.commons.schema.XmlSchemaAnnotation;
 import org.apache.ws.commons.schema.XmlSchemaAppInfo;
 import org.apache.ws.commons.schema.XmlSchemaChoice;
@@ -57,9 +60,7 @@
 import org.apache.ws.commons.schema.XmlSchemaSequence;
 import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
 import org.apache.ws.commons.schema.XmlSchemaTotalDigitsFacet;
-import org.apache.yoko.wsdl.CorbaConstants;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
-import org.apache.yoko.wsdl.W3CConstants;
+
 
 public final class WSDLTypes {
     
@@ -96,8 +97,8 @@
                         }
 
                         if (binding != null) {    
-                            org.apache.schemas.yoko.bindings.corba.Object obj = 
-                                new org.apache.schemas.yoko.bindings.corba.Object();
+                            org.apache.cxf.binding.corba.wsdl.Object obj = 
+                                new org.apache.cxf.binding.corba.wsdl.Object();
                             PortType portT = binding.getPortType();
                             QName name = new QName(idlNamespace, portT.getQName().getLocalPart(), 
                                                    definition.getPrefix(idlNamespace));
@@ -126,8 +127,8 @@
         }
 
         if (corbaTypeImpl == null) {
-            org.apache.schemas.yoko.bindings.corba.Object obj = 
-                new org.apache.schemas.yoko.bindings.corba.Object();
+            org.apache.cxf.binding.corba.wsdl.Object obj = 
+                new org.apache.cxf.binding.corba.wsdl.Object();
             QName name = new QName(idlNamespace, "CORBA.Object", definition.getPrefix(idlNamespace));
             obj.setName(name.getLocalPart());
             obj.setQName(name);             

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/utils/FileOutputStreamFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/utils/FileOutputStreamFactory.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/utils/FileOutputStreamFactory.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/utils/FileOutputStreamFactory.java Thu Feb  7 12:54:29 2008
@@ -17,10 +17,16 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.utils;
+package org.apache.cxf.tools.corba.utils;
 
-import java.io.*;
-import java.util.*;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 
 
 public class FileOutputStreamFactory implements OutputStreamFactory {

Modified: incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/utils/OutputStreamFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/utils/OutputStreamFactory.java?rev=619634&r1=619420&r2=619634&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/utils/OutputStreamFactory.java (original)
+++ incubator/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/utils/OutputStreamFactory.java Thu Feb  7 12:54:29 2008
@@ -17,9 +17,10 @@
  * under the License.
  */
 
-package org.apache.yoko.tools.utils;
+package org.apache.cxf.tools.corba.utils;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.util.Iterator;
 
 



Mime
View raw message