diff options
| author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-12-11 08:26:48 +0000 |
|---|---|---|
| committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-12-11 08:26:48 +0000 |
| commit | 1876c96e45185ec0b48d7b19b30fe29d903f5c37 (patch) | |
| tree | d2f85581f7358043eded86f828ce6cdf2266b442 /sca-java-2.x/trunk/modules/interface-wsdl/src | |
| parent | 0f4450efb862e469b071e75f4d9c85ee0f83bc6e (diff) | |
TUSCANY-3388 - Updating to the latests OASIS schema
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@889531 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/interface-wsdl/src')
7 files changed, 12 insertions, 12 deletions
diff --git a/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java b/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java index f863ff696d..76d42f2f44 100644 --- a/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java +++ b/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java @@ -46,11 +46,11 @@ import org.apache.tuscany.sca.xsd.XSDFactory; * @version $Rev$ $Date$ */ public class WSDLInterfaceIntrospectorImpl { - private static final QName POLICY_REQUIRES = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "requires"); - private static final QName POLICY_CONVERSATIONAL = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "conversational"); - public static final QName POLICY_END_CONVERSATION = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "endsConversation"); + private static final QName POLICY_REQUIRES = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200912", "requires"); + private static final QName POLICY_CONVERSATIONAL = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200912", "conversational"); + public static final QName POLICY_END_CONVERSATION = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200912", "endsConversation"); - private static final QName CALLBACK_ATTRIBUTE = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "callback" ); + private static final QName CALLBACK_ATTRIBUTE = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200912", "callback" ); private WSDLFactory wsdlFactory; private XSDFactory xsdFactory; diff --git a/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java b/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java index 3612fa7756..ba9bff164c 100644 --- a/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java +++ b/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java @@ -26,7 +26,7 @@ import javax.xml.namespace.QName; * @version $Rev$ $Date$ */ public interface WSDLConstants { - String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903"; + String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912"; String INTERFACE_WSDL = "interface.wsdl"; QName INTERFACE_WSDL_QNAME = new QName(SCA11_NS, "interface.wsdl"); String INTERFACE = "interface"; diff --git a/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java b/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java index 2b7b6f70b3..a9bd60f739 100644 --- a/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java +++ b/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java @@ -100,10 +100,10 @@ public class WSDLModelResolver implements ModelResolver { Arrays.asList(new QName[] {Q_ELEM_XSD_1999, Q_ELEM_XSD_2000, Q_ELEM_XSD_2001}); // ---- SCA Policy WSDL Attachments - public static final QName Q_POLICY_ATTRIBUTE_EXTENSION = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "requires"); - public static final QName Q_POLICY_END_CONVERSATION_ATTRIBUTE_EXTENSION = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "endsConversation"); + public static final QName Q_POLICY_ATTRIBUTE_EXTENSION = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200912", "requires"); + public static final QName Q_POLICY_END_CONVERSATION_ATTRIBUTE_EXTENSION = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200912", "endsConversation"); // ---- SCA Callback WSDL Extension - public static final QName Q_CALLBACK_ATTRIBUTE_EXTENSION = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "callback" ); + public static final QName Q_CALLBACK_ATTRIBUTE_EXTENSION = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200912", "callback" ); // ---- BPEL extension elements --- Mike Edwards 01/05/2008 public static final String ELEM_PLINKTYPE = "partnerLinkType"; diff --git a/sca-java-2.x/trunk/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/trunk/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor index 08fa2b7474..68da288a8c 100644 --- a/sca-java-2.x/trunk/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor +++ b/sca-java-2.x/trunk/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor @@ -16,5 +16,5 @@ # under the License. # Implementation class for the artifact processor extension -org.apache.tuscany.sca.interfacedef.wsdl.xml.WSDLInterfaceProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#interface.wsdl,model=org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract +org.apache.tuscany.sca.interfacedef.wsdl.xml.WSDLInterfaceProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#interface.wsdl,model=org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract diff --git a/sca-java-2.x/trunk/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite b/sca-java-2.x/trunk/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite index fcdf69594b..a71e0a55f8 100644 --- a/sca-java-2.x/trunk/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite +++ b/sca-java-2.x/trunk/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:calc="http://sample.calculator" targetNamespace="http://calc" xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance" diff --git a/sca-java-2.x/trunk/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType b/sca-java-2.x/trunk/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType index 35052dfd6d..eaf8d1b8ee 100644 --- a/sca-java-2.x/trunk/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType +++ b/sca-java-2.x/trunk/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" +<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"> <service name="CalculatorService"> diff --git a/sca-java-2.x/trunk/modules/interface-wsdl/src/test/resources/policy/stockquote_policy.wsdl b/sca-java-2.x/trunk/modules/interface-wsdl/src/test/resources/policy/stockquote_policy.wsdl index 813d9e8291..86cbe39af9 100644 --- a/sca-java-2.x/trunk/modules/interface-wsdl/src/test/resources/policy/stockquote_policy.wsdl +++ b/sca-java-2.x/trunk/modules/interface-wsdl/src/test/resources/policy/stockquote_policy.wsdl @@ -21,7 +21,7 @@ targetNamespace="http://example.com/stockquote.wsdl" xmlns:tns="http://example.com/stockquote.wsdl" xmlns:xsd="http://example.com/stockquote.xsd" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" + xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns="http://schemas.xmlsoap.org/wsdl/"> <types> |