[workspace-commit] CVS update: MODIFIED: workspace
Tim Freeman
commit at globus.org
Wed Apr 16 16:37:41 CDT 2008
, workspace_status_service.wsdl
, workspace_service.wsdl
, workspace_group_port_type.wsdl, workspace_factory_bindings.wsdl
, workspace_group_bindings.wsdl, workspace_group_service.wsdl
, workspace_ensemble_bindings.wsdl
, workspace_factory_service.wsdl
, workspace_ensemble_service.wsdl
, workspace_bindings.wsdl
, workspace_status_bindings.wsdl
, workspace_ensemble_port_type.wsdl
, workspace_status_port_type.wsdl
, workspace_factory_port_type.wsdl
, workspace_port_type.wsdl
...
User: tfreeman
Date: 08/04/16 16:37:41
Modified: vm/service/common/schema/workspace
workspace_status_service.wsdl
workspace_service.wsdl
workspace_group_port_type.wsdl workspace_types.xsd
workspace_factory_bindings.wsdl
workspace_group_bindings.wsdl negotiable.xsd
workspace_group_service.wsdl
workspace_ensemble_bindings.wsdl
workspace_factory_service.wsdl
workspace_ensemble_service.wsdl
workspace_bindings.wsdl
workspace_status_bindings.wsdl
workspace_ensemble_port_type.wsdl
workspace_status_port_type.wsdl
workspace_factory_port_type.wsdl
workspace_port_type.wsdl
Log:
new WSDL
Revision Changes Path
1.4 +2 -2 workspace/vm/service/common/schema/workspace/workspace_status_service.wsdl
http://viewcvs.globus.org/viewcvs.cgi/workspace/vm/service/common/schema/workspace/workspace_status_service.wsdl.diff?r1=1.3&r2=1.4
(In the diff below, changes in quantity of whitespace are not shown.)
Index: workspace_status_service.wsdl
===================================================================
RCS file: /home/globdev/CVS/globus-packages/workspace/vm/service/common/schema/workspace/workspace_status_service.wsdl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- workspace_status_service.wsdl 7 Feb 2008 18:40:15 -0000 1.3
+++ workspace_status_service.wsdl 16 Apr 2008 21:37:41 -0000 1.4
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="WorkspaceStatusService" targetNamespace="http://www.globus.org/2007/12/workspace/status/service" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:binding="http://www.globus.org/2007/12/workspace/status/bindings" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- <wsdl:import namespace="http://www.globus.org/2007/12/workspace/status/bindings" location="workspace_status_bindings.wsdl"/>
+<wsdl:definitions name="WorkspaceStatusService" targetNamespace="http://www.globus.org/2008/03/workspace/status/service" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:binding="http://www.globus.org/2008/03/workspace/status/bindings" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <wsdl:import namespace="http://www.globus.org/2008/03/workspace/status/bindings" location="workspace_status_bindings.wsdl"/>
<wsdl:service name="WorkspaceStatusService">
<wsdl:port name="WorkspaceStatusPortTypePort" binding="binding:WorkspaceStatusPortTypeSOAPBinding">
<soap:address location="http://localhost:8080/wsrf/services/"/>
1.14 +2 -2 workspace/vm/service/common/schema/workspace/workspace_service.wsdl
http://viewcvs.globus.org/viewcvs.cgi/workspace/vm/service/common/schema/workspace/workspace_service.wsdl.diff?r1=1.13&r2=1.14
(In the diff below, changes in quantity of whitespace are not shown.)
Index: workspace_service.wsdl
===================================================================
RCS file: /home/globdev/CVS/globus-packages/workspace/vm/service/common/schema/workspace/workspace_service.wsdl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- workspace_service.wsdl 7 Feb 2008 18:40:15 -0000 1.13
+++ workspace_service.wsdl 16 Apr 2008 21:37:41 -0000 1.14
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="WorkspaceService" targetNamespace="http://www.globus.org/2007/12/workspace/service" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:binding="http://www.globus.org/2007/12/workspace/bindings" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- <wsdl:import namespace="http://www.globus.org/2007/12/workspace/bindings" location="workspace_bindings.wsdl"/>
+<wsdl:definitions name="WorkspaceService" targetNamespace="http://www.globus.org/2008/03/workspace/service" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:binding="http://www.globus.org/2008/03/workspace/bindings" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <wsdl:import namespace="http://www.globus.org/2008/03/workspace/bindings" location="workspace_bindings.wsdl"/>
<wsdl:service name="WorkspaceService">
<wsdl:port name="WorkspacePortTypePort" binding="binding:WorkspacePortTypeSOAPBinding">
<soap:address location="http://localhost:8080/wsrf/services/"/>
1.4 +19 -14 workspace/vm/service/common/schema/workspace/workspace_group_port_type.wsdl
http://viewcvs.globus.org/viewcvs.cgi/workspace/vm/service/common/schema/workspace/workspace_group_port_type.wsdl.diff?r1=1.3&r2=1.4
(In the diff below, changes in quantity of whitespace are not shown.)
Index: workspace_group_port_type.wsdl
===================================================================
RCS file: /home/globdev/CVS/globus-packages/workspace/vm/service/common/schema/workspace/workspace_group_port_type.wsdl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- workspace_group_port_type.wsdl 7 Feb 2008 18:40:15 -0000 1.3
+++ workspace_group_port_type.wsdl 16 Apr 2008 21:37:41 -0000 1.4
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="WorkspaceGroupService" targetNamespace="http://www.globus.org/2007/12/workspace/group" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" xmlns:tns="http://www.globus.org/2007/12/workspace/group" xmlns:wsrlw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" xmlns:neg="http://www.globus.org/2007/12/workspace/negotiable" xmlns:wsdlpp="http://www.globus.org/namespaces/2004/10/WSDLPreprocessor" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:work-types="http://www.globus.org/2007/12/workspace/types" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="WorkspaceGroupService" targetNamespace="http://www.globus.org/2008/03/workspace/group" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" xmlns:tns="http://www.globus.org/2008/03/workspace/group" xmlns:wsrlw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" xmlns:neg="http://www.globus.org/2008/03/workspace/negotiable" xmlns:wsdlpp="http://www.globus.org/namespaces/2004/10/WSDLPreprocessor" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:work-types="http://www.globus.org/2008/03/workspace/types" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" location="../wsrf/lifetime/WS-ResourceLifetime.wsdl"/>
<wsdl:types>
- <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.globus.org/2007/12/workspace/group" xmlns:tns="http://www.globus.org/2007/12/workspace/group">
+ <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.globus.org/2008/03/workspace/group" xmlns:tns="http://www.globus.org/2008/03/workspace/group">
<xs:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="../ws/addressing/WS-Addressing.xsd"/>
- <xs:import namespace="http://www.globus.org/2007/12/workspace/types" schemaLocation="./workspace_types.xsd"/>
+ <xs:import namespace="http://www.globus.org/2008/03/workspace/types" schemaLocation="./workspace_types.xsd"/>
<!--==================================================-->
<!-- Operational input/output type declarations -->
@@ -16,7 +16,7 @@
<xs:element name="startWorkspacesResponse" type="work-types:voidType"/>
- <xs:element name="shutdownWorkspaces" type="work-types:shutdownEnumeration"/>
+ <xs:element name="shutdownWorkspaces" type="work-types:WorkspaceShutdownRequest_Type"/>
<xs:element name="shutdownWorkspacesResponse" type="work-types:voidType"/>
@@ -25,29 +25,33 @@
<wsdl:message name="ShutdownWorkspacesOutputMessage">
<wsdl:part name="parameters" element="tns:shutdownWorkspacesResponse"/>
</wsdl:message>
- <wsdl:message name="StartWorkspacesOutputMessage">
- <wsdl:part name="parameters" element="tns:startWorkspacesResponse"/>
- </wsdl:message>
- <wsdl:message name="StartFaultMessage">
- <wsdl:part name="description" element="work-types:WorkspaceStartFault"/>
- </wsdl:message>
- <wsdl:message name="DisabledFaultMessage">
- <wsdl:part name="description" element="work-types:OperationDisabledFault"/>
+ <wsdl:message name="ShutdownWorkspacesInputMessage">
+ <wsdl:part name="parameters" element="tns:shutdownWorkspaces"/>
</wsdl:message>
<wsdl:message name="ShutdownFaultMessage">
<wsdl:part name="description" element="work-types:WorkspaceShutdownFault"/>
</wsdl:message>
+ <wsdl:message name="UnknownFaultMessage">
+ <wsdl:part name="description" element="work-types:WorkspaceUnknownFault"/>
+ </wsdl:message>
+ <wsdl:message name="StartWorkspacesOutputMessage">
+ <wsdl:part name="parameters" element="tns:startWorkspacesResponse"/>
+ </wsdl:message>
<wsdl:message name="StartWorkspacesInputMessage">
<wsdl:part name="parameters" element="tns:startWorkspaces"/>
</wsdl:message>
- <wsdl:message name="ShutdownWorkspacesInputMessage">
- <wsdl:part name="parameters" element="tns:shutdownWorkspaces"/>
+ <wsdl:message name="DisabledFaultMessage">
+ <wsdl:part name="description" element="work-types:OperationDisabledFault"/>
+ </wsdl:message>
+ <wsdl:message name="StartFaultMessage">
+ <wsdl:part name="description" element="work-types:WorkspaceStartFault"/>
</wsdl:message>
<wsdl:portType name="WorkspaceGroupPortType">
<wsdl:operation name="start">
<wsdl:input message="tns:StartWorkspacesInputMessage"/>
<wsdl:output message="tns:StartWorkspacesOutputMessage"/>
<wsdl:fault name="OperationDisabledFault" message="tns:DisabledFaultMessage"/>
+ <wsdl:fault name="UnknownWorkspaceFault" message="tns:UnknownFaultMessage"/>
<wsdl:fault name="WorkspaceStartFault" message="tns:StartFaultMessage"/>
</wsdl:operation>
<wsdl:operation name="shutdown">
@@ -55,6 +59,7 @@
<wsdl:output message="tns:ShutdownWorkspacesOutputMessage"/>
<wsdl:fault name="WorkspaceShutdownFault" message="tns:ShutdownFaultMessage"/>
<wsdl:fault name="OperationDisabledFault" message="tns:DisabledFaultMessage"/>
+ <wsdl:fault name="UnknownWorkspaceFault" message="tns:UnknownFaultMessage"/>
</wsdl:operation>
<wsdl:operation name="Destroy">
<wsdl:input message="wsrlw:DestroyRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/Destroy"/>
1.15 +94 -15 workspace/vm/service/common/schema/workspace/workspace_types.xsd
http://viewcvs.globus.org/viewcvs.cgi/workspace/vm/service/common/schema/workspace/workspace_types.xsd.diff?r1=1.14&r2=1.15
(In the diff below, changes in quantity of whitespace are not shown.)
Index: workspace_types.xsd
===================================================================
RCS file: /home/globdev/CVS/globus-packages/workspace/vm/service/common/schema/workspace/workspace_types.xsd,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- workspace_types.xsd 7 Feb 2008 18:40:15 -0000 1.14
+++ workspace_types.xsd 16 Apr 2008 21:37:41 -0000 1.15
@@ -18,12 +18,12 @@
-->
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.globus.org/2007/12/workspace/types"
- xmlns="http://www.globus.org/2007/12/workspace/types"
- xmlns:tns="http://www.globus.org/2007/12/workspace/types"
- xmlns:vwmeta="http://www.globus.org/2007/12/workspace/metadata"
- xmlns:neg="http://www.globus.org/2007/12/workspace/negotiable"
- xmlns:log="http://www.globus.org/2007/12/workspace/metadata/logistics"
+ targetNamespace="http://www.globus.org/2008/03/workspace/types"
+ xmlns="http://www.globus.org/2008/03/workspace/types"
+ xmlns:tns="http://www.globus.org/2008/03/workspace/types"
+ xmlns:vwmeta="http://www.globus.org/2008/03/workspace/metadata"
+ xmlns:neg="http://www.globus.org/2008/03/workspace/negotiable"
+ xmlns:log="http://www.globus.org/2008/03/workspace/metadata/logistics"
xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing"
xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd"
attributeFormDefault="qualified"
@@ -35,17 +35,46 @@
<xs:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd"
schemaLocation="../wsrf/faults/WS-BaseFaults.xsd" />
- <xs:import namespace="http://www.globus.org/2007/12/workspace/metadata"
+ <xs:import namespace="http://www.globus.org/2008/03/workspace/metadata"
schemaLocation="./metadata/vw.xsd" />
- <xs:import namespace="http://www.globus.org/2007/12/workspace/negotiable"
+ <xs:import namespace="http://www.globus.org/2008/03/workspace/negotiable"
schemaLocation="./negotiable.xsd" />
<xs:import
- namespace="http://www.globus.org/2007/12/workspace/metadata/logistics"
+ namespace="http://www.globus.org/2008/03/workspace/metadata/logistics"
schemaLocation="./metadata/vw-logistics.xsd" />
<!--==================================================-->
+ <!-- State Related -->
+ <!--==================================================-->
+
+ <xs:simpleType name="currentState_Enumeration">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="Unstaged" />
+ <xs:enumeration value="Unpropagated" />
+ <xs:enumeration value="Propagated" />
+ <xs:enumeration value="Running" />
+ <xs:enumeration value="Paused" />
+ <xs:enumeration value="TransportReady" />
+ <xs:enumeration value="StagedOut" />
+ <xs:enumeration value="Corrupted" />
+ <xs:enumeration value="Cancelled" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:element name="currentState" >
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="state"
+ type="tns:currentState_Enumeration" />
+ <xs:element ref="tns:WorkspaceFault"
+ minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <!--==================================================-->
<!-- input/output types -->
<!--==================================================-->
@@ -62,6 +91,17 @@
</xs:restriction>
</xs:simpleType>
+ <xs:complexType name="WorkspaceShutdownRequest_Type">
+ <xs:sequence>
+
+ <xs:element name="shutdownType"
+ type="tns:shutdownEnumeration" />
+
+ <xs:element ref="neg:PostShutdown" minOccurs="0" />
+
+ </xs:sequence>
+ </xs:complexType>
+
<xs:complexType name="WorkspaceCreateRequest_Type">
<xs:sequence>
@@ -93,6 +133,10 @@
<xs:complexType name="WorkspaceCreateResponse_Type">
<xs:sequence>
+ <xs:element name="CreatedWorkspace"
+ type="tns:CreatedWorkspace_Type"
+ maxOccurs="unbounded" />
+
<xs:element name="GroupEPR"
type="wsa:EndpointReferenceType"
nillable="true" />
@@ -101,16 +145,25 @@
type="wsa:EndpointReferenceType"
nillable="true" />
- <xs:element name="WorkspaceReference"
- type="tns:WorkspaceReference_Type"
- maxOccurs="unbounded" />
</xs:sequence>
</xs:complexType>
- <xs:complexType name="WorkspaceReference_Type">
+ <xs:complexType name="CreatedWorkspace_Type">
<xs:sequence>
- <xs:element ref="wsa:EndpointReference" />
+ <xs:element name="epr"
+ type="wsa:EndpointReferenceType" />
+
+ <xs:element ref="schedule" />
+
+ <xs:element ref="log:networking" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="schedule"
+ type="tns:Schedule_Type" />
+ <xs:complexType name="Schedule_Type">
+ <xs:sequence>
<xs:element name="ActualInstantiationTime"
type="xs:dateTime"
minOccurs="0">
@@ -155,6 +208,21 @@
<xs:element name="stageOut"
type="tns:transferRequest_Type"
minOccurs="0" />
+
+ <xs:element name="filewrite"
+ type="tns:customizeTask_Type"
+ minOccurs="0"
+ maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <!-- should handle base64 in the future -->
+ <xs:complexType name="customizeTask_Type">
+ <xs:sequence>
+ <xs:element name="content"
+ type="xs:string" />
+ <xs:element name="pathOnVM"
+ type="xs:string" />
</xs:sequence>
</xs:complexType>
@@ -217,6 +285,17 @@
</xs:complexType>
</xs:element>
+ <xs:element name="WorkspaceUnknownFault">
+ <xs:annotation>
+ <xs:documentation>Same as a ResourceUnknownFaultType in other portTypes</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="wsbf:BaseFaultType" />
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
<xs:element name="WorkspaceCreationFault">
<xs:complexType>
<xs:complexContent>
1.14 +3 -3 workspace/vm/service/common/schema/workspace/workspace_factory_bindings.wsdl
http://viewcvs.globus.org/viewcvs.cgi/workspace/vm/service/common/schema/workspace/workspace_factory_bindings.wsdl.diff?r1=1.13&r2=1.14
(In the diff below, changes in quantity of whitespace are not shown.)
Index: workspace_factory_bindings.wsdl
===================================================================
RCS file: /home/globdev/CVS/globus-packages/workspace/vm/service/common/schema/workspace/workspace_factory_bindings.wsdl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- workspace_factory_bindings.wsdl 7 Feb 2008 18:40:15 -0000 1.13
+++ workspace_factory_bindings.wsdl 16 Apr 2008 21:37:41 -0000 1.14
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="WorkspaceFactoryService" targetNamespace="http://www.globus.org/2007/12/workspace/bindings" xmlns:porttype="http://www.globus.org/2007/12/workspace" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- <wsdl:import namespace="http://www.globus.org/2007/12/workspace" location="workspace_factory_port_type.wsdl"/>
+<wsdl:definitions name="WorkspaceFactoryService" targetNamespace="http://www.globus.org/2008/03/workspace/bindings" xmlns:porttype="http://www.globus.org/2008/03/workspace" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <wsdl:import namespace="http://www.globus.org/2008/03/workspace" location="workspace_factory_port_type.wsdl"/>
<wsdl:binding name="WorkspaceFactoryPortTypeSOAPBinding" type="porttype:WorkspaceFactoryPortType">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="create">
- <soap:operation soapAction="http://www.globus.org/2007/12/workspace/WorkspaceFactoryPortType/createRequest"/>
+ <soap:operation soapAction="http://www.globus.org/2008/03/workspace/WorkspaceFactoryPortType/createRequest"/>
<wsdl:input>
<soap:body use="literal"/>
</wsdl:input>
1.4 +10 -4 workspace/vm/service/common/schema/workspace/workspace_group_bindings.wsdl
http://viewcvs.globus.org/viewcvs.cgi/workspace/vm/service/common/schema/workspace/workspace_group_bindings.wsdl.diff?r1=1.3&r2=1.4
(In the diff below, changes in quantity of whitespace are not shown.)
Index: workspace_group_bindings.wsdl
===================================================================
RCS file: /home/globdev/CVS/globus-packages/workspace/vm/service/common/schema/workspace/workspace_group_bindings.wsdl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- workspace_group_bindings.wsdl 7 Feb 2008 18:40:15 -0000 1.3
+++ workspace_group_bindings.wsdl 16 Apr 2008 21:37:41 -0000 1.4
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="WorkspaceGroupService" targetNamespace="http://www.globus.org/2007/12/workspace/group/bindings" xmlns:porttype="http://www.globus.org/2007/12/workspace/group" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- <wsdl:import namespace="http://www.globus.org/2007/12/workspace/group" location="workspace_group_port_type.wsdl"/>
+<wsdl:definitions name="WorkspaceGroupService" targetNamespace="http://www.globus.org/2008/03/workspace/group/bindings" xmlns:porttype="http://www.globus.org/2008/03/workspace/group" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <wsdl:import namespace="http://www.globus.org/2008/03/workspace/group" location="workspace_group_port_type.wsdl"/>
<wsdl:binding name="WorkspaceGroupPortTypeSOAPBinding" type="porttype:WorkspaceGroupPortType">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="start">
- <soap:operation soapAction="http://www.globus.org/2007/12/workspace/group/WorkspaceGroupPortType/startRequest"/>
+ <soap:operation soapAction="http://www.globus.org/2008/03/workspace/group/WorkspaceGroupPortType/startRequest"/>
<wsdl:input>
<soap:body use="literal"/>
</wsdl:input>
@@ -14,12 +14,15 @@
<wsdl:fault name="OperationDisabledFault">
<soap:fault name="OperationDisabledFault" use="literal"/>
</wsdl:fault>
+ <wsdl:fault name="UnknownWorkspaceFault">
+ <soap:fault name="UnknownWorkspaceFault" use="literal"/>
+ </wsdl:fault>
<wsdl:fault name="WorkspaceStartFault">
<soap:fault name="WorkspaceStartFault" use="literal"/>
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="shutdown">
- <soap:operation soapAction="http://www.globus.org/2007/12/workspace/group/WorkspaceGroupPortType/shutdownRequest"/>
+ <soap:operation soapAction="http://www.globus.org/2008/03/workspace/group/WorkspaceGroupPortType/shutdownRequest"/>
<wsdl:input>
<soap:body use="literal"/>
</wsdl:input>
@@ -32,6 +35,9 @@
<wsdl:fault name="OperationDisabledFault">
<soap:fault name="OperationDisabledFault" use="literal"/>
</wsdl:fault>
+ <wsdl:fault name="UnknownWorkspaceFault">
+ <soap:fault name="UnknownWorkspaceFault" use="literal"/>
+ </wsdl:fault>
</wsdl:operation>
<wsdl:operation name="Destroy">
<soap:operation soapAction="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/Destroy"/>
1.16 +35 -59 workspace/vm/service/common/schema/workspace/negotiable.xsd
http://viewcvs.globus.org/viewcvs.cgi/workspace/vm/service/common/schema/workspace/negotiable.xsd.diff?r1=1.15&r2=1.16
(In the diff below, changes in quantity of whitespace are not shown.)
Index: negotiable.xsd
===================================================================
RCS file: /home/globdev/CVS/globus-packages/workspace/vm/service/common/schema/workspace/negotiable.xsd,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- negotiable.xsd 7 Feb 2008 18:40:15 -0000 1.15
+++ negotiable.xsd 16 Apr 2008 21:37:41 -0000 1.16
@@ -20,9 +20,9 @@
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.globus.org/2007/12/workspace/negotiable"
- targetNamespace="http://www.globus.org/2007/12/workspace/negotiable"
- xmlns:tns="http://www.globus.org/2007/12/workspace/negotiable"
+ xmlns="http://www.globus.org/2008/03/workspace/negotiable"
+ targetNamespace="http://www.globus.org/2008/03/workspace/negotiable"
+ xmlns:tns="http://www.globus.org/2008/03/workspace/negotiable"
xmlns:jsdl="http://schemas.ggf.org/jsdl/2005/11/jsdl"
elementFormDefault="qualified"
attributeFormDefault="unqualified">
@@ -39,7 +39,7 @@
<xs:complexType name="WorkspaceDeployment_Type">
<xs:sequence>
<xs:element ref="DeploymentTime" />
- <xs:element ref="WorkspaceState" />
+ <xs:element ref="InitialState" />
<xs:element ref="ResourceAllocation" />
<xs:element name="NodeNumber">
<xs:simpleType>
@@ -49,6 +49,7 @@
</xs:simpleType>
</xs:element>
<xs:element ref="ShutdownMechanism" minOccurs="0" />
+ <xs:element ref="PostShutdown" minOccurs="0" />
</xs:sequence>
</xs:complexType>
@@ -74,25 +75,21 @@
type="tns:DeploymentTime_Type" />
<!--==================================================-->
- <!-- WorkspaceState -->
+ <!-- State Related -->
<!--==================================================-->
- <xs:simpleType name="WorkspaceState_Type">
+ <xs:simpleType name="InitialState_Type">
<xs:restriction base="xs:string">
<xs:enumeration value="Unstaged" />
<xs:enumeration value="Unpropagated" />
<xs:enumeration value="Propagated" />
<xs:enumeration value="Running" />
<xs:enumeration value="Paused" />
- <xs:enumeration value="TransportReady" />
- <xs:enumeration value="StagedOut" />
- <xs:enumeration value="Corrupted" />
- <xs:enumeration value="Cancelled" />
</xs:restriction>
</xs:simpleType>
- <xs:element name="WorkspaceState"
- type="tns:WorkspaceState_Type" />
+ <xs:element name="InitialState"
+ type="tns:InitialState_Type" />
<!--==================================================-->
<!-- ShutdownMechanism -->
@@ -108,22 +105,25 @@
<xs:element name="ShutdownMechanism"
type="tns:ShutdownMechanism_Type" >
<xs:annotation>
- <xs:documentation>
- If the maximum running time of the workspace has expired
- and the workspace is shutdown, this element triggers the
- kind of shutdown that should happen.
-
- Currently Serialize is not implemented.
-
- If this element is missing from WorkspaceDeployment, Normal
- is assumed.
-
- If Trash is chosen, the images will be removed and there
- will be no un-propagation step. This is useful when the
- client doesn't need any result or state files on the
- image after it has run (this could be used in conjunction
- with a read-only site image repository for example).
- </xs:documentation>
+ <xs:documentation>If the maximum running time of the workspace has expired and the workspace is shutdown, this element triggers the kind of shutdown that should happen. If this element is missing, Normal is assumed.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+
+
+ <!--==================================================-->
+ <!-- PostShutdown -->
+ <!--==================================================-->
+
+ <xs:complexType name="PostShutdown_Type">
+ <xs:sequence>
+ <xs:element name="rootPartitionUnpropagationTarget" type="xs:anyURI" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="PostShutdown"
+ type="tns:PostShutdown_Type" >
+ <xs:annotation>
+ <xs:documentation>Allows request to specify special post-shutdown needs</xs:documentation>
</xs:annotation>
</xs:element>
@@ -161,20 +161,7 @@
<xs:complexType name="CPU_Type">
<xs:annotation>
- <xs:documentation>Wrapper for CPU resource specification.
- CPUPercentage, IndividualPhysicalMemory, and IndividualCPUCount
- are in practice all computed as a function of this CPU entity.
-
- CPU requested/granted is not necessarily just an architecture
- plus speed. For most accurate negotiation, JSDL extension
- points of CPUArchitecture_Type (the type of
- jsdl:CPUArchitecture listed below) could be used to specify
- exact chip models or properties.
-
- The duration request/grant of a workspace deployment could be
- highly dependent on combination of all information including
- CPU's cache sizes and motherboard's bus, especially in HPC.
- </xs:documentation>
+ <xs:documentation>Wrapper for CPU resource specification. CPUPercentage, IndividualPhysicalMemory, and IndividualCPUCount are in practice all computed as a function of this CPU entity. CPU requested/granted is not necessarily just an architecture plus speed. For most accurate negotiation, JSDL extension points of CPUArchitecture_Type (the type of jsdl:CPUArchitecture listed below) could be used to specify exact chip models or properties. The duration request/grant of a workspace deployment could be highly dependent on combination of all information including CPU's cache sizes and motherboard's bus, especially in HPC.</xs:documentation>
</xs:annotation>
<xs:sequence>
@@ -184,9 +171,7 @@
<xs:element ref="jsdl:IndividualCPUSpeed"
minOccurs="0">
<xs:annotation>
- <xs:documentation>This is temporary and only advisory.
- Ultimately this is inferrable from CPU definition.
- </xs:documentation>
+ <xs:documentation>This is temporary and only advisory. Ultimately this is inferrable from CPU definition.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
@@ -199,11 +184,7 @@
<xs:complexType name="Bandwidth_Type">
<xs:annotation>
- <xs:documentation>JSDL's IndividualNetworkBandwidth type does not
- allow separate selections for ingoing and outgoing.
- jsdl:IndividualNetworkBandwidth is of type jsdl:RangeValue_Type,
- but we need two.
- </xs:documentation>
+ <xs:documentation>JSDL's IndividualNetworkBandwidth type does not allow separate selections for ingoing and outgoing. jsdl:IndividualNetworkBandwidth is of type jsdl:RangeValue_Type, but we need two.</xs:documentation>
</xs:annotation>
<xs:sequence>
@@ -215,9 +196,7 @@
<xs:complexType name="Nic_Type">
<xs:annotation>
- <xs:documentation>Allocation may be requested by just number of
- NICs, so bandwidths are optional.
- </xs:documentation>
+ <xs:documentation>Allocation may be requested by just number of NICs, so bandwidths are optional.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="name" type="xs:string" />
@@ -246,18 +225,15 @@
<xs:element name="entry">
<xs:complexType>
<xs:sequence>
- <xs:element name="logicalName" type="xs:string">
+ <xs:element name="partitionName" type="xs:string">
<xs:annotation>
- <xs:documentation>This should match what is in definition
- section for the blank storage.
- </xs:documentation>
+ <xs:documentation>This should match what is in definition section for the blank storage (BlankDisk_Type).</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element ref="jsdl:IndividualDiskSpace">
<xs:annotation>
- <xs:documentation>This only specifies blank disk space
- requested/given.</xs:documentation>
+ <xs:documentation>This only specifies blank disk space requested/given.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
1.4 +2 -2 workspace/vm/service/common/schema/workspace/workspace_group_service.wsdl
http://viewcvs.globus.org/viewcvs.cgi/workspace/vm/service/common/schema/workspace/workspace_group_service.wsdl.diff?r1=1.3&r2=1.4
(In the diff below, changes in quantity of whitespace are not shown.)
Index: workspace_group_service.wsdl
===================================================================
RCS file: /home/globdev/CVS/globus-packages/workspace/vm/service/common/schema/workspace/workspace_group_service.wsdl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- workspace_group_service.wsdl 7 Feb 2008 18:40:15 -0000 1.3
+++ workspace_group_service.wsdl 16 Apr 2008 21:37:41 -0000 1.4
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="WorkspaceGroupService" targetNamespace="http://www.globus.org/2007/12/workspace/group/service" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:binding="http://www.globus.org/2007/12/workspace/group/bindings" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- <wsdl:import namespace="http://www.globus.org/2007/12/workspace/group/bindings" location="workspace_group_bindings.wsdl"/>
+<wsdl:definitions name="WorkspaceGroupService" targetNamespace="http://www.globus.org/2008/03/workspace/group/service" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:binding="http://www.globus.org/2008/03/workspace/group/bindings" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <wsdl:import namespace="http://www.globus.org/2008/03/workspace/group/bindings" location="workspace_group_bindings.wsdl"/>
<wsdl:service name="WorkspaceGroupService">
<wsdl:port name="WorkspaceGroupPortTypePort" binding="binding:WorkspaceGroupPortTypeSOAPBinding">
<soap:address location="http://localhost:8080/wsrf/services/"/>
1.2 +6 -3 workspace/vm/service/common/schema/workspace/workspace_ensemble_bindings.wsdl
http://viewcvs.globus.org/viewcvs.cgi/workspace/vm/service/common/schema/workspace/workspace_ensemble_bindings.wsdl.diff?r1=1.1&r2=1.2
(In the diff below, changes in quantity of whitespace are not shown.)
Index: workspace_ensemble_bindings.wsdl
===================================================================
RCS file: /home/globdev/CVS/globus-packages/workspace/vm/service/common/schema/workspace/workspace_ensemble_bindings.wsdl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- workspace_ensemble_bindings.wsdl 7 Feb 2008 19:49:34 -0000 1.1
+++ workspace_ensemble_bindings.wsdl 16 Apr 2008 21:37:41 -0000 1.2
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="WorkspaceEnsembleService" targetNamespace="http://www.globus.org/2007/12/workspace/ensemble/bindings" xmlns:porttype="http://www.globus.org/2007/12/workspace/ensemble" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- <wsdl:import namespace="http://www.globus.org/2007/12/workspace/ensemble" location="workspace_ensemble_port_type.wsdl"/>
+<wsdl:definitions name="WorkspaceEnsembleService" targetNamespace="http://www.globus.org/2008/03/workspace/ensemble/bindings" xmlns:porttype="http://www.globus.org/2008/03/workspace/ensemble" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <wsdl:import namespace="http://www.globus.org/2008/03/workspace/ensemble" location="workspace_ensemble_port_type.wsdl"/>
<wsdl:binding name="WorkspaceEnsemblePortTypeSOAPBinding" type="porttype:WorkspaceEnsemblePortType">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="done">
- <soap:operation soapAction="http://www.globus.org/2007/12/workspace/ensemble/WorkspaceEnsemblePortType/doneRequest"/>
+ <soap:operation soapAction="http://www.globus.org/2008/03/workspace/ensemble/WorkspaceEnsemblePortType/doneRequest"/>
<wsdl:input>
<soap:body use="literal"/>
</wsdl:input>
@@ -14,6 +14,9 @@
<wsdl:fault name="EnsembleFault">
<soap:fault name="EnsembleFault" use="literal"/>
</wsdl:fault>
+ <wsdl:fault name="UnknownWorkspaceFault">
+ <soap:fault name="UnknownWorkspaceFault" use="literal"/>
+ </wsdl:fault>
</wsdl:operation>
<wsdl:operation name="Destroy">
<soap:operation soapAction="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/Destroy"/>
1.14 +2 -2 workspace/vm/service/common/schema/workspace/workspace_factory_service.wsdl
http://viewcvs.globus.org/viewcvs.cgi/workspace/vm/service/common/schema/workspace/workspace_factory_service.wsdl.diff?r1=1.13&r2=1.14
(In the diff below, changes in quantity of whitespace are not shown.)
Index: workspace_factory_service.wsdl
===================================================================
RCS file: /home/globdev/CVS/globus-packages/workspace/vm/service/common/schema/workspace/workspace_factory_service.wsdl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- workspace_factory_service.wsdl 7 Feb 2008 18:40:15 -0000 1.13
+++ workspace_factory_service.wsdl 16 Apr 2008 21:37:41 -0000 1.14
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="WorkspaceFactoryService" targetNamespace="http://www.globus.org/2007/12/workspace/service" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:binding="http://www.globus.org/2007/12/workspace/bindings" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- <wsdl:import namespace="http://www.globus.org/2007/12/workspace/bindings" location="workspace_factory_bindings.wsdl"/>
+<wsdl:definitions name="WorkspaceFactoryService" targetNamespace="http://www.globus.org/2008/03/workspace/service" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:binding="http://www.globus.org/2008/03/workspace/bindings" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <wsdl:import namespace="http://www.globus.org/2008/03/workspace/bindings" location="workspace_factory_bindings.wsdl"/>
<wsdl:service name="WorkspaceFactoryService">
<wsdl:port name="WorkspaceFactoryPortTypePort" binding="binding:WorkspaceFactoryPortTypeSOAPBinding">
<soap:address location="http://localhost:8080/wsrf/services/"/>
1.2 +2 -2 workspace/vm/service/common/schema/workspace/workspace_ensemble_service.wsdl
http://viewcvs.globus.org/viewcvs.cgi/workspace/vm/service/common/schema/workspace/workspace_ensemble_service.wsdl.diff?r1=1.1&r2=1.2
(In the diff below, changes in quantity of whitespace are not shown.)
Index: workspace_ensemble_service.wsdl
===================================================================
RCS file: /home/globdev/CVS/globus-packages/workspace/vm/service/common/schema/workspace/workspace_ensemble_service.wsdl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- workspace_ensemble_service.wsdl 7 Feb 2008 19:49:34 -0000 1.1
+++ workspace_ensemble_service.wsdl 16 Apr 2008 21:37:41 -0000 1.2
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="WorkspaceEnsembleService" targetNamespace="http://www.globus.org/2007/12/workspace/ensemble/service" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:binding="http://www.globus.org/2007/12/workspace/ensemble/bindings" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- <wsdl:import namespace="http://www.globus.org/2007/12/workspace/ensemble/bindings" location="workspace_ensemble_bindings.wsdl"/>
+<wsdl:definitions name="WorkspaceEnsembleService" targetNamespace="http://www.globus.org/2008/03/workspace/ensemble/service" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:binding="http://www.globus.org/2008/03/workspace/ensemble/bindings" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <wsdl:import namespace="http://www.globus.org/2008/03/workspace/ensemble/bindings" location="workspace_ensemble_bindings.wsdl"/>
<wsdl:service name="WorkspaceEnsembleService">
<wsdl:port name="WorkspaceEnsemblePortTypePort" binding="binding:WorkspaceEnsemblePortTypeSOAPBinding">
<soap:address location="http://localhost:8080/wsrf/services/"/>
1.14 +10 -4 workspace/vm/service/common/schema/workspace/workspace_bindings.wsdl
http://viewcvs.globus.org/viewcvs.cgi/workspace/vm/service/common/schema/workspace/workspace_bindings.wsdl.diff?r1=1.13&r2=1.14
(In the diff below, changes in quantity of whitespace are not shown.)
Index: workspace_bindings.wsdl
===================================================================
RCS file: /home/globdev/CVS/globus-packages/workspace/vm/service/common/schema/workspace/workspace_bindings.wsdl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- workspace_bindings.wsdl 7 Feb 2008 18:40:15 -0000 1.13
+++ workspace_bindings.wsdl 16 Apr 2008 21:37:41 -0000 1.14
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="WorkspaceService" targetNamespace="http://www.globus.org/2007/12/workspace/bindings" xmlns:porttype="http://www.globus.org/2007/12/workspace" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- <wsdl:import namespace="http://www.globus.org/2007/12/workspace" location="workspace_port_type.wsdl"/>
+<wsdl:definitions name="WorkspaceService" targetNamespace="http://www.globus.org/2008/03/workspace/bindings" xmlns:porttype="http://www.globus.org/2008/03/workspace" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <wsdl:import namespace="http://www.globus.org/2008/03/workspace" location="workspace_port_type.wsdl"/>
<wsdl:binding name="WorkspacePortTypeSOAPBinding" type="porttype:WorkspacePortType">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="start">
- <soap:operation soapAction="http://www.globus.org/2007/12/workspace/WorkspacePortType/startRequest"/>
+ <soap:operation soapAction="http://www.globus.org/2008/03/workspace/WorkspacePortType/startRequest"/>
<wsdl:input>
<soap:body use="literal"/>
</wsdl:input>
@@ -14,12 +14,15 @@
<wsdl:fault name="OperationDisabledFault">
<soap:fault name="OperationDisabledFault" use="literal"/>
</wsdl:fault>
+ <wsdl:fault name="UnknownWorkspaceFault">
+ <soap:fault name="UnknownWorkspaceFault" use="literal"/>
+ </wsdl:fault>
<wsdl:fault name="WorkspaceStartFault">
<soap:fault name="WorkspaceStartFault" use="literal"/>
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="shutdown">
- <soap:operation soapAction="http://www.globus.org/2007/12/workspace/WorkspacePortType/shutdownRequest"/>
+ <soap:operation soapAction="http://www.globus.org/2008/03/workspace/WorkspacePortType/shutdownRequest"/>
<wsdl:input>
<soap:body use="literal"/>
</wsdl:input>
@@ -32,6 +35,9 @@
<wsdl:fault name="OperationDisabledFault">
<soap:fault name="OperationDisabledFault" use="literal"/>
</wsdl:fault>
+ <wsdl:fault name="UnknownWorkspaceFault">
+ <soap:fault name="UnknownWorkspaceFault" use="literal"/>
+ </wsdl:fault>
</wsdl:operation>
<wsdl:operation name="SetTerminationTime">
<soap:operation soapAction="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/SetTerminationTime"/>
1.4 +15 -3 workspace/vm/service/common/schema/workspace/workspace_status_bindings.wsdl
http://viewcvs.globus.org/viewcvs.cgi/workspace/vm/service/common/schema/workspace/workspace_status_bindings.wsdl.diff?r1=1.3&r2=1.4
(In the diff below, changes in quantity of whitespace are not shown.)
Index: workspace_status_bindings.wsdl
===================================================================
RCS file: /home/globdev/CVS/globus-packages/workspace/vm/service/common/schema/workspace/workspace_status_bindings.wsdl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- workspace_status_bindings.wsdl 7 Feb 2008 18:40:15 -0000 1.3
+++ workspace_status_bindings.wsdl 16 Apr 2008 21:37:41 -0000 1.4
@@ -1,10 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="WorkspaceStatusService" targetNamespace="http://www.globus.org/2007/12/workspace/status/bindings" xmlns:porttype="http://www.globus.org/2007/12/workspace/status" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- <wsdl:import namespace="http://www.globus.org/2007/12/workspace/status" location="workspace_status_port_type.wsdl"/>
+<wsdl:definitions name="WorkspaceStatusService" targetNamespace="http://www.globus.org/2008/03/workspace/status/bindings" xmlns:porttype="http://www.globus.org/2008/03/workspace/status" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <wsdl:import namespace="http://www.globus.org/2008/03/workspace/status" location="workspace_status_port_type.wsdl"/>
<wsdl:binding name="WorkspaceStatusPortTypeSOAPBinding" type="porttype:WorkspaceStatusPortType">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="queryUsedAndReservedTime">
- <soap:operation soapAction="http://www.globus.org/2007/12/workspace/status/WorkspaceStatusPortType/queryUsedAndReservedTimeRequest"/>
+ <soap:operation soapAction="http://www.globus.org/2008/03/workspace/status/WorkspaceStatusPortType/queryUsedAndReservedTimeRequest"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="WorkspaceStatusFault">
+ <soap:fault name="WorkspaceStatusFault" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="queryCurrentWorkspaces">
+ <soap:operation soapAction="http://www.globus.org/2008/03/workspace/status/WorkspaceStatusPortType/queryCurrentWorkspacesRequest"/>
<wsdl:input>
<soap:body use="literal"/>
</wsdl:input>
1.2 +11 -5 workspace/vm/service/common/schema/workspace/workspace_ensemble_port_type.wsdl
http://viewcvs.globus.org/viewcvs.cgi/workspace/vm/service/common/schema/workspace/workspace_ensemble_port_type.wsdl.diff?r1=1.1&r2=1.2
(In the diff below, changes in quantity of whitespace are not shown.)
Index: workspace_ensemble_port_type.wsdl
===================================================================
RCS file: /home/globdev/CVS/globus-packages/workspace/vm/service/common/schema/workspace/workspace_ensemble_port_type.wsdl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- workspace_ensemble_port_type.wsdl 7 Feb 2008 19:49:34 -0000 1.1
+++ workspace_ensemble_port_type.wsdl 16 Apr 2008 21:37:41 -0000 1.2
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="WorkspaceEnsembleService" targetNamespace="http://www.globus.org/2007/12/workspace/ensemble" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" xmlns:tns="http://www.globus.org/2007/12/workspace/ensemble" xmlns:wsrlw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" xmlns:wsdlpp="http://www.globus.org/namespaces/2004/10/WSDLPreprocessor" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="WorkspaceEnsembleService" targetNamespace="http://www.globus.org/2008/03/workspace/ensemble" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" xmlns:tns="http://www.globus.org/2008/03/workspace/ensemble" xmlns:wsrlw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" xmlns:wsdlpp="http://www.globus.org/namespaces/2004/10/WSDLPreprocessor" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:work-types="http://www.globus.org/2008/03/workspace/types" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" location="../wsrf/lifetime/WS-ResourceLifetime.wsdl"/>
<wsdl:types>
- <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.globus.org/2007/12/workspace/ensemble" xmlns:tns="http://www.globus.org/2007/12/workspace/ensemble">
+ <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.globus.org/2008/03/workspace/ensemble" xmlns:tns="http://www.globus.org/2008/03/workspace/ensemble">
<xs:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="../ws/addressing/WS-Addressing.xsd"/>
+ <xs:import namespace="http://www.globus.org/2008/03/workspace/types" schemaLocation="./workspace_types.xsd"/>
+
<!--==================================================-->
<!-- Operational input/output type declarations -->
<!--==================================================-->
@@ -29,17 +31,21 @@
<wsdl:message name="EnsembleFaultMessage">
<wsdl:part name="description" element="tns:WorkspaceEnsembleFault"/>
</wsdl:message>
- <wsdl:message name="DoneInputMessage">
- <wsdl:part name="parameters" element="tns:done"/>
- </wsdl:message>
<wsdl:message name="DoneOutputMessage">
<wsdl:part name="parameters" element="tns:doneResponse"/>
</wsdl:message>
+ <wsdl:message name="UnknownFaultMessage">
+ <wsdl:part name="description" element="work-types:WorkspaceUnknownFault"/>
+ </wsdl:message>
+ <wsdl:message name="DoneInputMessage">
+ <wsdl:part name="parameters" element="tns:done"/>
+ </wsdl:message>
<wsdl:portType name="WorkspaceEnsemblePortType">
<wsdl:operation name="done">
<wsdl:input message="tns:DoneInputMessage"/>
<wsdl:output message="tns:DoneOutputMessage"/>
<wsdl:fault name="EnsembleFault" message="tns:EnsembleFaultMessage"/>
+ <wsdl:fault name="UnknownWorkspaceFault" message="tns:UnknownFaultMessage"/>
</wsdl:operation>
<wsdl:operation name="Destroy">
<wsdl:input message="wsrlw:DestroyRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/Destroy"/>
1.4 +39 -2 workspace/vm/service/common/schema/workspace/workspace_status_port_type.wsdl
http://viewcvs.globus.org/viewcvs.cgi/workspace/vm/service/common/schema/workspace/workspace_status_port_type.wsdl.diff?r1=1.3&r2=1.4
(In the diff below, changes in quantity of whitespace are not shown.)
Index: workspace_status_port_type.wsdl
===================================================================
RCS file: /home/globdev/CVS/globus-packages/workspace/vm/service/common/schema/workspace/workspace_status_port_type.wsdl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- workspace_status_port_type.wsdl 7 Feb 2008 18:40:15 -0000 1.3
+++ workspace_status_port_type.wsdl 16 Apr 2008 21:37:41 -0000 1.4
@@ -1,11 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="WorkspaceStatusService" targetNamespace="http://www.globus.org/2007/12/workspace/status" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" xmlns:tns="http://www.globus.org/2007/12/workspace/status" xmlns:wsrpw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" xmlns:wsdlpp="http://www.globus.org/namespaces/2004/10/WSDLPreprocessor" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsnt="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd">
+<wsdl:definitions name="WorkspaceStatusService" targetNamespace="http://www.globus.org/2008/03/workspace/status" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" xmlns:tns="http://www.globus.org/2008/03/workspace/status" xmlns:wsrpw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" xmlns:neg="http://www.globus.org/2008/03/workspace/negotiable" xmlns:log="http://www.globus.org/2008/03/workspace/metadata/logistics" xmlns:wsdlpp="http://www.globus.org/namespaces/2004/10/WSDLPreprocessor" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:work-types="http://www.globus.org/2008/03/workspace/types" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsnt="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd">
<wsdl:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" location="../wsrf/properties/WS-ResourceProperties.wsdl"/>
<wsdl:types>
- <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.globus.org/2007/12/workspace/status" xmlns:tns="http://www.globus.org/2007/12/workspace/status">
+ <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.globus.org/2008/03/workspace/status" xmlns:tns="http://www.globus.org/2008/03/workspace/status">
<xs:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="../ws/addressing/WS-Addressing.xsd"/>
+ <xs:import namespace="http://www.globus.org/2008/03/workspace/types" schemaLocation="./workspace_types.xsd"/>
+
+ <xs:import namespace="http://www.globus.org/2008/03/workspace/negotiable" schemaLocation="./negotiable.xsd"/>
+
+ <xs:import namespace="http://www.globus.org/2008/03/workspace/metadata/logistics" schemaLocation="./metadata/vw-logistics.xsd"/>
+
<!--==================================================-->
<!-- Resource properties -->
<!--==================================================-->
@@ -37,6 +43,26 @@
</xs:sequence>
</xs:complexType>
+ <xs:element name="queryCurrentWorkspaces" type="tns:voidType"/>
+
+ <xs:element name="currentWorkspaces" type="tns:currentWorkspaces_Type"/>
+
+ <xs:complexType name="currentWorkspaces_Type">
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="oneCurrentWorkspace" type="tns:oneCurrentWorkspace_Type"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="oneCurrentWorkspace_Type">
+ <xs:sequence>
+ <xs:element name="epr" type="wsa:EndpointReferenceType"/>
+ <xs:element ref="work-types:currentState"/>
+ <xs:element ref="work-types:schedule"/>
+ <xs:element ref="neg:ResourceAllocation"/>
+ <xs:element ref="log:logistics"/>
+ </xs:sequence>
+ </xs:complexType>
+
<xs:element name="WorkspaceStatusFault">
<xs:complexType>
<xs:complexContent>
@@ -47,9 +73,15 @@
</xs:schema>
</wsdl:types>
+ <wsdl:message name="QueryCurrentWorkspacesInputMessage">
+ <wsdl:part name="parameters" element="tns:queryCurrentWorkspaces"/>
+ </wsdl:message>
<wsdl:message name="StatusFaultMsg">
<wsdl:part name="description" element="tns:WorkspaceStatusFault"/>
</wsdl:message>
+ <wsdl:message name="QueryCurrentWorkspacesOutputMessage">
+ <wsdl:part name="parameters" element="tns:currentWorkspaces"/>
+ </wsdl:message>
<wsdl:message name="QueryUsedAndReservedTimeOutputMessage">
<wsdl:part name="parameters" element="tns:usedAndReservedTime"/>
</wsdl:message>
@@ -62,6 +94,11 @@
<wsdl:output message="tns:QueryUsedAndReservedTimeOutputMessage"/>
<wsdl:fault name="WorkspaceStatusFault" message="tns:StatusFaultMsg"/>
</wsdl:operation>
+ <wsdl:operation name="queryCurrentWorkspaces">
+ <wsdl:input message="tns:QueryCurrentWorkspacesInputMessage"/>
+ <wsdl:output message="tns:QueryCurrentWorkspacesOutputMessage"/>
+ <wsdl:fault name="WorkspaceStatusFault" message="tns:StatusFaultMsg"/>
+ </wsdl:operation>
<wsdl:operation name="QueryResourceProperties">
<wsdl:input name="QueryResourcePropertiesRequest" message="wsrpw:QueryResourcePropertiesRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/QueryResourceProperties"/>
<wsdl:output name="QueryResourcePropertiesResponse" message="wsrpw:QueryResourcePropertiesResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/QueryResourcePropertiesResponse"/>
1.15 +11 -11 workspace/vm/service/common/schema/workspace/workspace_factory_port_type.wsdl
http://viewcvs.globus.org/viewcvs.cgi/workspace/vm/service/common/schema/workspace/workspace_factory_port_type.wsdl.diff?r1=1.14&r2=1.15
(In the diff below, changes in quantity of whitespace are not shown.)
Index: workspace_factory_port_type.wsdl
===================================================================
RCS file: /home/globdev/CVS/globus-packages/workspace/vm/service/common/schema/workspace/workspace_factory_port_type.wsdl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- workspace_factory_port_type.wsdl 7 Feb 2008 18:40:15 -0000 1.14
+++ workspace_factory_port_type.wsdl 16 Apr 2008 21:37:41 -0000 1.15
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="WorkspaceFactoryService" targetNamespace="http://www.globus.org/2007/12/workspace" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" xmlns:tns="http://www.globus.org/2007/12/workspace" xmlns:wsrpw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" xmlns:wsdlpp="http://www.globus.org/namespaces/2004/10/WSDLPreprocessor" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:work-types="http://www.globus.org/2007/12/workspace/types" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsnt="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd">
+<wsdl:definitions name="WorkspaceFactoryService" targetNamespace="http://www.globus.org/2008/03/workspace" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" xmlns:tns="http://www.globus.org/2008/03/workspace" xmlns:wsrpw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" xmlns:wsdlpp="http://www.globus.org/namespaces/2004/10/WSDLPreprocessor" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:work-types="http://www.globus.org/2008/03/workspace/types" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsnt="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd">
<wsdl:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" location="../wsrf/properties/WS-ResourceProperties.wsdl"/>
<wsdl:types>
- <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.globus.org/2007/12/workspace" xmlns:def="http://www.globus.org/2007/12/workspace/metadata/definition" xmlns:jsdl="http://schemas.ggf.org/jsdl/2005/11/jsdl" xmlns:tns="http://www.globus.org/2007/12/workspace">
+ <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.globus.org/2008/03/workspace" xmlns:def="http://www.globus.org/2008/03/workspace/metadata/definition" xmlns:jsdl="http://schemas.ggf.org/jsdl/2005/11/jsdl" xmlns:tns="http://www.globus.org/2008/03/workspace">
<xs:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="../ws/addressing/WS-Addressing.xsd"/>
- <xs:import namespace="http://www.globus.org/2007/12/workspace/types" schemaLocation="./workspace_types.xsd"/>
+ <xs:import namespace="http://www.globus.org/2008/03/workspace/types" schemaLocation="./workspace_types.xsd"/>
<xs:import namespace="http://schemas.ggf.org/jsdl/2005/11/jsdl" schemaLocation="./jsdl/jsdl.xsd"/>
- <xs:import namespace="http://www.globus.org/2007/12/workspace/metadata/definition" schemaLocation="./metadata/vw-definition.xsd"/>
+ <xs:import namespace="http://www.globus.org/2008/03/workspace/metadata/definition" schemaLocation="./metadata/vw-definition.xsd"/>
<!--==================================================-->
<!-- Resource properties -->
@@ -42,23 +42,23 @@
</xs:schema>
</wsdl:types>
- <wsdl:message name="CreationFaultMsg">
- <wsdl:part name="description" element="work-types:WorkspaceCreationFault"/>
- </wsdl:message>
- <wsdl:message name="MetadataFaultMsg">
- <wsdl:part name="description" element="work-types:WorkspaceMetadataFault"/>
+ <wsdl:message name="CreateOutputMessage">
+ <wsdl:part name="parameters" element="tns:createResponse"/>
</wsdl:message>
<wsdl:message name="SchedulingFaultMsg">
<wsdl:part name="description" element="work-types:WorkspaceSchedulingFault"/>
</wsdl:message>
+ <wsdl:message name="MetadataFaultMsg">
+ <wsdl:part name="description" element="work-types:WorkspaceMetadataFault"/>
+ </wsdl:message>
<wsdl:message name="CreateInputMessage">
<wsdl:part name="parameters" element="tns:create"/>
</wsdl:message>
<wsdl:message name="ResourceRequestDeniedFaultMsg">
<wsdl:part name="description" element="work-types:WorkspaceResourceRequestDeniedFault"/>
</wsdl:message>
- <wsdl:message name="CreateOutputMessage">
- <wsdl:part name="parameters" element="tns:createResponse"/>
+ <wsdl:message name="CreationFaultMsg">
+ <wsdl:part name="description" element="work-types:WorkspaceCreationFault"/>
</wsdl:message>
<wsdl:portType name="WorkspaceFactoryPortType" wsrp:ResourceProperties="tns:FactoryRPSet">
<wsdl:operation name="create">
1.14 +24 -14 workspace/vm/service/common/schema/workspace/workspace_port_type.wsdl
http://viewcvs.globus.org/viewcvs.cgi/workspace/vm/service/common/schema/workspace/workspace_port_type.wsdl.diff?r1=1.13&r2=1.14
(In the diff below, changes in quantity of whitespace are not shown.)
Index: workspace_port_type.wsdl
===================================================================
RCS file: /home/globdev/CVS/globus-packages/workspace/vm/service/common/schema/workspace/workspace_port_type.wsdl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- workspace_port_type.wsdl 7 Feb 2008 18:40:15 -0000 1.13
+++ workspace_port_type.wsdl 16 Apr 2008 21:37:41 -0000 1.14
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="WorkspaceService" targetNamespace="http://www.globus.org/2007/12/workspace" xmlns:tns="http://www.globus.org/2007/12/workspace" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:log="http://www.globus.org/2007/12/workspace/metadata/logistics" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:vwmeta="http://www.globus.org/2007/12/workspace/metadata" xmlns:wsntw="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl" xmlns:neg="http://www.globus.org/2007/12/workspace/negotiable" xmlns:wsrlw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" xmlns:wsrpw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" xmlns:wsdlpp="http://www.globus.org/namespaces/2004/10/WSDLPreprocessor" xmlns:work-types="http://www.globus.org/2007/12/workspace/types" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsnt="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd">
+<wsdl:definitions name="WorkspaceService" targetNamespace="http://www.globus.org/2008/03/workspace" xmlns:tns="http://www.globus.org/2008/03/workspace" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:log="http://www.globus.org/2008/03/workspace/metadata/logistics" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:vwmeta="http://www.globus.org/2008/03/workspace/metadata" xmlns:wsntw="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl" xmlns:neg="http://www.globus.org/2008/03/workspace/negotiable" xmlns:wsrlw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" xmlns:wsrpw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" xmlns:wsdlpp="http://www.globus.org/namespaces/2004/10/WSDLPreprocessor" xmlns:work-types="http://www.globus.org/2008/03/workspace/types" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsnt="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd">
<wsdl:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" location="../wsrf/lifetime/WS-ResourceLifetime.wsdl"/>
<wsdl:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" location="../wsrf/properties/WS-ResourceProperties.wsdl"/>
<wsdl:import namespace="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl" location="../wsrf/notification/WS-BaseN.wsdl"/>
<wsdl:types>
- <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.globus.org/2007/12/workspace" xmlns:rpns0="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd" xmlns:tns="http://www.globus.org/2007/12/workspace">
+ <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.globus.org/2008/03/workspace" xmlns:rpns0="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd" xmlns:tns="http://www.globus.org/2008/03/workspace">
<xs:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="../ws/addressing/WS-Addressing.xsd"/>
<xs:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd" schemaLocation="../wsrf/lifetime/WS-ResourceLifetime.xsd"/>
@@ -12,21 +12,26 @@
<xs:import namespace="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd" schemaLocation="../wsrf/notification/WS-BaseN.xsd"/>
- <xs:import namespace="http://www.globus.org/2007/12/workspace/types" schemaLocation="./workspace_types.xsd"/>
+ <xs:import namespace="http://www.globus.org/2008/03/workspace/types" schemaLocation="./workspace_types.xsd"/>
- <xs:import namespace="http://www.globus.org/2007/12/workspace/negotiable" schemaLocation="./negotiable.xsd"/>
+ <xs:import namespace="http://www.globus.org/2008/03/workspace/negotiable" schemaLocation="./negotiable.xsd"/>
+
+ <xs:import namespace="http://www.globus.org/2008/03/workspace/metadata/logistics" schemaLocation="./metadata/vw-logistics.xsd"/>
<!--==================================================-->
<!-- resource properties -->
<!--==================================================-->
+
<!-- This needs to be defined here for the topic elements
to be automatically inserted by the WSDL pre-processor
(see non-compact WSDL in common/schema) -->
<xs:element name="ServiceRPSet">
<xs:complexType>
<xs:sequence>
- <xs:element ref="neg:WorkspaceDeployment"/>
+ <xs:element ref="work-types:currentState"/>
+ <xs:element ref="work-types:schedule"/>
+ <xs:element ref="neg:ResourceAllocation"/>
<xs:element ref="log:logistics"/>
<xs:element maxOccurs="unbounded" minOccurs="1" ref="wsnt:Topic"/>
@@ -46,38 +51,42 @@
<xs:element name="startWorkspaceResponse" type="work-types:voidType"/>
- <xs:element name="shutdownWorkspace" type="work-types:shutdownEnumeration"/>
+ <xs:element name="shutdownWorkspace" type="work-types:WorkspaceShutdownRequest_Type"/>
<xs:element name="shutdownWorkspaceResponse" type="work-types:voidType"/>
</xs:schema>
</wsdl:types>
- <wsdl:message name="StartWorkspaceInputMessage">
- <wsdl:part name="parameters" element="tns:startWorkspace"/>
+ <wsdl:message name="ShutdownWorkspaceInputMessage">
+ <wsdl:part name="parameters" element="tns:shutdownWorkspace"/>
</wsdl:message>
<wsdl:message name="ShutdownFaultMessage">
<wsdl:part name="description" element="work-types:WorkspaceShutdownFault"/>
</wsdl:message>
+ <wsdl:message name="StartWorkspaceInputMessage">
+ <wsdl:part name="parameters" element="tns:startWorkspace"/>
+ </wsdl:message>
+ <wsdl:message name="UnknownFaultMessage">
+ <wsdl:part name="description" element="work-types:WorkspaceUnknownFault"/>
+ </wsdl:message>
+ <wsdl:message name="ShutdownWorkspaceOutputMessage">
+ <wsdl:part name="parameters" element="tns:shutdownWorkspaceResponse"/>
+ </wsdl:message>
<wsdl:message name="DisabledFaultMessage">
<wsdl:part name="description" element="work-types:OperationDisabledFault"/>
</wsdl:message>
<wsdl:message name="StartFaultMessage">
<wsdl:part name="description" element="work-types:WorkspaceStartFault"/>
</wsdl:message>
- <wsdl:message name="ShutdownWorkspaceInputMessage">
- <wsdl:part name="parameters" element="tns:shutdownWorkspace"/>
- </wsdl:message>
<wsdl:message name="StartWorkspaceOutputMessage">
<wsdl:part name="parameters" element="tns:startWorkspaceResponse"/>
</wsdl:message>
- <wsdl:message name="ShutdownWorkspaceOutputMessage">
- <wsdl:part name="parameters" element="tns:shutdownWorkspaceResponse"/>
- </wsdl:message>
<wsdl:portType name="WorkspacePortType" wsrp:ResourceProperties="tns:ServiceRPSet">
<wsdl:operation name="start">
<wsdl:input message="tns:StartWorkspaceInputMessage"/>
<wsdl:output message="tns:StartWorkspaceOutputMessage"/>
<wsdl:fault name="OperationDisabledFault" message="tns:DisabledFaultMessage"/>
+ <wsdl:fault name="UnknownWorkspaceFault" message="tns:UnknownFaultMessage"/>
<wsdl:fault name="WorkspaceStartFault" message="tns:StartFaultMessage"/>
</wsdl:operation>
<wsdl:operation name="shutdown">
@@ -85,6 +94,7 @@
<wsdl:output message="tns:ShutdownWorkspaceOutputMessage"/>
<wsdl:fault name="WorkspaceShutdownFault" message="tns:ShutdownFaultMessage"/>
<wsdl:fault name="OperationDisabledFault" message="tns:DisabledFaultMessage"/>
+ <wsdl:fault name="UnknownWorkspaceFault" message="tns:UnknownFaultMessage"/>
</wsdl:operation>
<wsdl:operation name="SetTerminationTime">
<wsdl:input message="wsrlw:SetTerminationTimeRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/SetTerminationTime"/>
More information about the workspace-commit
mailing list