svn commit: r1071528 - in /cxf/branches/2.3.x-fixes: ./ tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java

[ffang]

Author: ffang
Date: Thu Feb 17 07:42:59 2011
New Revision: 1071528

URL: http://svn.apache.org/viewvc?rev=1071528&view=rev
Log:
Merged revisions 1071525 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1071525 | ffang | 2011-02-17 15:23:30 +0800 (四, 17  2 2011) | 1 line
  
  [CXF-3340]remove definition cache when use wsdl2java so it works in case that 
wsdl content changes with same wsdlurl
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    
cxf/branches/2.3.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java

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

Modified: 
cxf/branches/2.3.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java?rev=1071528&r1=1071527&r2=1071528&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
 Thu Feb 17 07:42:59 2011
@@ -67,6 +67,7 @@ import org.apache.cxf.tools.validator.Se
 import org.apache.cxf.tools.wsdlto.core.AbstractWSDLBuilder;
 import org.apache.cxf.tools.wsdlto.core.DataBindingProfile;
 import org.apache.cxf.tools.wsdlto.core.FrontEndProfile;
+import org.apache.cxf.wsdl.WSDLManager;
 import org.apache.cxf.wsdl11.WSDLServiceBuilder;
 
 public class WSDLToJavaContainer extends AbstractCXFToolContainer {
@@ -199,7 +200,9 @@ public class WSDLToJavaContainer extends
                 } else {
                     serviceList = serviceBuilder.buildMockServices(definition);
                 }
-
+                //remove definition from cache so that won't fail when 
encounter same wsdl file
+                //name but different wsdl content(CXF-3340)
+                
getBus().getExtension(WSDLManager.class).removeDefinition(definition);
             } else {
                 // TODO: wsdl2.0 support
             }