You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2010/11/16 21:54:06 UTC

svn commit: r1035808 - in /cxf/branches/2.2.x-fixes: ./ maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/ tools/corba/src/main/java/org/apache/cxf/tools/corba/ tools/corba/src/main/java/org/apache/cxf/tools/corba/common...

Author: dkulp
Date: Tue Nov 16 20:54:06 2010
New Revision: 1035808

URL: http://svn.apache.org/viewvc?rev=1035808&view=rev
Log:
Merged revisions 1035453 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.3.x-fixes

................
  r1035453 | dkulp | 2010-11-15 16:01:57 -0500 (Mon, 15 Nov 2010) | 9 lines
  
  Merged revisions 1035391 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1035391 | ericjohnson | 2010-11-15 13:35:42 -0500 (Mon, 15 Nov 2010) | 1 line
    
    fixed the idltowsdl typos
  ........
................

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
    cxf/branches/2.2.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/IDLToWSDL.java
    cxf/branches/2.2.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/toolspec/toolspecs/idl2wsdl.xml
    cxf/branches/2.2.x-fixes/tools/corba/src/test/resources/toolspecs/idl2wsdl.xml

Propchange: cxf/branches/2.2.x-fixes/
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java?rev=1035808&r1=1035807&r2=1035808&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java (original)
+++ cxf/branches/2.2.x-fixes/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java Tue Nov 16 20:54:06 2010
@@ -52,7 +52,7 @@ public class IDLToWSDLPlugin extends Abs
         outputDirFile.mkdirs();
         
         if (idltowsdlOptions == null) {
-            throw new MojoExecutionException("Please specify the idltowsdl options");
+            throw new MojoExecutionException("Please specify the idl2wsdl options");
         }
 
         for (int x = 0; x < idltowsdlOptions.length; x++) {

Modified: cxf/branches/2.2.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/IDLToWSDL.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/IDLToWSDL.java?rev=1035808&r1=1035807&r2=1035808&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/IDLToWSDL.java (original)
+++ cxf/branches/2.2.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/IDLToWSDL.java Tue Nov 16 20:54:06 2010
@@ -43,7 +43,7 @@ import org.apache.cxf.tools.corba.proces
 
 public class IDLToWSDL extends AbstractCXFToolContainer {
 
-    static final String TOOL_NAME = "idltowsdl";
+    static final String TOOL_NAME = "idl2wsdl";
     private static String[] args;
 
     public IDLToWSDL(ToolSpec toolspec) throws Exception {

Modified: cxf/branches/2.2.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/toolspec/toolspecs/idl2wsdl.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/toolspec/toolspecs/idl2wsdl.xml?rev=1035808&r1=1035807&r2=1035808&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/toolspec/toolspecs/idl2wsdl.xml (original)
+++ cxf/branches/2.2.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/toolspec/toolspecs/idl2wsdl.xml Tue Nov 16 20:54:06 2010
@@ -27,10 +27,10 @@
     xmlns:ts="http://cxf.apache.org/Xutil/ToolSpecification">
 
     <annotation> Examples :
-        idltowsdl HelloWorld.idl
-        idltowsdl -o HelloWorld HelloWorld.idl
-        idltowsdl -w http://www.mycompany.com/schemas HelloWorld.idl
-        idltowsdl -f HelloWorld.ior -interface HelloWorld HellowWorld.idl
+        idl2wsdl HelloWorld.idl
+        idl2wsdl -o HelloWorld HelloWorld.idl
+        idl2wsdl -w http://www.mycompany.com/schemas HelloWorld.idl
+        idl2wsdl -f HelloWorld.ior -interface HelloWorld HellowWorld.idl
     </annotation>
 
     <usage>

Modified: cxf/branches/2.2.x-fixes/tools/corba/src/test/resources/toolspecs/idl2wsdl.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/corba/src/test/resources/toolspecs/idl2wsdl.xml?rev=1035808&r1=1035807&r2=1035808&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/tools/corba/src/test/resources/toolspecs/idl2wsdl.xml (original)
+++ cxf/branches/2.2.x-fixes/tools/corba/src/test/resources/toolspecs/idl2wsdl.xml Tue Nov 16 20:54:06 2010
@@ -27,10 +27,10 @@
     xmlns:ts="http://cxf.apache.org/Xutil/ToolSpecification">
 
     <annotation> Examples :
-        idltowsdl HelloWorld.idl
-        idltowsdl -o HelloWorld HelloWorld.idl
-        idltowsdl -w http://www.mycompany.com/schemas HelloWorld.idl
-        idltowsdl -f HelloWorld.ior -interface HelloWorld HellowWorld.idl
+        idl2wsdl HelloWorld.idl
+        idl2wsdl -o HelloWorld HelloWorld.idl
+        idl2wsdl -w http://www.mycompany.com/schemas HelloWorld.idl
+        idl2wsdl -f HelloWorld.ior -interface HelloWorld HellowWorld.idl
     </annotation>
 
     <usage>