epp-rtk-commits

[Daniel M. <tub...@us...>]

Update of /cvsroot/epp-rtk/epp-rtk/idl
In directory usw-pr-cvs1:/tmp/cvs-serv21805

Modified Files:
	epp.idl 
Log Message:
first take at updates to the main EPP IDL for EPP 0604


Index: epp.idl
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/idl/epp.idl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** epp.idl	29 May 2002 11:15:00 -0000	1.16
--- epp.idl	12 Aug 2002 21:59:36 -0000	1.17
***************
*** 78,95 ****
      {
          ALL,
!         NO_ACCESS,
          NULL_ACCESS,
!         SOCIAL,
!         TECHNICAL
      };
      enum epp_dcpPurposeType
      {
          CONTACT,
-         DN_REG,
-         IP_REG,
          // have to qualify "other" here because it conflicted with
          // "other" from epp_dcpRecipientType
          OTHER_PURPOSE,
!         TM_REG
      };
      enum epp_dcpRecipientType
--- 78,95 ----
      {
          ALL,
!         NONE,
          NULL_ACCESS,
!         OTHER,
!         PERSONAL,
!         PERSONAL_AND_OTHER
      };
      enum epp_dcpPurposeType
      {
+         ADMIN,
          CONTACT,
          // have to qualify "other" here because it conflicted with
          // "other" from epp_dcpRecipientType
          OTHER_PURPOSE,
!         PROV
      };
      enum epp_dcpRecipientType
***************
*** 98,101 ****
--- 98,102 ----
          // "other" from epp_dcpPurposeType
          OTHER_RECIPIENT,
+         // OURS requires additional m_ours_type to be set
          OURS,
          // could not use the spelling "public" because
***************
*** 108,120 ****
      {
          BUSINESS,
-         FUNCTIONAL,
          INDEFINITE,
          LEGAL,
!         NONE
      };
  
      // Sequences for the DCP types
      typedef sequence<epp_dcpPurposeType> epp_dcpPurpose_seq;
-     typedef sequence<epp_dcpRecipientType> epp_dcpRecipient_seq;
  
      //
--- 109,126 ----
      {
          BUSINESS,
          INDEFINITE,
          LEGAL,
!         RETENTION_NONE,
!         STATED
      };
  
+     enum epp_dcpExpiryType
+     {
+         ABSOLUTE,
+         RELATIVE
+     };
+     
      // Sequences for the DCP types
      typedef sequence<epp_dcpPurposeType> epp_dcpPurpose_seq;
  
      //
***************
*** 124,127 ****
--- 130,134 ----
      typedef string epp_xml_string;
      typedef sequence<epp_string> epp_string_seq;
+     typedef sequence<epp_xml_string> epp_xml_string_seq;
      typedef short epp_short;
      typedef long epp_long;
***************
*** 170,182 ****
      };
      
      struct epp_Result
      {
          epp_short m_code;
!         epp_string_seq m_values;
          // Maybe these three should be part of
          // an epp_Msg or something
          epp_string m_msg;
          epp_string m_lang;
-         epp_string m_id;
          epp_ResultData m_data;
      };
--- 177,207 ----
      };
      
+     struct epp_ResultValue
+     {
+         // Can be null/empty if the XML is not parsable.
+         epp_string m_namespace;
+         // The xml string provided within the <value> element
+         // This should simply be the contents of the <value>
+         // element if the XML is unparsable.
+         epp_xml_string m_xml_string;
+         // The offending element's tag name
+         // Can be null/empty if the XML is not parsable.
+         epp_string m_element_name;
+         // The actual value of the offending tag.
+         // This should simply be the contents of the <value>
+         // element if the XML is unparsable.
+         epp_string m_element_value;
+     };
+     
+     typedef sequence<epp_ResultValue> epp_resultvalue_seq;
+     
      struct epp_Result
      {
          epp_short m_code;
!         epp_resultvalue_seq m_values;
          // Maybe these three should be part of
          // an epp_Msg or something
          epp_string m_msg;
          epp_string m_lang;
          epp_ResultData m_data;
      };
***************
*** 205,209 ****
          epp_result_seq m_details;
          epp_TransID m_trans_id;
!         epp_xml_string m_ext_string;
      };
  
--- 230,235 ----
          epp_result_seq m_details;
          epp_TransID m_trans_id;
!         // Multiple extentions allows in EPP
!         epp_xml_string_seq m_ext_strings;
      };
  
***************
*** 223,231 ****
          void fromXML(in epp_string xml) raises (epp_XMLException);
      };
      
      struct epp_Command
      {
          epp_Credentials m_creds;
!         epp_Extension m_ext;
          epp_trid m_client_trid;
      };
--- 249,258 ----
          void fromXML(in epp_string xml) raises (epp_XMLException);
      };
+     typedef sequence<epp_Extension> epp_extension_seq;
      
      struct epp_Command
      {
          epp_Credentials m_creds;
!         epp_extension_seq m_extentions;
          epp_trid m_client_trid;
      };
***************
*** 241,244 ****
--- 268,274 ----
          epp_long m_count;
          epp_datetime m_queue_date;
+         epp_string m_msg;
+         // XXX should this be an epp_long?
+         epp_string m_id;
      };
  
***************
*** 248,257 ****
          epp_MessageQueue m_message_queue;
          // Because of the difficulty in having the RTK
!         // instantiate the right epp_Extension, this extension
!         // will be an XML String.  The registrar will
!         // have to separately call fromXML() on the
!         // String with the appropriate object they are
!         // expecting back from the registry.
!         epp_xml_string m_ext_string;
          epp_TransID m_trans_id;
      };
--- 278,288 ----
          epp_MessageQueue m_message_queue;
          // Because of the difficulty in having the RTK
!         // instantiate the right epp_Extension, these 
!         // extensions will be an XML String.  The 
!         // registrar will have to separately call 
!         // fromXML() on the individual strings with the
!         // appropriate object they are expecting back from 
!         // the registry.
!         epp_xml_string_seq m_ext_strings;
          epp_TransID m_trans_id;
      };
***************
*** 298,301 ****
--- 329,341 ----
      };
      
+     struct epp_dcpRecipient
+     {
+         epp_dcpRecipientType m_type;
+         // m_rec_desc is only required if m_type
+         // is OURS
+         epp_string m_rec_desc;
+     };
+     typedef sequence<epp_dcpRecipient> epp_dcpRecipient_seq;
+ 
      struct epp_dcpStatement
      {
***************
*** 307,314 ****
--- 347,361 ----
      typedef sequence<epp_dcpStatement> epp_dcpStatement_seq;
      
+     struct epp_dcpExpiry
+     {
+         epp_dcpExpiryType m_type;
+         epp_string m_value;
+     };
+     
      struct epp_DataCollectionPolicy
      {
          epp_dcpAccessType m_access;
          epp_dcpStatement_seq m_statements;
+         epp_dcpExpiry m_expiry;
      };
      
***************
*** 352,356 ****
      struct epp_LogoutReq
      {
!         epp_Extension m_ext;
          epp_trid m_client_trid;
      };
--- 399,403 ----
      struct epp_LogoutReq
      {
!         epp_extension_seq m_extentions;
          epp_trid m_client_trid;
      };