You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by br...@apache.org on 2007/03/20 17:06:15 UTC

svn commit: r520483 - in /incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools: IDLToWSDL.java WSDLToIDL.java

Author: bravi
Date: Tue Mar 20 10:06:15 2007
New Revision: 520483

URL: http://svn.apache.org/viewvc?view=rev&rev=520483
Log:
Fix for tools build failure because of changes in cxf tools api changes.

Modified:
    incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/IDLToWSDL.java
    incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/WSDLToIDL.java

Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/IDLToWSDL.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/IDLToWSDL.java?view=diff&rev=520483&r1=520482&r2=520483
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/IDLToWSDL.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/IDLToWSDL.java Tue Mar 20 10:06:15 2007
@@ -75,7 +75,7 @@
         } catch (ToolException ex) {
             System.err.println("Error : " + ex.getMessage());
             if (ex.getCause() instanceof BadUsageException) {
-                getInstance().printUsageException(TOOL_NAME, (BadUsageException)ex.getCause());
+                printUsageException(TOOL_NAME, (BadUsageException)ex.getCause());
             }
             System.err.println();
             if (isVerboseOn()) {
@@ -120,22 +120,19 @@
         //need to add all the other options
     }
 
+    public static void run(String[] arguments) throws Exception {
+        ToolRunner.runTool(IDLToWSDL.class, IDLToWSDL.class
+                           .getResourceAsStream(ToolCorbaConstants.TOOLSPECS_BASE + "idl2wsdl.xml"),
+                           false,
+                           arguments);       
+    }
+
     public static void main(String[] arguments) {
         try {
-            ToolRunner.runTool(IDLToWSDL.class, IDLToWSDL.class
-                .getResourceAsStream(ToolCorbaConstants.TOOLSPECS_BASE + "idl2wsdl.xml"), false, arguments);
-        } catch (BadUsageException ex) {
-            getInstance().printUsageException(TOOL_NAME, ex);
-            if (getInstance().isVerboseOn()) {
-                ex.printStackTrace();
-            }          
-            System.exit(1);
+            run(arguments);
         } catch (Exception ex) {
             System.err.println("Error : " + ex.getMessage());
             System.err.println();
-            if (getInstance().isVerboseOn()) {
-                ex.printStackTrace();
-            }
             System.exit(1);
         }
     }

Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/WSDLToIDL.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/WSDLToIDL.java?view=diff&rev=520483&r1=520482&r2=520483
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/WSDLToIDL.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/WSDLToIDL.java Tue Mar 20 10:06:15 2007
@@ -86,7 +86,7 @@
         } catch (ToolException ex) {
             System.err.println("Error : " + ex.getMessage());
             if (ex.getCause() instanceof BadUsageException) {
-                getInstance().printUsageException(TOOL_NAME, (BadUsageException)ex.getCause());
+                printUsageException(TOOL_NAME, (BadUsageException)ex.getCause());
             }
             System.err.println();
             if (isVerboseOn()) {
@@ -137,22 +137,19 @@
 
     }
 
+    public static void run(String[] arguments) throws Exception {
+        ToolRunner.runTool(WSDLToIDL.class, WSDLToIDL.class
+                           .getResourceAsStream(ToolCorbaConstants.TOOLSPECS_BASE + "wsdl2idl.xml"),
+                           false,
+                           arguments);
+    }
+
     public static void main(String[] arguments) {
         try {
-            ToolRunner.runTool(WSDLToIDL.class, WSDLToIDL.class
-                .getResourceAsStream(ToolCorbaConstants.TOOLSPECS_BASE + "wsdl2idl.xml"), false, arguments);
-        } catch (BadUsageException ex) {            
-            getInstance().printUsageException(TOOL_NAME, ex);
-            if (getInstance().isVerboseOn()) {
-                ex.printStackTrace();
-            }          
-            System.exit(1);
+            run(arguments);
         } catch (Exception ex) {
             System.err.println("Error : " + ex.getMessage());
             System.err.println();
-            if (getInstance().isVerboseOn()) {
-                ex.printStackTrace();
-            }
             System.exit(1);
         }
     }