You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/02/17 12:36:54 UTC

[34/70] [abbrv] incubator-taverna-common-activities git commit: taverna-wsdl-activity/

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/77704689/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/WS-BaseN.xsd
----------------------------------------------------------------------
diff --git a/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/WS-BaseN.xsd b/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/WS-BaseN.xsd
deleted file mode 100644
index 9bdf6ae..0000000
--- a/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/WS-BaseN.xsd
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><xsd:schema targetNamespace="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd" elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:wsnt="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd">
-  <!--======================== Imports  ============================-->
-  <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="WS-Addressing.xsd"/>
-  <xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" schemaLocation="WS-ResourceProperties.xsd"/>
-  <!--========== Message Types for NotificationProducer  ===========-->
-  <xsd:element name="Subscribe">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="ConsumerReference" type="wsa:EndpointReferenceType" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="TopicExpression" type="wsnt:TopicExpressionType" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="UseNotify" type="xsd:boolean" default="true" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="Precondition" type="wsrp:QueryExpressionType" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="Selector" type="wsrp:QueryExpressionType" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="SubscriptionPolicy" type="xsd:anyType" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="InitialTerminationTime" type="xsd:dateTime" minOccurs="0" maxOccurs="1"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <!--================= Topic Expression Container =================-->
-  <xsd:complexType name="TopicExpressionType" mixed="true">
-    <xsd:sequence>
-      <xsd:any minOccurs="0" maxOccurs="1" processContents="lax"/>
-    </xsd:sequence>
-    <xsd:attribute name="Dialect" type="xsd:anyURI"/>
-  </xsd:complexType>
-  <xsd:element name="TopicExpression" type="wsnt:TopicExpressionType"/>
-  <!--=============== Resource Property Related  ===================-->
-  <!--======== Resource Properties for NotificationProducer ========-->
-  <xsd:element name="Topic" type="wsnt:TopicExpressionType"/>
-  <xsd:element name="FixedTopicSet" type="xsd:boolean"/>
-  <xsd:element name="TopicExpressionDialects" type="xsd:anyURI"/>
-  <!--======== Resource Properties for SubscriptionManager =========-->
-  <xsd:element name="ConsumerReference" type="wsa:EndpointReferenceType"/>
-  <xsd:element name="UseNotify" type="xsd:boolean"/>
-  <xsd:element name="Precondition" type="wsrp:QueryExpressionType"/>
-  <xsd:element name="Selector" type="wsrp:QueryExpressionType"/>
-  <xsd:element name="SubscriptionPolicy" type="xsd:anyType"/>
-  <xsd:element name="CreationTime" type="xsd:dateTime"/>
-</xsd:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/77704689/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/WS-ResourceLifetime.wsdl
----------------------------------------------------------------------
diff --git a/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/WS-ResourceLifetime.wsdl b/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/WS-ResourceLifetime.wsdl
deleted file mode 100644
index 3d81ce5..0000000
--- a/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/WS-ResourceLifetime.wsdl
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><wsdl:definitions name="WS-ResourceLifetime" targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsrl="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd" xmlns:wsrlw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addr
 essing" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd" attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns="http://www.w3.org/2001/XMLSchema">
-      <xsd:include schemaLocation="WS-ResourceLifetime.xsd"/>
-      <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="WS-Addressing.xsd"/>
-      <xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" schemaLocation="WS-BaseFaults.xsd"/>
-      <!--==== Resource Properties for ScheduledResourceTermination ====-->
-      <xsd:element name="ScheduledResourceTerminationRP">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element maxOccurs="1" minOccurs="1" ref="wsrl:CurrentTime"/>
-            <xsd:element maxOccurs="1" minOccurs="1" ref="wsrl:TerminationTime"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <!--====== Message Types for ImmediateResourceTermination  =======-->
-      <xsd:element name="Destroy">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:element name="DestroyResponse">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:complexType name="ResourceUnknownFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="ResourceUnknownFault" type="wsrl:ResourceUnknownFaultType"/>
-      <xsd:complexType name="ResourceNotDestroyedFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="ResourceNotDestroyedFault" type="wsrl:ResourceNotDestroyedFaultType"/>
-      <!--====== Message Types for ScheduledResourceTermination  =======-->
-      <xsd:element name="SetTerminationTime">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="RequestedTerminationTime" nillable="true" type="xsd:dateTime"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="SetTerminationTimeResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="NewTerminationTime" nillable="true" type="xsd:dateTime"/>
-            <xsd:element name="CurrentTime" type="xsd:dateTime"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:complexType name="UnableToSetTerminationTimeFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="UnableToSetTerminationTimeFault" type="wsrl:UnableToSetTerminationTimeFaultType"/>
-      <xsd:complexType name="TerminationTimeChangeRejectedFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="TerminationTimeChangeRejectedFault" type="wsrl:TerminationTimeChangeRejectedFaultType"/>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="DestroyResponse">
-    <wsdl:part element="wsrl:DestroyResponse" name="DestroyResponse"/>
-  </wsdl:message>
-  <wsdl:message name="SetTerminationTimeRequest">
-    <wsdl:part element="wsrl:SetTerminationTime" name="SetTerminationTimeRequest"/>
-  </wsdl:message>
-  <wsdl:message name="ResourceUnknownFault">
-    <wsdl:part element="wsrl:ResourceUnknownFault" name="ResourceUnknownFault"/>
-  </wsdl:message>
-  <wsdl:message name="DestroyRequest">
-    <wsdl:part element="wsrl:Destroy" name="DestroyRequest"/>
-  </wsdl:message>
-  <wsdl:message name="UnableToSetTerminationTimeFault">
-    <wsdl:part element="wsrl:UnableToSetTerminationTimeFault" name="UnableToSetTerminationTimeFault"/>
-  </wsdl:message>
-  <wsdl:message name="SetTerminationTimeResponse">
-    <wsdl:part element="wsrl:SetTerminationTimeResponse" name="SetTerminationTimeResponse"/>
-  </wsdl:message>
-  <wsdl:message name="ResourceNotDestroyedFault">
-    <wsdl:part element="wsrl:ResourceNotDestroyedFault" name="ResourceNotDestroyedFault"/>
-  </wsdl:message>
-  <wsdl:message name="TerminationTimeChangeRejectedFault">
-    <wsdl:part element="wsrl:TerminationTimeChangeRejectedFault" name="TerminationTimeChangeRejectedFault"/>
-  </wsdl:message>
-  <wsdl:portType name="ScheduledResourceTermination" wsrp:ResourceProperties="wsrl:ScheduledResourceTerminationRP">
-    <wsdl:operation name="SetTerminationTime">
-      <wsdl:input message="wsrlw:SetTerminationTimeRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/SetTerminationTime"/>
-      <wsdl:output message="wsrlw:SetTerminationTimeResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/SetTerminationTimeResponse"/>
-      <wsdl:fault message="wsrlw:UnableToSetTerminationTimeFault" name="UnableToSetTerminationTimeFault"/>
-      <wsdl:fault message="wsrlw:ResourceUnknownFault" name="ResourceUnknownFault"/>
-      <wsdl:fault message="wsrlw:TerminationTimeChangeRejectedFault" name="TerminationTimeChangeRejectedFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="ImmediateResourceTermination">
-    <wsdl:operation name="Destroy">
-      <wsdl:input message="wsrlw:DestroyRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/Destroy"/>
-      <wsdl:output message="wsrlw:DestroyResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/DestroyResponse"/>
-      <wsdl:fault message="wsrlw:ResourceNotDestroyedFault" name="ResourceNotDestroyedFault"/>
-      <wsdl:fault message="wsrlw:ResourceUnknownFault" name="ResourceUnknownFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/77704689/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/WS-ResourceLifetime.xsd
----------------------------------------------------------------------
diff --git a/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/WS-ResourceLifetime.xsd b/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/WS-ResourceLifetime.xsd
deleted file mode 100644
index a6dbef7..0000000
--- a/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/WS-ResourceLifetime.xsd
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><xsd:schema elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsrl="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd">
-  <!--=============== Resource Property Related  ===================-->
-  <!--==== Resource Properties for ScheduledResourceTermination ====-->
-  <xsd:element name="CurrentTime" type="xsd:dateTime"/>
-  <xsd:element name="TerminationTime" nillable="true" type="xsd:dateTime"/>
-  <!--============= Notification Message Related  ==================-->
-  <xsd:element name="TerminationNotification">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="TerminationTime" type="xsd:dateTime" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="TerminationReason" type="xsd:anyType" minOccurs="0" maxOccurs="1"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-</xsd:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/77704689/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/WS-ResourceProperties.wsdl
----------------------------------------------------------------------
diff --git a/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/WS-ResourceProperties.wsdl b/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/WS-ResourceProperties.wsdl
deleted file mode 100644
index 267066a..0000000
--- a/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/WS-ResourceProperties.wsdl
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><wsdl:definitions name="WS-ResourceProperties" targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 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" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:wsrpw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl">
-  <!--===================== Types Definitions ======================-->
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" elementFormDefault="qualified" attributeFormDefault="unqualified">
-      <xsd:include schemaLocation="WS-ResourceProperties.xsd"/>
-      <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="WS-Addressing.xsd"/>
-      <xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" schemaLocation="WS-BaseFaults.xsd"/>
-      <!--========== Message Types for GetResourceProperty  ============-->
-      <xsd:element name="GetResourceProperty" type="xsd:QName"/>
-      <xsd:element name="GetResourcePropertyResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:any minOccurs="0" maxOccurs="unbounded"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:complexType name="ResourceUnknownFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="ResourceUnknownFault" type="wsrp:ResourceUnknownFaultType"/>
-      <xsd:complexType name="InvalidResourcePropertyQNameFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="InvalidResourcePropertyQNameFault" type="wsrp:InvalidResourcePropertyQNameFaultType"/>
-      <!--====== Message Types for GetMultipleResourceProperties =======-->
-      <xsd:element name="GetMultipleResourceProperties">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="ResourceProperty" type="xsd:QName" minOccurs="1" maxOccurs="unbounded"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="GetMultipleResourcePropertiesResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:any minOccurs="0" maxOccurs="unbounded"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <!--========= Message Types for SetResourceProperties ===========-->
-      <xsd:complexType name="InsertType">
-        <xsd:sequence>
-          <xsd:any processContents="lax" minOccurs="1" maxOccurs="unbounded"/>
-        </xsd:sequence>
-      </xsd:complexType>
-      <xsd:element name="Insert" type="wsrp:InsertType"/>
-      <xsd:complexType name="UpdateType">
-        <xsd:sequence>
-          <xsd:any processContents="lax" minOccurs="1" maxOccurs="unbounded"/>
-        </xsd:sequence>
-      </xsd:complexType>
-      <xsd:element name="Update" type="wsrp:UpdateType"/>
-      <xsd:complexType name="DeleteType">
-        <xsd:attribute name="ResourceProperty" type="xsd:QName" use="required"/>
-      </xsd:complexType>
-      <xsd:element name="Delete" type="wsrp:DeleteType"/>
-      <xsd:element name="SetResourceProperties">
-        <xsd:complexType>
-          <xsd:choice minOccurs="0" maxOccurs="unbounded">
-            <xsd:element ref="wsrp:Insert"/>
-            <xsd:element ref="wsrp:Update"/>
-            <xsd:element ref="wsrp:Delete"/>
-          </xsd:choice>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="SetResourcePropertiesResponse">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:complexType name="InvalidSetResourcePropertiesRequestContentFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="InvalidSetResourcePropertiesRequestContentFault" type="wsrp:InvalidSetResourcePropertiesRequestContentFaultType"/>
-      <xsd:complexType name="UnableToModifyResourcePropertyFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="UnableToModifyResourcePropertyFault" type="wsrp:UnableToModifyResourcePropertyFaultType"/>
-      <xsd:complexType name="SetResourcePropertyRequestFailedFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="SetResourcePropertyRequestFailedFault" type="wsrp:SetResourcePropertyRequestFailedFaultType"/>
-      <!--========= Message Types for QueryResourceProperties ==========-->
-      <xsd:element name="QueryResourceProperties">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element ref="wsrp:QueryExpression" minOccurs="1" maxOccurs="1"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="QueryResourcePropertiesResponse">
-        <xsd:complexType mixed="true">
-          <xsd:sequence>
-            <xsd:any processContents="lax" minOccurs="1" maxOccurs="unbounded"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:complexType name="UnknownQueryExpressionDialectFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="UnknownQueryExpressionDialectFault" type="wsrp:UnknownQueryExpressionDialectFaultType"/>
-      <xsd:complexType name="InvalidQueryExpressionFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="InvalidQueryExpressionFault" type="wsrp:InvalidQueryExpressionFaultType"/>
-      <xsd:complexType name="QueryEvaluationErrorFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="QueryEvaluationErrorFault" type="wsrp:QueryEvaluationErrorFaultType"/>
-    </xsd:schema>
-  </wsdl:types>
-  <!--===================== GetResourceProperty ==================== 
-  GetResourceProperty(QName)
-  returns: any-->
-  <wsdl:message name="GetResourcePropertyRequest">
-    <wsdl:part name="GetResourcePropertyRequest" element="wsrp:GetResourceProperty"/>
-  </wsdl:message>
-  <wsdl:message name="GetResourcePropertyResponse">
-    <wsdl:part name="GetResourcePropertyResponse" element="wsrp:GetResourcePropertyResponse"/>
-  </wsdl:message>
-  <wsdl:message name="ResourceUnknownFault">
-    <part name="ResourceUnknownFault" element="wsrp:ResourceUnknownFault"/>
-  </wsdl:message>
-  <wsdl:message name="InvalidResourcePropertyQNameFault">
-    <part name="InvalidResourcePropertyQNameFault" element="wsrp:InvalidResourcePropertyQNameFault"/>
-  </wsdl:message>
-  <!--==============GetMultipleResourceProperties ================== 
-  GetMultipleResourceProperties(list of QName)
-  returns: sequence of any-->
-  <wsdl:message name="GetMultipleResourcePropertiesRequest">
-    <wsdl:part name="GetMultipleResourcePropertiesRequest" element="wsrp:GetMultipleResourceProperties"/>
-  </wsdl:message>
-  <wsdl:message name="GetMultipleResourcePropertiesResponse">
-    <wsdl:part name="GetMultipleResourcePropertiesResponse" element="wsrp:GetMultipleResourcePropertiesResponse"/>
-  </wsdl:message>
-  <!--================= SetResourceProperties ====================== 
-  SetResourceProperties(
-  { insert (any)* |
-    update (any)* |
-    delete@QName } + 
-  )
-  returns: empty-->
-  <wsdl:message name="SetResourcePropertiesRequest">
-    <wsdl:part name="SetResourcePropertiesRequest" element="wsrp:SetResourceProperties"/>
-  </wsdl:message>
-  <wsdl:message name="SetResourcePropertiesResponse">
-    <wsdl:part name="SetResourcePropertiesResponse" element="wsrp:SetResourcePropertiesResponse"/>
-  </wsdl:message>
-  <wsdl:message name="InvalidSetResourcePropertiesRequestContentFault">
-    <part name="InvalidSetResourcePropertiesRequestContentFault" element="wsrp:InvalidSetResourcePropertiesRequestContentFault"/>
-  </wsdl:message>
-  <wsdl:message name="UnableToModifyResourcePropertyFault">
-    <part name="UnableToModifyResourcePropertyFault" element="wsrp:UnableToModifyResourcePropertyFault"/>
-  </wsdl:message>
-  <wsdl:message name="SetResourcePropertyRequestFailedFault">
-    <part name="SetResourcePropertyRequestFailedFault" element="wsrp:SetResourcePropertyRequestFailedFault"/>
-  </wsdl:message>
-  <!--================ QueryResourceProperties ===================== 
-  QueryResourceProperties(QueryExpression)
-  returns: any-->
-  <wsdl:message name="QueryResourcePropertiesRequest">
-    <wsdl:part name="QueryResourcePropertiesRequest" element="wsrp:QueryResourceProperties"/>
-  </wsdl:message>
-  <wsdl:message name="QueryResourcePropertiesResponse">
-    <wsdl:part name="QueryResourcePropertiesResponse" element="wsrp:QueryResourcePropertiesResponse"/>
-  </wsdl:message>
-  <wsdl:message name="UnknownQueryExpressionDialectFault">
-    <part name="UnknownQueryExpressionDialectFault" element="wsrp:UnknownQueryExpressionDialectFault"/>
-  </wsdl:message>
-  <wsdl:message name="InvalidQueryExpressionFault">
-    <part name="InvalidQueryExpressionFault" element="wsrp:InvalidQueryExpressionFault"/>
-  </wsdl:message>
-  <wsdl:message name="QueryEvaluationErrorFault">
-    <part name="QueryEvaluationErrorFault" element="wsrp:QueryEvaluationErrorFault"/>
-  </wsdl:message>
-  <!--=================== PortType Definitions =====================-->
-  <wsdl:portType name="GetResourceProperty">
-    <wsdl:operation name="GetResourceProperty">
-      <wsdl:input name="GetResourcePropertyRequest" message="wsrpw:GetResourcePropertyRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourceProperty"/>
-      <wsdl:output name="GetResourcePropertyResponse" message="wsrpw:GetResourcePropertyResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourcePropertyResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="GetMultipleResourceProperties">
-    <wsdl:operation name="GetMultipleResourceProperties">
-      <wsdl:input name="GetMultipleResourcePropertiesRequest" message="wsrpw:GetMultipleResourcePropertiesRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetMultipleResourceProperties"/>
-      <wsdl:output name="GetMultipleResourcePropertiesResponse" message="wsrpw:GetMultipleResourcePropertiesResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetMultipleResourcePropertiesResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="SetResourceProperties">
-    <wsdl:operation name="SetResourceProperties">
-      <wsdl:input name="SetResourcePropertiesRequest" message="wsrpw:SetResourcePropertiesRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/SetResourceProperties"/>
-      <wsdl:output name="SetResourcePropertiesResponse" message="wsrpw:SetResourcePropertiesResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/SetResourcePropertiesResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidSetResourcePropertiesRequestContentFault" message="wsrpw:InvalidSetResourcePropertiesRequestContentFault"/>
-      <wsdl:fault name="UnableToModifyResourcePropertyFault" message="wsrpw:UnableToModifyResourcePropertyFault"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-      <wsdl:fault name="SetResourcePropertyRequestFailedFault" message="wsrpw:SetResourcePropertyRequestFailedFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="QueryResourceProperties">
-    <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"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-      <wsdl:fault name="UnknownQueryExpressionDialectFault" message="wsrpw:UnknownQueryExpressionDialectFault"/>
-      <wsdl:fault name="InvalidQueryExpressionFault" message="wsrpw:InvalidQueryExpressionFault"/>
-      <wsdl:fault name="QueryEvaluationErrorFault" message="wsrpw:QueryEvaluationErrorFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/77704689/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/WS-ResourceProperties.xsd
----------------------------------------------------------------------
diff --git a/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/WS-ResourceProperties.xsd b/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/WS-ResourceProperties.xsd
deleted file mode 100644
index 1527149..0000000
--- a/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/WS-ResourceProperties.xsd
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><xsd:schema elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <!--======= Global Attribute Declaration for WSDL 1.1 portType====-->
-  <xsd:attribute name="ResourceProperties" type="xsd:QName"/>
-  <!--= Notification Message for ResourceProperties value change ===-->
-  <xsd:complexType name="ResourcePropertyValueChangeNotificationType">
-    <xsd:sequence>
-      <xsd:element name="OldValue" nillable="true" minOccurs="0" maxOccurs="1">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:any minOccurs="1" maxOccurs="1"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="NewValue" nillable="true" minOccurs="1" maxOccurs="1">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:any minOccurs="1" maxOccurs="1"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:element name="ResourcePropertyValueChangeNotification" type="wsrp:ResourcePropertyValueChangeNotificationType"/>
-  <xsd:complexType name="QueryExpressionType" mixed="true">
-    <xsd:sequence>
-      <xsd:any minOccurs="0" maxOccurs="1" processContents="lax"/>
-    </xsd:sequence>
-    <xsd:attribute name="Dialect" type="xsd:anyURI"/>
-  </xsd:complexType>
-  <xsd:element name="QueryExpression" type="wsrp:QueryExpressionType"/>
-</xsd:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/77704689/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/counter_bindings.wsdl
----------------------------------------------------------------------
diff --git a/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/counter_bindings.wsdl b/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/counter_bindings.wsdl
deleted file mode 100644
index 8acf07f..0000000
--- a/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/counter_bindings.wsdl
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="Counter" targetNamespace="http://counter.com/bindings" xmlns:porttype="http://counter.com" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:import namespace="http://counter.com" location="counter_flattened.wsdl"/>
-  <wsdl:binding name="CounterPortTypeSOAPBinding" type="porttype:CounterPortType">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="createCounter">
-      <soap:operation soapAction="http://counter.com/CounterPortType/createCounterRequest"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="add">
-      <soap:operation soapAction="http://counter.com/CounterPortType/addRequest"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="SetTerminationTime">
-      <soap:operation soapAction="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/SetTerminationTime"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="UnableToSetTerminationTimeFault">
-        <soap:fault name="UnableToSetTerminationTimeFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="ResourceUnknownFault">
-        <soap:fault name="ResourceUnknownFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="TerminationTimeChangeRejectedFault">
-        <soap:fault name="TerminationTimeChangeRejectedFault" 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"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="ResourceNotDestroyedFault">
-        <soap:fault name="ResourceNotDestroyedFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="ResourceUnknownFault">
-        <soap:fault name="ResourceUnknownFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="QueryResourceProperties">
-      <soap:operation soapAction="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/QueryResourceProperties"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault">
-        <soap:fault name="InvalidResourcePropertyQNameFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="InvalidQueryExpressionFault">
-        <soap:fault name="InvalidQueryExpressionFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="QueryEvaluationErrorFault">
-        <soap:fault name="QueryEvaluationErrorFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="ResourceUnknownFault">
-        <soap:fault name="ResourceUnknownFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="UnknownQueryExpressionDialectFault">
-        <soap:fault name="UnknownQueryExpressionDialectFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="GetMultipleResourceProperties">
-      <soap:operation soapAction="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetMultipleResourceProperties"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault">
-        <soap:fault name="InvalidResourcePropertyQNameFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="ResourceUnknownFault">
-        <soap:fault name="ResourceUnknownFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="GetResourceProperty">
-      <soap:operation soapAction="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourceProperty"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault">
-        <soap:fault name="InvalidResourcePropertyQNameFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="ResourceUnknownFault">
-        <soap:fault name="ResourceUnknownFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="Subscribe">
-      <soap:operation soapAction="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/Subscribe"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="TopicNotSupportedFault">
-        <soap:fault name="TopicNotSupportedFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="InvalidTopicExpressionFault">
-        <soap:fault name="InvalidTopicExpressionFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="SubscribeCreationFailedFault">
-        <soap:fault name="SubscribeCreationFailedFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="ResourceUnknownFault">
-        <soap:fault name="ResourceUnknownFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="TopicPathDialectUnknownFault">
-        <soap:fault name="TopicPathDialectUnknownFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="GetCurrentMessage">
-      <soap:operation soapAction="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/GetCurrentMessage"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="TopicNotSupportedFault">
-        <soap:fault name="TopicNotSupportedFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="InvalidTopicExpressionFault">
-        <soap:fault name="InvalidTopicExpressionFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="NoCurrentMessageOnTopicFault">
-        <soap:fault name="NoCurrentMessageOnTopicFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="ResourceUnknownFault">
-        <soap:fault name="ResourceUnknownFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-  </wsdl:binding>
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/77704689/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/counter_flattened.wsdl
----------------------------------------------------------------------
diff --git a/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/counter_flattened.wsdl b/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/counter_flattened.wsdl
deleted file mode 100644
index cd5de52..0000000
--- a/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/counter_flattened.wsdl
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="Counter" targetNamespace="http://counter.com" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:tns="http://counter.com" xmlns:wsrpw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" 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:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsntw="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="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="WS-ResourceLifetime.wsdl"/>
-  <wsdl:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" location="WS-ResourceProperties.wsdl"/>
-  <wsdl:import namespace="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl" location="WS-BaseN.wsdl"/>
-  <wsdl:types>
-    <xsd:schema elementFormDefault="qualified" targetNamespace="http://counter.com" xmlns:rpns0="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd" xmlns:rpns1="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd">
-      <xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd" schemaLocation="WS-ResourceLifetime.xsd"/>
-      <xsd:import namespace="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd" schemaLocation="WS-BaseN.xsd"/>
-      <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="WS-Addressing.xsd"/>
-      <xsd:element name="createCounter">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:element name="createCounterResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element ref="wsa:EndpointReference"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="add" type="xsd:int"/>
-      <xsd:element name="addResponse" type="xsd:int"/>
-      <xsd:element name="Value" type="xsd:int"/>
-      <xsd:element name="CounterRP">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element maxOccurs="1" minOccurs="1" ref="tns:Value"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="1" ref="rpns0:Topic"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="1" ref="rpns0:TopicExpressionDialects"/>
-            <xsd:element maxOccurs="1" minOccurs="1" ref="rpns1:TerminationTime"/>
-            <xsd:element maxOccurs="1" minOccurs="1" ref="rpns1:CurrentTime"/>
-            <xsd:element maxOccurs="1" minOccurs="1" ref="rpns0:FixedTopicSet"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="AddInputMessage">
-    <wsdl:part name="parameters" element="tns:add"/>
-  </wsdl:message>
-  <wsdl:message name="AddOutputMessage">
-    <wsdl:part name="parameters" element="tns:addResponse"/>
-  </wsdl:message>
-  <wsdl:message name="CreateCounterResponse">
-    <wsdl:part name="response" element="tns:createCounterResponse"/>
-  </wsdl:message>
-  <wsdl:message name="CreateCounterRequest">
-    <wsdl:part name="request" element="tns:createCounter"/>
-  </wsdl:message>
-  <wsdl:portType name="CounterPortType" wsrp:ResourceProperties="tns:CounterRP">
-    <wsdl:operation name="createCounter">
-      <wsdl:input message="tns:CreateCounterRequest"/>
-      <wsdl:output message="tns:CreateCounterResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="add">
-      <wsdl:input message="tns:AddInputMessage"/>
-      <wsdl:output message="tns:AddOutputMessage"/>
-    </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"/>
-      <wsdl:output message="wsrlw:SetTerminationTimeResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/SetTerminationTimeResponse"/>
-      <wsdl:fault name="UnableToSetTerminationTimeFault" message="wsrlw:UnableToSetTerminationTimeFault"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrlw:ResourceUnknownFault"/>
-      <wsdl:fault name="TerminationTimeChangeRejectedFault" message="wsrlw:TerminationTimeChangeRejectedFault"/>
-    </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"/>
-      <wsdl:output message="wsrlw:DestroyResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/DestroyResponse"/>
-      <wsdl:fault name="ResourceNotDestroyedFault" message="wsrlw:ResourceNotDestroyedFault"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrlw:ResourceUnknownFault"/>
-    </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"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-      <wsdl:fault name="InvalidQueryExpressionFault" message="wsrpw:InvalidQueryExpressionFault"/>
-      <wsdl:fault name="QueryEvaluationErrorFault" message="wsrpw:QueryEvaluationErrorFault"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="UnknownQueryExpressionDialectFault" message="wsrpw:UnknownQueryExpressionDialectFault"/>
-    </wsdl:operation>
-    <wsdl:operation name="GetMultipleResourceProperties">
-      <wsdl:input name="GetMultipleResourcePropertiesRequest" message="wsrpw:GetMultipleResourcePropertiesRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetMultipleResourceProperties"/>
-      <wsdl:output name="GetMultipleResourcePropertiesResponse" message="wsrpw:GetMultipleResourcePropertiesResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetMultipleResourcePropertiesResponse"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-    </wsdl:operation>
-    <wsdl:operation name="GetResourceProperty">
-      <wsdl:input name="GetResourcePropertyRequest" message="wsrpw:GetResourcePropertyRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourceProperty"/>
-      <wsdl:output name="GetResourcePropertyResponse" message="wsrpw:GetResourcePropertyResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourcePropertyResponse"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-    </wsdl:operation>
-    <wsdl:operation name="Subscribe">
-      <wsdl:input message="wsntw:SubscribeRequest" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/Subscribe"/>
-      <wsdl:output message="wsntw:SubscribeResponse" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/SubscribeResponse"/>
-      <wsdl:fault name="TopicNotSupportedFault" message="wsntw:TopicNotSupportedFault"/>
-      <wsdl:fault name="InvalidTopicExpressionFault" message="wsntw:InvalidTopicExpressionFault"/>
-      <wsdl:fault name="SubscribeCreationFailedFault" message="wsntw:SubscribeCreationFailedFault"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsntw:ResourceUnknownFault"/>
-      <wsdl:fault name="TopicPathDialectUnknownFault" message="wsntw:TopicPathDialectUnknownFault"/>
-    </wsdl:operation>
-    <wsdl:operation name="GetCurrentMessage">
-      <wsdl:input message="wsntw:GetCurrentMessageRequest" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/GetCurrentMessage"/>
-      <wsdl:output message="wsntw:GetCurrentMessageResponse" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/GetCurrentMessageResponse"/>
-      <wsdl:fault name="TopicNotSupportedFault" message="wsntw:TopicNotSupportedFault"/>
-      <wsdl:fault name="InvalidTopicExpressionFault" message="wsntw:InvalidTopicExpressionFault"/>
-      <wsdl:fault name="NoCurrentMessageOnTopicFault" message="wsntw:NoCurrentMessageOnTopicFault"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsntw:ResourceUnknownFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/77704689/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/xml.xsd
----------------------------------------------------------------------
diff --git a/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/xml.xsd b/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/xml.xsd
deleted file mode 100644
index 730b4c9..0000000
--- a/src/test/resources/net/sf/taverna/t2/activities/wsdl/wsrf/counterService/xml.xsd
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xml:lang="en" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:annotation>
-    <xs:documentation>See http://www.w3.org/XML/1998/namespace.html and
-   http://www.w3.org/TR/REC-xml for information about this namespace.
-
-    This schema document describes the XML namespace, in a form
-    suitable for import by other schema documents.  
-
-    Note that local names in this namespace are intended to be defined
-    only by the World Wide Web Consortium or its subgroups.  The
-    following names are currently defined in this namespace and should
-    not be used with conflicting semantics by any Working Group,
-    specification, or document instance:
-
-    base (as an attribute name): denotes an attribute whose value
-         provides a URI to be used as the base for interpreting any
-         relative URIs in the scope of the element on which it
-         appears; its value is inherited.  This name is reserved
-         by virtue of its definition in the XML Base specification.
-
-    lang (as an attribute name): denotes an attribute whose value
-         is a language code for the natural language of the content of
-         any element; its value is inherited.  This name is reserved
-         by virtue of its definition in the XML specification.
-  
-    space (as an attribute name): denotes an attribute whose
-         value is a keyword indicating what whitespace processing
-         discipline is intended for the content of the element; its
-         value is inherited.  This name is reserved by virtue of its
-         definition in the XML specification.
-
-    Father (in any context at all): denotes Jon Bosak, the chair of 
-         the original XML Working Group.  This name is reserved by 
-         the following decision of the W3C XML Plenary and 
-         XML Coordination groups:
-
-             In appreciation for his vision, leadership and dedication
-             the W3C XML Plenary on this 10th day of February, 2000
-             reserves for Jon Bosak in perpetuity the XML name
-             xml:Father</xs:documentation>
-  </xs:annotation>
-  <xs:annotation>
-    <xs:documentation>This schema defines attributes and an attribute group
-        suitable for use by
-        schemas wishing to allow xml:base, xml:lang or xml:space attributes
-        on elements they define.
-
-        To enable this, such a schema must import this schema
-        for the XML namespace, e.g. as follows:
-        &lt;schema . . .>
-         . . .
-         &lt;import namespace="http://www.w3.org/XML/1998/namespace"
-                    schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>
-
-        Subsequently, qualified reference to any of the attributes
-        or the group defined below will have the desired effect, e.g.
-
-        &lt;type . . .>
-         . . .
-         &lt;attributeGroup ref="xml:specialAttrs"/>
- 
-         will define a type which will schema-validate an instance
-         element with any of those attributes</xs:documentation>
-  </xs:annotation>
-  <xs:annotation>
-    <xs:documentation>In keeping with the XML Schema WG's standard versioning
-   policy, this schema document will persist at
-   http://www.w3.org/2001/03/xml.xsd.
-   At the date of issue it can also be found at
-   http://www.w3.org/2001/xml.xsd.
-   The schema document at that URI may however change in the future,
-   in order to remain compatible with the latest version of XML Schema
-   itself.  In other words, if the XML Schema namespace changes, the version
-   of this document at
-   http://www.w3.org/2001/xml.xsd will change
-   accordingly; the version at
-   http://www.w3.org/2001/03/xml.xsd will not change.</xs:documentation>
-  </xs:annotation>
-  <xs:attribute name="lang" type="xs:language">
-    <xs:annotation>
-      <xs:documentation>In due course, we should install the relevant ISO 2- and 3-letter
-         codes as the enumerated possible values . . .</xs:documentation>
-    </xs:annotation>
-  </xs:attribute>
-  <xs:attribute name="space" default="preserve">
-    <xs:simpleType>
-      <xs:restriction base="xs:NCName">
-        <xs:enumeration value="default"/>
-        <xs:enumeration value="preserve"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:attribute>
-  <xs:attribute name="base" type="xs:anyURI">
-    <xs:annotation>
-      <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
-                     information about this attribute.</xs:documentation>
-    </xs:annotation>
-  </xs:attribute>
-  <xs:attributeGroup name="specialAttrs">
-    <xs:attribute ref="xml:base"/>
-    <xs:attribute ref="xml:lang"/>
-    <xs:attribute ref="xml:space"/>
-  </xs:attributeGroup>
-</xs:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/77704689/taverna-wsdl-activity/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/pom.xml b/taverna-wsdl-activity/pom.xml
new file mode 100644
index 0000000..7af8cf8
--- /dev/null
+++ b/taverna-wsdl-activity/pom.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>taverna-parent</artifactId>
+		<groupId>net.sf.taverna</groupId>
+		<version>3.0.1-SNAPSHOT</version>
+	</parent>
+	<groupId>net.sf.taverna.t2.activities</groupId>
+	<artifactId>wsdl-activity</artifactId>
+	<version>2.0.1-SNAPSHOT</version>
+	<packaging>bundle</packaging>
+	<name>Taverna 2 WSDL Activity</name>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<!-- Use the java version instead of xmlcommons for javax.* packages -->
+						<Import-Package>javax.xml.namespace;version="0.0.0",javax.xml.parsers;version="0.0.0",org.w3c.dom;version="0.0.0",org.xml.sax;version="0.0.0",*</Import-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>net.sf.taverna.t2.core</groupId>
+			<artifactId>workflowmodel-api</artifactId>
+			<version>${t2.core.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sf.taverna.t2.core</groupId>
+			<artifactId>reference-api</artifactId>
+			<version>${t2.core.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sf.taverna</groupId>
+			<artifactId>wsdl-generic</artifactId>
+			<version>${wsdl.generic.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sf.taverna.t2.security</groupId>
+			<artifactId>credential-manager</artifactId>
+			<version>${t2.security.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jdom</groupId>
+			<artifactId>com.springsource.org.jdom</artifactId>
+			<version>${jdom.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.ws</groupId>
+			<artifactId>com.springsource.org.apache.ws.security</artifactId>
+			<version>${ws.security.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.xml</groupId>
+			<artifactId>com.springsource.org.apache.xml.security</artifactId>
+			<version>${xml.security.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.log4j</groupId>
+			<artifactId>com.springsource.org.apache.log4j</artifactId>
+			<version>${log4j.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.2.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>net.sf.taverna.t2.activities</groupId>
+			<artifactId>activity-test-utils</artifactId>
+			<version>${t2.activities.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>net.sf.taverna.t2.core</groupId>
+			<artifactId>workflowmodel-impl</artifactId>
+			<version>${t2.core.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<repositories>
+		<repository>
+			<releases />
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+			<id>mygrid-repository</id>
+			<name>myGrid Repository</name>
+			<url>http://www.mygrid.org.uk/maven/repository</url>
+		</repository>
+		<repository>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots />
+			<id>mygrid-snapshot-repository</id>
+			<name>myGrid Snapshot Repository</name>
+			<url>http://www.mygrid.org.uk/maven/snapshot-repository</url>
+		</repository>
+	</repositories>
+
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/77704689/taverna-wsdl-activity/src/main/java/net/sf/taverna/t2/activities/wsdl/InputPortTypeDescriptorActivity.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/main/java/net/sf/taverna/t2/activities/wsdl/InputPortTypeDescriptorActivity.java b/taverna-wsdl-activity/src/main/java/net/sf/taverna/t2/activities/wsdl/InputPortTypeDescriptorActivity.java
new file mode 100644
index 0000000..c153722
--- /dev/null
+++ b/taverna-wsdl-activity/src/main/java/net/sf/taverna/t2/activities/wsdl/InputPortTypeDescriptorActivity.java
@@ -0,0 +1,57 @@
+package net.sf.taverna.t2.activities.wsdl;
+
+import java.io.IOException;
+import java.util.Map;
+
+import net.sf.taverna.t2.activities.wsdl.xmlsplitter.XMLInputSplitterActivity;
+import net.sf.taverna.wsdl.parser.TypeDescriptor;
+import net.sf.taverna.wsdl.parser.UnknownOperationException;
+
+/**
+ * Interface for an activity such as {@link WSDLActivity} and
+ * {@link XMLInputSplitterActivity} that can provide {@link TypeDescriptor}s for
+ * its inputs.
+ *
+ * @author Stian Soiland-Reyes
+ *
+ * @param <ActivityBeanType> The configuration bean type of the activity
+ */
+public interface InputPortTypeDescriptorActivity {
+
+	/**
+	 * Provides access to the TypeDescriptor for a given input port name.
+	 * <br>
+	 * This TypeDescriptor represents the Type defined in the schema for this Activities
+	 * WSDL.
+	 *
+	 * @param portName
+	 * @return the TypeDescriptor, or null if the portName is not recognised.
+	 * @throws UnknownOperationException if the operation this Activity is associated with doesn't exist.
+	 * @throws IOException
+	 *
+	 * @see TypeDescriptor
+	 * @see #getTypeDescriptorsForInputPorts()
+	 * @see #getTypeDescriptorForOutputPort(String)
+	 */
+	public abstract TypeDescriptor getTypeDescriptorForInputPort(String portName)
+			throws UnknownOperationException, IOException;
+
+	/**
+	 * Return TypeDescriptor for a all input ports.
+	 * <p>
+	 * This TypeDescriptor represents the Type defined in the schema for this Activities
+	 * WSDL.
+	 *
+	 * @param portName
+	 * @return A {@link Map} from portname to {@link TypeDescriptor}
+	 * @throws UnknownOperationException if the operation this Activity is associated with doesn't exist.
+	 * @throws IOException If the WSDL or some of its dependencies could not be read
+	 *
+	 * @see TypeDescriptor
+	 * @see #getTypeDescriptorForInputPort(String)
+	 * @see #getTypeDescriptorsForOutputPorts()
+	 */
+	public abstract Map<String, TypeDescriptor> getTypeDescriptorsForInputPorts()
+			throws UnknownOperationException, IOException;
+
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/77704689/taverna-wsdl-activity/src/main/java/net/sf/taverna/t2/activities/wsdl/OutputPortTypeDescriptorActivity.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/main/java/net/sf/taverna/t2/activities/wsdl/OutputPortTypeDescriptorActivity.java b/taverna-wsdl-activity/src/main/java/net/sf/taverna/t2/activities/wsdl/OutputPortTypeDescriptorActivity.java
new file mode 100644
index 0000000..23a235c
--- /dev/null
+++ b/taverna-wsdl-activity/src/main/java/net/sf/taverna/t2/activities/wsdl/OutputPortTypeDescriptorActivity.java
@@ -0,0 +1,57 @@
+package net.sf.taverna.t2.activities.wsdl;
+
+import java.io.IOException;
+import java.util.Map;
+
+import net.sf.taverna.t2.activities.wsdl.xmlsplitter.XMLOutputSplitterActivity;
+import net.sf.taverna.wsdl.parser.TypeDescriptor;
+import net.sf.taverna.wsdl.parser.UnknownOperationException;
+
+/**
+ * Interface for an activity such as {@link WSDLActivity} and
+ * {@link XMLOutputSplitterActivity} that can provide {@link TypeDescriptor}s for
+ * it's outputs.
+ *
+ * @author Stian Soiland-Reyes
+ *
+ * @param <ActivityBeanType> The configuration bean type of the activity
+ */
+public interface OutputPortTypeDescriptorActivity {
+
+	/**
+	 * Provides access to the TypeDescriptor for a given output port name.
+	 * <br>
+	 * This TypeDescriptor represents the Type defined in the schema for this Activities
+	 * WSDL.
+	 *
+	 * @param portName
+	 * @return the TypeDescriptor, or null if the portName is not recognised.
+	 * @throws UnknownOperationException if the operation this Activity is associated with doesn't exist.
+	 * @throws IOException
+	 *
+	 * @see TypeDescriptor
+	 * @see #getTypeDescriptorsForOutputPorts()
+	 * @see #getTypeDescriptorForInputPort(String)
+	 */
+	public abstract TypeDescriptor getTypeDescriptorForOutputPort(
+			String portName) throws UnknownOperationException, IOException;
+
+	/**
+	 * Return TypeDescriptor for a all output ports.
+	 * <p>
+	 * This TypeDescriptor represents the Type defined in the schema for this Activities
+	 * WSDL.
+	 *
+	 * @param portName
+	 * @return A {@link Map} from portname to {@link TypeDescriptor}
+	 * @throws UnknownOperationException if the operation this Activity is associated with doesn't exist.
+	 * @throws IOException If the WSDL or some of its dependencies could not be read
+	 *
+	 * @see TypeDescriptor
+	 * @see #getTypeDescriptorForOutputPort(String)
+	 * @see #getTypeDescriptorsForInputPorts()
+	 */
+	public abstract Map<String, TypeDescriptor> getTypeDescriptorsForOutputPorts()
+			throws UnknownOperationException, IOException;
+
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/77704689/taverna-wsdl-activity/src/main/java/net/sf/taverna/t2/activities/wsdl/T2WSDLSOAPInvoker.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/main/java/net/sf/taverna/t2/activities/wsdl/T2WSDLSOAPInvoker.java b/taverna-wsdl-activity/src/main/java/net/sf/taverna/t2/activities/wsdl/T2WSDLSOAPInvoker.java
new file mode 100644
index 0000000..1e9d1a5
--- /dev/null
+++ b/taverna-wsdl-activity/src/main/java/net/sf/taverna/t2/activities/wsdl/T2WSDLSOAPInvoker.java
@@ -0,0 +1,282 @@
+/*******************************************************************************
+ * Copyright (C) 2007 The University of Manchester
+ *
+ *  Modifications to the initial code base are copyright of their
+ *  respective authors, or their employers as appropriate.
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1 of
+ *  the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ ******************************************************************************/
+
+package net.sf.taverna.t2.activities.wsdl;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import net.sf.taverna.t2.activities.wsdl.security.SecurityProfiles;
+import net.sf.taverna.t2.security.credentialmanager.CMException;
+import net.sf.taverna.t2.security.credentialmanager.CredentialManager;
+import net.sf.taverna.t2.security.credentialmanager.UsernamePassword;
+import net.sf.taverna.wsdl.parser.WSDLParser;
+import net.sf.taverna.wsdl.soap.WSDLSOAPInvoker;
+
+import org.apache.axis.AxisProperties;
+import org.apache.axis.EngineConfiguration;
+import org.apache.axis.MessageContext;
+import org.apache.axis.client.Call;
+import org.apache.axis.configuration.XMLStringProvider;
+import org.apache.axis.message.SOAPHeaderElement;
+import org.apache.log4j.Logger;
+import org.jdom.Document;
+import org.jdom.Element;
+import org.jdom.JDOMException;
+import org.jdom.Namespace;
+import org.jdom.input.SAXBuilder;
+import org.jdom.output.DOMOutputter;
+
+import com.fasterxml.jackson.databind.JsonNode;
+
+/**
+ * Invokes SOAP based Web Services from T2.
+ *
+ * Subclasses WSDLSOAPInvoker used for invoking Web Services from Taverna 1.x
+ * and extends it to provide support for invoking secure Web services.
+ *
+ * @author Stuart Owen
+ * @author Alex Nenadic
+ * @author Stian Soiland-Reyes
+ *
+ */
+public class T2WSDLSOAPInvoker extends WSDLSOAPInvoker {
+
+	private static final String REFERENCE_PROPERTIES = "ReferenceProperties";
+	private static final String ENDPOINT_REFERENCE = "EndpointReference";
+	private static Logger logger = Logger.getLogger(T2WSDLSOAPInvoker.class);
+	private static final Namespace wsaNS = Namespace.getNamespace("wsa",
+			"http://schemas.xmlsoap.org/ws/2004/03/addressing");
+
+	private String wsrfEndpointReference = null;
+
+	private CredentialManager credentialManager;
+
+	public T2WSDLSOAPInvoker(WSDLParser parser, String operationName,
+			List<String> outputNames, CredentialManager credentialManager) {
+		super(parser, operationName, outputNames);
+		this.credentialManager = credentialManager;
+	}
+
+	public T2WSDLSOAPInvoker(WSDLParser parser, String operationName,
+			List<String> outputNames, String wsrfEndpointReference, CredentialManager credentialManager) {
+		this(parser, operationName, outputNames, credentialManager);
+		this.wsrfEndpointReference = wsrfEndpointReference;
+	}
+
+	@SuppressWarnings("unchecked")
+	protected void addEndpointReferenceHeaders(
+			List<SOAPHeaderElement> soapHeaders) {
+		// Extract elements
+		// Add WSA-stuff
+		// Add elements
+
+		Document wsrfDoc;
+		try {
+			wsrfDoc = parseWsrfEndpointReference(wsrfEndpointReference);
+		} catch (JDOMException e) {
+			logger.warn("Could not parse endpoint reference, ignoring:\n"
+					+ wsrfEndpointReference, e);
+			return;
+		} catch (IOException e) {
+			logger.error("Could not read endpoint reference, ignoring:\n"
+					+ wsrfEndpointReference, e);
+			return;
+		}
+
+		Element endpointRefElem = null;
+		Element wsrfRoot = wsrfDoc.getRootElement();
+		if (wsrfRoot.getNamespace().equals(wsaNS)
+				&& wsrfRoot.getName().equals(ENDPOINT_REFERENCE)) {
+			endpointRefElem = wsrfRoot;
+		} else {
+			// Only look for child if the parent is not an EPR
+			Element childEndpoint = wsrfRoot
+					.getChild(ENDPOINT_REFERENCE, wsaNS);
+			if (childEndpoint != null) {
+				// Support wrapped endpoint reference for backward compatibility
+				// and convenience (T2-677)
+				endpointRefElem = childEndpoint;
+			} else {
+				logger
+						.warn("Unexpected element name for endpoint reference, but inserting anyway: "
+								+ wsrfRoot.getQualifiedName());
+				endpointRefElem = wsrfRoot;
+			}
+		}
+
+		Element refPropsElem = endpointRefElem.getChild(REFERENCE_PROPERTIES,
+				wsaNS);
+		if (refPropsElem == null) {
+			logger.warn("Could not find " + REFERENCE_PROPERTIES);
+			return;
+		}
+
+		List<Element> refProps = refPropsElem.getChildren();
+		// Make a copy of the list as it would be modified by
+		// prop.detach();
+		for (Element prop : new ArrayList<Element>(refProps)) {
+			DOMOutputter domOutputter = new DOMOutputter();
+			SOAPHeaderElement soapElem;
+			prop.detach();
+			try {
+				org.w3c.dom.Document domDoc = domOutputter.output(new Document(
+						prop));
+				soapElem = new SOAPHeaderElement(domDoc.getDocumentElement());
+			} catch (JDOMException e) {
+				logger.warn(
+						"Could not translate wsrf element to DOM:\n" + prop, e);
+				continue;
+			}
+			soapElem.setMustUnderstand(false);
+			soapElem.setActor(null);
+			soapHeaders.add(soapElem);
+		}
+
+		// soapHeaders.add(new SOAPHeaderElement((Element) wsrfDoc
+		// .getDocumentElement()));
+	}
+
+	protected void configureSecurity(Call call, JsonNode bean) throws Exception {
+
+		// If security settings require WS-Security - configure the axis call
+		// with appropriate properties
+		URI securityProfile = new URI(bean.get("securityProfile").textValue());
+		if (securityProfile
+				.equals(SecurityProfiles.WSSECURITY_USERNAMETOKEN_PLAINTEXTPASSWORD)
+				|| securityProfile
+						.equals(SecurityProfiles.WSSECURITY_USERNAMETOKEN_DIGESTPASSWORD)
+				|| securityProfile
+						.equals(SecurityProfiles.WSSECURITY_TIMESTAMP_USERNAMETOKEN_PLAINTEXTPASSWORD)
+				|| securityProfile
+						.equals(SecurityProfiles.WSSECURITY_TIMESTAMP_USERNAMETOKEN_DIGESTPASSWORD)) {
+			
+			UsernamePassword usernamePassword = getUsernameAndPasswordForService(bean, false);
+			call.setProperty(Call.USERNAME_PROPERTY, usernamePassword.getUsername());
+			call.setProperty(Call.PASSWORD_PROPERTY, usernamePassword.getPasswordAsString());
+			usernamePassword.resetPassword();
+		} else if (securityProfile.equals(SecurityProfiles.HTTP_BASIC_AUTHN)){
+			// Basic HTTP AuthN - set HTTP headers
+			// pathrecursion allowed
+			UsernamePassword usernamePassword = getUsernameAndPasswordForService(bean, true);
+			MessageContext context = call.getMessageContext();
+			context.setUsername(usernamePassword.getUsername());
+			context.setPassword(usernamePassword.getPasswordAsString());
+			usernamePassword.resetPassword();
+		} else {
+			logger.error("Unknown security profile " + securityProfile);
+		}
+	}
+
+	/**
+	 * Get username and password from Credential Manager or ask user to supply
+	 * one. Username is the first element of the returned array, and the
+	 * password is the second.
+	 */
+	protected UsernamePassword getUsernameAndPasswordForService(
+			JsonNode bean, boolean usePathRecursion) throws CMException {
+
+		// Try to get username and password for this service from Credential
+		// Manager (which should pop up UI if needed)
+		URI serviceUri = URI.create(bean.get("operation").get("wsdl").textValue());
+		UsernamePassword username_password = credentialManager.getUsernameAndPasswordForService(serviceUri, usePathRecursion, null);
+		if (username_password == null) {
+			throw new CMException("No username/password provided for service " + serviceUri);
+		}
+		return username_password;
+	}
+
+	@Override
+	protected List<SOAPHeaderElement> makeSoapHeaders() {
+		List<SOAPHeaderElement> soapHeaders = new ArrayList<SOAPHeaderElement>(
+				super.makeSoapHeaders());
+		if (wsrfEndpointReference != null && getParser().isWsrfService()) {
+			addEndpointReferenceHeaders(soapHeaders);
+		}
+		return soapHeaders;
+	}
+
+	protected org.jdom.Document parseWsrfEndpointReference(
+			String wsrfEndpointReference) throws JDOMException, IOException {
+		SAXBuilder builder = new SAXBuilder();
+		return builder.build(new StringReader(wsrfEndpointReference));
+	}
+
+	public Map<String, Object> invoke(Map<String, Object> inputMap,
+			JsonNode bean) throws Exception {
+
+		EngineConfiguration wssEngineConfiguration = null;
+		if (bean.has("securityProfile")) {
+			URI securityProfile = new URI(bean.get("securityProfile").textValue());
+
+			// If security settings require WS-Security and not just e.g. Basic HTTP
+			// AuthN - configure the axis engine from the appropriate config strings
+			if (securityProfile
+					.equals(SecurityProfiles.WSSECURITY_USERNAMETOKEN_PLAINTEXTPASSWORD)) {
+				wssEngineConfiguration = new XMLStringProvider(
+						SecurityProfiles.WSSECURITY_USERNAMETOKEN_PLAINTEXTPASSWORD_CONFIG);
+			} else if (securityProfile
+					.equals(SecurityProfiles.WSSECURITY_USERNAMETOKEN_DIGESTPASSWORD)) {
+				wssEngineConfiguration = new XMLStringProvider(
+						SecurityProfiles.WSSECURITY_USERNAMETOKEN_DIGESTPASSWORD_CONFIG);
+			} else if (securityProfile
+					.equals(SecurityProfiles.WSSECURITY_TIMESTAMP_USERNAMETOKEN_PLAINTEXTPASSWORD)) {
+				wssEngineConfiguration = new XMLStringProvider(
+						SecurityProfiles.WSSECURITY_TIMESTAMP_USERNAMETOKEN_PLAINTETPASSWORD_CONFIG);
+			} else if (securityProfile
+					.equals(SecurityProfiles.WSSECURITY_TIMESTAMP_USERNAMETOKEN_DIGESTPASSWORD)) {
+				wssEngineConfiguration = new XMLStringProvider(
+						SecurityProfiles.WSSECURITY_TIMESTAMP_USERNAMETOKEN_DIGESTPASSWORD_CONFIG);
+			}
+		}
+
+		// This does not work
+//		ClassUtils.setClassLoader("net.sf.taverna.t2.activities.wsdl.security.TavernaAxisCustomSSLSocketFactory",TavernaAxisCustomSSLSocketFactory.class.getClassLoader());
+
+		// Setting Axis property only works when we also set the Thread's classloader as below
+		// (we do it from the net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke.requestRun())
+//		Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
+		if (AxisProperties.getProperty("axis.socketSecureFactory")== null || !AxisProperties.getProperty("axis.socketSecureFactory").equals("net.sf.taverna.t2.activities.wsdl.security.TavernaAxisCustomSSLSocketFactory")){
+			AxisProperties.setProperty("axis.socketSecureFactory", "net.sf.taverna.t2.activities.wsdl.security.TavernaAxisCustomSSLSocketFactory");
+			logger.info("Setting axis.socketSecureFactory property to " + AxisProperties.getProperty("axis.socketSecureFactory"));
+		}
+
+		// This also does not work
+		//AxisProperties.setClassDefault(SecureSocketFactory.class, "net.sf.taverna.t2.activities.wsdl.security.TavernaAxisCustomSSLSocketFactory");
+
+		Call call = super.getCall(wssEngineConfiguration);
+		
+		// Now that we have an axis Call object, configure any additional
+		// security properties on it (or its message context or its Transport
+		// handler),
+		// such as WS-Security UsernameToken or HTTP Basic AuthN
+		if (bean.has("securityProfile")) {
+			configureSecurity(call, bean);
+		}
+
+		return invoke(inputMap, call);
+	}
+
+}