svn commit: r645500 - in /incubator/cxf/branches/2.0.x-fixes: ./ parent/pom.xml rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java

[dkulp]

Author: dkulp
Date: Mon Apr  7 06:16:08 2008
New Revision: 645500

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

........
  r645481 | dkulp | 2008-04-07 08:42:51 -0400 (Mon, 07 Apr 2008) | 2 lines
  
  Upgrade to XmlSchema 1.4
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
    
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java

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

Modified: incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/parent/pom.xml?rev=645500&r1=645499&r2=645500&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/parent/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/parent/pom.xml Mon Apr  7 06:16:08 2008
@@ -450,7 +450,7 @@
             <dependency>
                 <groupId>org.apache.ws.commons.schema</groupId>
                 <artifactId>XmlSchema</artifactId>
-                <version>1.3.2</version>
+                <version>1.4</version>
             </dependency>
             <dependency>
                 <groupId>javax.xml.soap</groupId>

Modified: 
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java?rev=645500&r1=645499&r2=645500&view=diff
==============================================================================
--- 
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
 (original)
+++ 
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
 Mon Apr  7 06:16:08 2008
@@ -205,6 +205,13 @@
 
         buildInterface(service, p);
 
+        WSDLManager wsdlManager = bus.getExtension(WSDLManager.class); 
+        if (wsdlManager != null) {
+            ServiceSchemaInfo serviceSchemaInfo = new ServiceSchemaInfo();
+            
serviceSchemaInfo.setSchemaCollection(service.getXmlSchemaCollection());
+            serviceSchemaInfo.setSchemaInfoList(service.getSchemas());
+            wsdlManager.putSchemasForDefinition(def, serviceSchemaInfo);
+        }
         return service;
     }