Generic filetype instead of predefined classes.

Affects StartUpload and GetJob operations

diff --git a/org.glite.jp.ws-interface/interface/JobProvenancePS.wsdl b/org.glite.jp.ws-interface/interface/JobProvenancePS.wsdl
index 7c777dd..c6ebf36 100644 (file)
--- a/org.glite.jp.ws-interface/interface/JobProvenancePS.wsdl
+++ b/org.glite.jp.ws-interface/interface/JobProvenancePS.wsdl
@@ -17,7 +17,8 @@
        </message>
        <message name="StartUploadRequest">
                <part name="job" type="xsd:string"/>
-               <part name="uclass" type="jp:UploadClass"/>
+               <part name="class" type="xsd:string"/>
+               <part name="name" type="xsd:string"/>
                <part name="commitBefore" type="xsd:dateTime"/>
                <part name="contentType" type="xsd:string"/>
        </message>
@@ -50,10 +51,7 @@
                <part name="jobid" type="xsd:string"/>
        </message>
        <message name="GetJobResponse">
-               <part name="jobLog" type="xsd:string"/>
-               <part name="inputSandbox" type="xsd:string"/>
-               <part name="outputSandbox" type="xsd:string"/>
-               <part name="tags" type="xsd:string"/>
+               <part name="files" type="jp:Files"/>
        </message>
        <message name="GenericJPFault">
                <part name="fault" element="jp:GenericJPFault"/>

diff --git a/org.glite.jp.ws-interface/interface/JobProvenanceTypes.wsdl b/org.glite.jp.ws-interface/interface/JobProvenanceTypes.wsdl
index e1a6db4..b3f502f 100644 (file)
--- a/org.glite.jp.ws-interface/interface/JobProvenanceTypes.wsdl
+++ b/org.glite.jp.ws-interface/interface/JobProvenanceTypes.wsdl
@@ -24,13 +24,6 @@
                        <enumeration value="TAG"/>
                </restriction>
        </simpleType>
-       <simpleType name="UploadClass">
-               <restriction base="xsd:string">
-                       <enumeration value="INPUT-SANDBOX"/>
-                       <enumeration value="OUTPUT-SANDBOX"/>
-                       <enumeration value="JOB-LOG"/>
-               </restriction>
-       </simpleType>
        <simpleType name="QueryOp">
                <restriction base="xsd:string">
                        <enumeration value="EQUAL"/>
@@ -155,6 +148,18 @@
                        <element name="commitBefore" type="xsd:dateTime" minOccurs="0" maxOccurs="1" nillable="true"/>
                </sequence>
        </complexType>
+       <complexType name="File">
+               <sequence>
+                       <element name="class" type="xsd:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+                       <element name="name" type="xsd:string" minOccurs="1" maxOccurs="1" nillable="true"/>
+                       <element name="url" type="xsd:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+               </sequence>
+       </complexType>
+       <complexType name="Files">
+               <sequence>
+                       <element name="file" type="jp:File" minOccurs="0" maxOccurs="1"/>
+               </sequence>
+       </complexType>
        <element name="GenericJPFault" type="jp:GenericJPFaultType"/>
 </schema>