cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1310158 - in /cxf/branches/2.4.x-fixes: ./ tools/common/src/main/java/org/apache/cxf/tools/util/ tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/ tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf4128/
Date Fri, 06 Apr 2012 03:40:21 GMT
Author: ffang
Date: Fri Apr  6 03:40:21 2012
New Revision: 1310158

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

................
  r1310156 | ffang | 2012-04-06 11:29:01 +0800 (五, 06  4 2012) | 9 lines
  
  Merged revisions 1310154 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1310154 | ffang | 2012-04-06 11:12:48 +0800 (五, 06  4 2012) | 1 line
    
    [CXF-4128]Code Gen plugin fails silently when generated classes have name collisions
  ........
................

Added:
    cxf/branches/2.4.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf4128/
      - copied from r1310156, cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf4128/
    cxf/branches/2.4.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf4128/cxf4128.wsdl
      - copied unchanged from r1310156, cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf4128/cxf4128.wsdl
Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java
    cxf/branches/2.4.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java

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

Modified: cxf/branches/2.4.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java?rev=1310158&r1=1310157&r2=1310158&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java
(original)
+++ cxf/branches/2.4.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java
Fri Apr  6 03:40:21 2012
@@ -24,11 +24,13 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.TreeSet;
 
 public class ClassCollector {
 
-    private final Map<String, String> seiClassNames = new HashMap<String, String>();
+    private final Map<String, String> seiClassNames 
+        = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
     private final Map<String, String> typesClassNames = new HashMap<String, String>();
     private final Map<String, String> exceptionClassNames = new HashMap<String,
String>();
     private final Map<String, String> serviceClassNames = new HashMap<String, String>();

Modified: cxf/branches/2.4.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=1310158&r1=1310157&r2=1310158&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
(original)
+++ cxf/branches/2.4.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
Fri Apr  6 03:40:21 2012
@@ -1160,4 +1160,19 @@ public class CodeGenBugTest extends Abst
             fail("shouldn't get exception");
         }
     }
+    
+    @Test
+    public void testCXF4128() throws Exception {
+        try {
+            env.put(ToolConstants.CFG_ALL, "all");
+            env.put(ToolConstants.CFG_COMPILE, "compile");
+            env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
+            env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() + "/classes");
+            env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/cxf4128/cxf4128.wsdl"));
+            processor.setContext(env);
+            processor.execute();
+        } catch (Exception e) {
+            fail("shouldn't get exception");
+        }
+    }
 }



Mime
View raw message