servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r798704 - in /servicemix/components/engines/servicemix-exec/trunk/src/main: java/org/apache/servicemix/exec/ExecEndpoint.java resources/servicemix-exec.wsdl
Date Tue, 28 Jul 2009 20:43:34 GMT
Author: jbonofre
Date: Tue Jul 28 20:43:33 2009
New Revision: 798704

URL: http://svn.apache.org/viewvc?rev=798704&view=rev
Log:
Upgrade the component WSDL to 2.0 version to separate abstract from concrete.

Modified:
    servicemix/components/engines/servicemix-exec/trunk/src/main/java/org/apache/servicemix/exec/ExecEndpoint.java
    servicemix/components/engines/servicemix-exec/trunk/src/main/resources/servicemix-exec.wsdl

Modified: servicemix/components/engines/servicemix-exec/trunk/src/main/java/org/apache/servicemix/exec/ExecEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-exec/trunk/src/main/java/org/apache/servicemix/exec/ExecEndpoint.java?rev=798704&r1=798703&r2=798704&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-exec/trunk/src/main/java/org/apache/servicemix/exec/ExecEndpoint.java
(original)
+++ servicemix/components/engines/servicemix-exec/trunk/src/main/java/org/apache/servicemix/exec/ExecEndpoint.java
Tue Jul 28 20:43:33 2009
@@ -92,12 +92,12 @@
 	@Override
 	public void activate() throws Exception {
 	    // get the WSDL resource
-	    Resource wsdl = new ClassPathResource(DEFAULT_WSDL);
+	    //Resource wsdl = new ClassPathResource(DEFAULT_WSDL);
 	    
 	    // parse the WSDL to populate the endpoint description
-	    description = DomUtil.parse(wsdl.getInputStream());
+	    //description = DomUtil.parse(wsdl.getInputStream());
 	    // extract the WSDL definition from the description
-	    definition = javax.wsdl.factory.WSDLFactory.newInstance().newWSDLReader().readWSDL(null,
description);
+	    //definition = javax.wsdl.factory.WSDLFactory.newInstance().newWSDLReader().readWSDL(null,
description);
 	    
 	    // TODO override WSDL attributes (binding, service name, etc) using the endpoint configuration
 	    // (contained in the xbean.xml)

Modified: servicemix/components/engines/servicemix-exec/trunk/src/main/resources/servicemix-exec.wsdl
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-exec/trunk/src/main/resources/servicemix-exec.wsdl?rev=798704&r1=798703&r2=798704&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-exec/trunk/src/main/resources/servicemix-exec.wsdl
(original)
+++ servicemix/components/engines/servicemix-exec/trunk/src/main/resources/servicemix-exec.wsdl
Tue Jul 28 20:43:33 2009
@@ -1,43 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions name="servicemix-exec"
-                  targetNamespace="http://servicemix.apache.org/servicemix-exec"
-                  xmlns="http://schemas.xmlsoap.org/wsdl/"
-                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap"
-                  xmlns:tns="http://servicemix.apache.org/servicemix-exec"
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema">           
+<wsdl:description name="servicemix-exec"
+                  targetNamespace="http://servicemix.apache.org/exec"
+                  xmlns:wsdl="http://www.w3.org/2006/01/wsdl"
+                  xmlns:tns="http://servicemix.apache.org/exec"
+                  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
                   
-    <message name="ExecRequest">
-        <part name="command" type="xsd:string"/>
-    </message>
-    <message name="ExecResponse">
-        <part name="output" type="xsd:string"/>
-    </message>
+    <wsdl:description>
+        Abstract WSDL for the servicemix-exec component.
+    </wsdl:description>                  
     
-    <portType name="ExecPortType">
-        <operation name="exec">
-            <input message="tns:ExecRequest"/>
-            <output message="tns:ExecResponse"/>
-        </operation>
-    </portType>
+    <wsdl:types>
+        <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                   targetNamespace="http://servicemix.apache.org/exec"
+                   xmlns="http://servicemix.apache.org/exec">
+            
+            <xs:element name="Command" type="xs:string"/>
+            
+            <xs:element name="ExecutionData" type="TypeExecutionData"/>
+            <xs:complexType name="TypeExecutionData">
+                <xs:sequence>
+                    <xs:element name="output" type="xs:string"/>
+                    <xs:element name="error" type="xs:string"/>
+                    <xs:element name="returnCode" type="xs:integer"/>             
  
+                </xs:sequence>    
+            </xs:complexType>
+                       
+        </xs:schema>
+    </wsdl:types>
     
-    <binding name="ExecBinding" type="ExecPortType">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <operation name="exec">
-            <soap:operation soapAction=""/>
-            <input>
-                <soap:body use="literal"/>
-            </input>
-            <output>
-                <soap:body use="literal"/>
-            </output>
-        </operation> 
-    </binding>
-    
-    <service name="ExecService">
-        <documentation>WSDL for ServiceMix Exec component</documentation>
-        <port binding="tns:ExecBinding" name="ExecPort">
-            <soap:address location="nmr://exec"/>
-        </port>
-    </service>
+    <wsdl:interfaces>
+        <wsdl:interface name="executeInterface">
+            <wsdl:fault name="executionFault" element="xs:string"/>
+            <wsdl:operation name="execute" pattern="http://www.w3.org/ns/wsdl/in-out"
+                       style="http://www.w3.org/ns/wsdl/style/iri">
+                <wsdl:input messageLabel="In" element="Command"/>
+                <wsdl:output messageLabel="Out" element="ExecutionData"/>         
             
+            </wsdl:operation>                  
+        </wsdl:interface>
+    </wsdl:interfaces>
                   
-</definitions>                  
\ No newline at end of file
+</wsdl:description>               
\ No newline at end of file



Mime
View raw message