svn commit: r542800 - /incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/WSDLASTVisitor.java

[en...@apache.org]

Author: enolan
Date: Wed May 30 04:25:03 2007
New Revision: 542800

URL: http://svn.apache.org/viewvc?view=rev&rev=542800
Log:
fix trunk failure in tools.

Modified:
    incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/WSDLASTVisitor.java

Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/WSDLASTVisitor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/WSDLASTVisitor.java?view=diff&rev=542800&r1=542799&r2=542800
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/WSDLASTVisitor.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/WSDLASTVisitor.java Wed May 30 04:25:03 2007
@@ -49,7 +49,6 @@
 
 import org.apache.cxf.tools.common.ToolException;
 import org.apache.cxf.tools.common.WSDLConstants;
-import org.apache.cxf.tools.validator.WSDLValidator;
 import org.apache.cxf.wsdl.JAXBExtensionHelper;
 import org.apache.schemas.yoko.bindings.corba.AddressType;
 import org.apache.schemas.yoko.bindings.corba.BindingType;
@@ -265,35 +264,35 @@
         
         // write out logical file -L and physical in default
         if (logicalFile != null && physicalFile == null) {
-            writeDefinition(logicalDef, logicalWriter);
+            writeDefinition(logicalDef, logicalWriter);            
             //validateWsdl(logicalFile);
             physicalDef = addWsdlImport(physicalDef, logicalFile);
-            writeDefinition(physicalDef, writer);     
-            //validateWsdl(physicalFile);
+            writeDefinition(physicalDef, writer);
+            //validateWsdl(physicalFile);            
         } else if (logicalFile != null && physicalFile != null) {
             // write both logical -L and physical files -P           
             writeDefinition(logicalDef, logicalWriter);
             //validateWsdl(logicalFile);
             physicalDef = addWsdlImport(physicalDef, logicalFile);
-            writeDefinition(physicalDef, physicalWriter);
+            writeDefinition(physicalDef, physicalWriter);            
             //validateWsdl(physicalFile);
         } else if (logicalFile == null && physicalFile != null) {
             // write pyhsical file -P and logical in default
-            writeDefinition(logicalDef, writer);       
+            writeDefinition(logicalDef, writer);            
             //validateWsdl(getIdlFile());
             physicalDef = addWsdlImport(physicalDef, getIdlFile());            
-            writeDefinition(physicalDef, physicalWriter);
+            writeDefinition(physicalDef, physicalWriter);            
             //validateWsdl(physicalFile);
         } else if ((logicalFile == null && physicalFile == null)
             && (schemaFilename != null || importSchemaFilename != null)) {           
             // write out the schema file -T and default of logical
             // and physical together.
-            writeDefinition(physicalDef, writer);            
+            writeDefinition(physicalDef, writer);               
             //validateWsdl(getIdlFile());   
         } else if (logicalFile == null && physicalFile == null
             && schemaFilename == null) {
             // write out the default file
-            writeDefinition(definition, writer);
+            writeDefinition(definition, writer);            
             //validateWsdl(getIdlFile());
         }        
       
@@ -407,8 +406,8 @@
     }         
 
     private boolean validateWsdl(String wsdlFilename) throws Exception {                   
-        String[] args = new String[] {wsdlFilename};
-        WSDLValidator.main(args);
+        //String[] args = new String[] {wsdlFilename};
+        //WSDLValidator.main(args);
         // REVISIT - When CXF publishes an api for the wsdlvalidator we can then
         // switch to it and delete the files if there is an error.
         // String separator = System.getProperty("file.separator");   
@@ -417,6 +416,20 @@
                 file.delete();
             }  
         }*/
+        // REVISIT - Once the validator is cleaned up in cxf 
+        // will switch uncomment this back in 
+        /*File file = new File(wsdlFilename);
+        URL wsdlURL = file.toURL();        
+
+        try {
+            ToolContext context = new ToolContext(); 
+            context.put(ToolConstants.CFG_WSDLURL, wsdlURL.toString()); 
+            WSDL11Validator wsdlValidator = new WSDL11Validator(null, context);
+            return wsdlValidator.isValid();
+        } catch (ToolException e) {
+         // failed, handle exception here
+        }*/
+
         return true;
     }