geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r1087193 - in /geronimo/server/trunk/plugins: j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/EndpointInfoBuilder.java
Date Thu, 31 Mar 2011 05:55:25 GMT
Author: xuhaihong
Date: Thu Mar 31 05:55:24 2011
New Revision: 1087193

URL: http://svn.apache.org/viewvc?rev=1087193&view=rev
Log:
GERONIMO-5884 Support wsdl-file override for web service client in vendor DD

Modified:
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/EndpointInfoBuilder.java

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd?rev=1087193&r1=1087192&r2=1087193&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd
Thu Mar 31 05:55:24 2011
@@ -1060,6 +1060,18 @@
                     </xsd:documentation>
                 </xsd:annotation>
             </xsd:element>
+            <xsd:element name="wsdl-file"
+                    type="xsd:anyURI"
+                    minOccurs="0"
+                    maxOccurs="1">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        The element wsdl-file is used to provide updated wsdl file URI, 
+                        it overrides the configuration from WebServiceClient and 
+                        specification deployment descriptor.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
             <xsd:choice>
                 <xsd:element name="service-completion"
                     type="gernaming:service-completionType">

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/EndpointInfoBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/EndpointInfoBuilder.java?rev=1087193&r1=1087192&r2=1087193&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/EndpointInfoBuilder.java
(original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/EndpointInfoBuilder.java
Thu Mar 31 05:55:24 2011
@@ -106,6 +106,17 @@ public class EndpointInfoBuilder {
     }
 
     public void build() throws DeploymentException {
+        if (serviceRefType != null) {
+            String wsdlFile = serviceRefType.getWsdlFile();
+            if (wsdlFile != null && !wsdlFile.isEmpty()) {
+                try {
+                    this.wsdlURI = new URI(serviceRefType.getWsdlFile());
+                } catch (URISyntaxException e) {
+                    throw new DeploymentException("Illegal WSDL location is specified in
deployment plan " + wsdlFile, e);
+                }
+            }
+        }
+        
         if (this.wsdlURI == null) {
             // wsdl was not explicitly specified
             if (javax.xml.ws.Service.class.equals(this.serviceClass)) {



Mime
View raw message