Menu
▾
▴
[Smartfrog-checkins] core/components/cddlm/src/org/smartfrog/services/cddlm/xsd cddlm-prototype-callback.xsd,NONE,1.1 constants.xml,1.5,1.6 createJavaConstants.xsl,1.2,1.3 deployAPIschema.xsd,1.26,1.27
|
From: Steve L. <st...@us...> - 2004-10-26 16:22:20
|
Update of /cvsroot/smartfrog/core/components/cddlm/src/org/smartfrog/services/cddlm/xsd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30600/components/cddlm/src/org/smartfrog/services/cddlm/xsd Modified Files: constants.xml createJavaConstants.xsl deployAPIschema.xsd Added Files: cddlm-prototype-callback.xsd Log Message: Service API builds again. tests failing. Index: deployAPIschema.xsd =================================================================== RCS file: /cvsroot/smartfrog/core/components/cddlm/src/org/smartfrog/services/cddlm/xsd/deployAPIschema.xsd,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** deployAPIschema.xsd 19 Oct 2004 20:38:54 -0000 1.26 --- deployAPIschema.xsd 26 Oct 2004 16:21:41 -0000 1.27 *************** *** 50,98 **** </xsd:sequence> </xsd:complexType> - <!-- ============================================================= --> - <!-- BEGIN SIMPLETYPES --> - <!-- ============================================================= --> - <!-- - <xsd:simpleType name="notificationEnum"> - <xsd:annotation> - <xsd:documentation> - Enumeration of supported notification types. Any - unexpected type constitutes an error and should be - flagged. - - -ws-notification: notification via WS-N - -ws-eventing: subscriptions and notifications of WS-Eventing - -CDDLM: a non-standard direct invocation mechanism - - </xsd:documentation> - </xsd:annotation> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="http://www.ibm.com/xmlns/stdwip/web-services/WS-BaseNotification"> - <xsd:annotation> - <xsd:documentation> - Notification - </xsd:documentation> - </xsd:annotation> - </xsd:enumeration> - <xsd:enumeration value="http://schemas.xmlsoap.org/ws/2004/08/eventing"> - <xsd:annotation> - <xsd:documentation> - WS-eventing - </xsd:documentation> - </xsd:annotation> - </xsd:enumeration> - - <xsd:enumeration value="http://gridforum.org/cddlm/serviceAPI/notifications/2004/07/30"> - <xsd:annotation> - <xsd:documentation> - Direct endpoint invocation for protoyping only. - </xsd:documentation> - </xsd:annotation> - </xsd:enumeration> - - - </xsd:restriction> - </xsd:simpleType> --> <!-- ============================================================= --> <!-- lifecycle states--> --- 50,54 ---- *************** *** 196,215 **** <!-- BEGIN COMPLEXTYPES --> <!-- ============================================================= --> ! <!-- ============================================================= --> ! <!-- notification address union --> ! <!-- TODO replace with any XML --> ! <!-- ============================================================= --> ! <!-- ! <xsd:complexType name="notificationAddressType"> ! <xsd:annotation> ! <xsd:documentation> ! holder for different notification types ! </xsd:documentation> ! </xsd:annotation> ! <xsd:choice> ! <xsd:element name="uri" type="xsd:anyURI"/> ! <xsd:element name="address" type="wsa:EndpointReferenceType"/> ! </xsd:choice> ! </xsd:complexType> --> <!-- ============================================================= --> <!-- composite representation of notification enum, address and identifier --> --- 152,156 ---- <!-- BEGIN COMPLEXTYPES --> <!-- ============================================================= --> ! <!-- ============================================================= --> <!-- composite representation of notification enum, address and identifier --> *************** *** 954,957 **** --- 895,903 ---- </xsd:complexType> </xsd:element> + + <!-- ============================================================= --> + <!-- response --> + <!-- ============================================================= --> + <xsd:element name="lifecycleEventResponse" type="xsd:boolean"> <xsd:annotation> *************** *** 964,967 **** --- 910,914 ---- </xsd:annotation> </xsd:element> + <!-- ============================================================= --> <!-- end schema--> Index: constants.xml =================================================================== RCS file: /cvsroot/smartfrog/core/components/cddlm/src/org/smartfrog/services/cddlm/xsd/constants.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** constants.xml 19 Oct 2004 20:52:05 -0000 1.5 --- constants.xml 26 Oct 2004 16:21:41 -0000 1.6 *************** *** 104,118 **** </string> ! <string name="CALLBACK_WS_NOTIFICATION" value="http://www.ibm.com/xmlns/stdwip/web-services/WS-BaseNotification"> <description>name of ws-notification notification type</description> ! </string> ! <string name="CALLBACK_WS_EVENTING" value="http://schemas.xmlsoap.org/ws/2004/08/eventing"> <description>name of ws-eventing notification type</description> ! </string> ! <string name="CALLBACK_CDDLM_PROTOTYPE" value="http://gridforum.org/cddlm/serviceAPI/notifications/2004/10/11/"> <description>name of prototype-quality CDDLM notification type</description> ! </string> --- 104,118 ---- </string> ! <uri name="CALLBACK_WS_NOTIFICATION" value="http://www.ibm.com/xmlns/stdwip/web-services/WS-BaseNotification"> <description>name of ws-notification notification type</description> ! </uri> ! <uri name="CALLBACK_WS_EVENTING" value="http://schemas.xmlsoap.org/ws/2004/08/eventing"> <description>name of ws-eventing notification type</description> ! </uri> ! <uri name="CALLBACK_CDDLM_PROTOTYPE" value="http://gridforum.org/cddlm/serviceAPI/notifications/2004/10/11/"> <description>name of prototype-quality CDDLM notification type</description> ! </uri> *************** *** 141,144 **** --- 141,154 ---- </string> + <string name="CDDLM_PROTOTYPE_SUBSCRIPTION_ROOT_ELEMENT" + value="prototypeSubscriptionRequest"> + <description> element local name for prototype subscription</description> + </string> + + <string name="CDDLM_PROTOTYPE_SUBSCRIPTION_ADDRESS_ELEMENT" + value="address"> + <description> element local name for prototype subscription address</description> + </string> + <!-- --- NEW FILE: cddlm-prototype-callback.xsd --- <?xml version="1.0" encoding="UTF-8"?> <xsd:schema targetNamespace="http://gridforum.org/cddlm/serviceAPI/notifications/2004/10/11/" xmlns:types="http://gridforum.org/cddlm/serviceAPI/notifications/2004/10/11/" xmlns="http://gridforum.org/cddlm/serviceAPI/notifications/2004/10/11/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"> <!-- xmlns:jsdl="http://www.gridforum.org/JSDL" xmlns:wsbf="http://www.ibm.com/xmlns/stdwip/web-services/WS-BaseFaults" --> <!-- ============================================================= --> <xsd:annotation> <xsd:documentation> This is the XSD describing the types of the CDDLM service API Version: 0.1. This is a prototype callback for notification events The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be interpreted as described in RFC 2119. http://www.ietf.org/rfc/rfc2119.txt </xsd:documentation> </xsd:annotation> <!-- ============================================================= --> <!-- ============================================================= --> <!-- information for a subscription --> <!-- ============================================================= --> <xsd:complexType name="prototypeSubscriptionRequest"> <xsd:annotation> <xsd:documentation> Information needed to subscribe to CDDLM prototypes address: URL of endpoint </xsd:documentation> </xsd:annotation> <xsd:sequence> <xsd:element name="address" type="xsd:anyURI"/> </xsd:sequence> </xsd:complexType> </xsd:schema> Index: createJavaConstants.xsl =================================================================== RCS file: /cvsroot/smartfrog/core/components/cddlm/src/org/smartfrog/services/cddlm/xsd/createJavaConstants.xsl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** createJavaConstants.xsl 18 Oct 2004 22:15:58 -0000 1.2 --- createJavaConstants.xsl 26 Oct 2004 16:21:41 -0000 1.3 *************** *** 9,12 **** --- 9,13 ---- package org.smartfrog.services.cddlm.generated.api; import javax.xml.namespace.QName; + import org.apache.axis.types.URI; /** This file defines SOAP error codes for axis. *************** *** 103,106 **** --- 104,124 ---- <xsl:value-of select="@name"/> = "<xsl:value-of select="@value"/>"; + + /** + <xsl:value-of select="err:description"/> + */ + public static final URI URI_<xsl:value-of select="@name"/>; + //static initializer + static { + try { + URI_<xsl:value-of select="@name"/> = + new URI("<xsl:value-of select="@value"/>"); + } catch (URI.MalformedURIException e) { + throw new RuntimeException("Cannot instantiate URI_<xsl:value-of select="@name"/>"); + } + } + + + </xsl:template> <xsl:template match="err:string"> |