You can subscribe to this list here.
2002 |
Jan
|
Feb
(44) |
Mar
(51) |
Apr
(11) |
May
(5) |
Jun
(1) |
Jul
(19) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2003 |
Jan
(3) |
Feb
|
Mar
|
Apr
(24) |
May
(37) |
Jun
(23) |
Jul
(14) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(17) |
2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
2005 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(6) |
Oct
(3) |
Nov
|
Dec
|
2007 |
Jan
|
Feb
(1) |
Mar
(3) |
Apr
|
May
(1) |
Jun
|
Jul
(2) |
Aug
(1) |
Sep
|
Oct
|
Nov
(7) |
Dec
|
From: Daniel M. <tub...@us...> - 2003-05-28 19:54:20
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src/data In directory sc8-pr-cvs1:/tmp/cvs-serv17411 Modified Files: epp_eppXMLbase.cc Log Message: completed parsing of the <value> element in the results Index: epp_eppXMLbase.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_eppXMLbase.cc,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** epp_eppXMLbase.cc 27 May 2003 22:16:41 -0000 1.24 --- epp_eppXMLbase.cc 28 May 2003 19:54:16 -0000 1.25 *************** *** 489,502 **** } - // DANDAN - // XXX Have to finish this epp_ResultValue resvalue; ! resvalue.m_xml_string.ref(new epp_string(resultChildNode->getNodeData())); result.m_values->push_back(resvalue); - // cout << "value: " << value << endl; - } // if "value" resultChildNode = dom_ptr(resultChildNode->getNextSiblingElement()); } // while "resultChildNode" --- 489,515 ---- } epp_ResultValue resvalue; ! EPP_output value_xml; ! DomPrint dp(value_xml); ! dp.putDOMTree(dom_ptr(resultChildNode->getFirstChildElement())); ! string xml_string = value_xml.getString(); ! string::size_type lastNotWhite = xml_string.find_last_not_of(" \t\r\n"); ! if(lastNotWhite != (xml_string.length()-1) && lastNotWhite != 0) { ! xml_string.erase(lastNotWhite+1, xml_string.length()); ! } ! resvalue.m_xml_string.ref(new epp_string(xml_string)); ! dom_ptr value_child = dom_ptr(resultChildNode->getFirstChildElement()); ! if ( ! value_child->isNull() ) { ! resvalue.m_namespace.ref(new epp_string(value_child->getNamespaceURI())); ! resvalue.m_element_name.ref(new epp_string(value_child->getNodeName())); ! resvalue.m_element_value.ref(new epp_string(value_child->getNodeData())); ! } result.m_values->push_back(resvalue); } // if "value" + // DANDAN + // FIXME -- have to parse the extValue elements + resultChildNode = dom_ptr(resultChildNode->getNextSiblingElement()); } // while "resultChildNode" |
From: Daniel M. <tub...@us...> - 2003-05-27 22:16:45
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src/data In directory sc8-pr-cvs1:/tmp/cvs-serv4002/data Modified Files: epp_eppXMLbase.cc Log Message: fixed the authInfo tag creation Index: epp_eppXMLbase.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_eppXMLbase.cc,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** epp_eppXMLbase.cc 27 May 2003 19:38:22 -0000 1.23 --- epp_eppXMLbase.cc 27 May 2003 22:16:41 -0000 1.24 *************** *** 188,198 **** outputobject.beginTag(tag); - if(element->m_type != NULL) { - map<epp_AuthInfoType, string> authInfoMap; - authInfoMap[PW] = "pw"; - - outputobject.putAttribute("type", authInfoMap[*element->m_type]); - } - if(element->m_roid != NULL) { outputobject.putAttribute("roid", *element->m_roid); --- 188,191 ---- *************** *** 200,204 **** if(element->m_value != NULL) { ! outputobject.putCDATA(*element->m_value); } --- 193,208 ---- if(element->m_value != NULL) { ! ! if(element->m_type != NULL) { ! map<epp_AuthInfoType, string> authInfoMap; ! authInfoMap[PW] = "pw"; ! authInfoMap[EXT] = "ext"; ! ! // FIXME -- ugly hack to get the namespace from the wrapping tag ! unsigned int namespace_location = tag.find(":"); ! string namespace_str = tag.substr(0, namespace_location+1); // include the ":" ! outputobject.putTag(namespace_str + authInfoMap[*element->m_type],*element->m_value); ! } ! } |
From: Daniel M. <tub...@us...> - 2003-05-27 22:14:02
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src/data In directory sc8-pr-cvs1:/tmp/cvs-serv32112/data Modified Files: epp_ContactCreateReq.h epp_ContactNameAddress.h epp_contactXMLbase.cc epp_contactXMLbase.h epp_contactdata.h Log Message: upgraded contact data parts to use <contact:postalInfo> with "type" attribute and new m_addresses data member -- deprecated old m_ascii_address and m_i15d_address members : Modified Files: : data/epp_ContactCreateReq.h data/epp_ContactNameAddress.h : data/epp_contactXMLbase.cc data/epp_contactXMLbase.h : data/epp_contactdata.h Index: epp_ContactCreateReq.h =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_ContactCreateReq.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** epp_ContactCreateReq.h 17 Jul 2002 13:18:47 -0000 1.11 --- epp_ContactCreateReq.h 27 May 2003 22:05:13 -0000 1.12 *************** *** 29,32 **** --- 29,34 ---- #define __EPP_CONTACTCREATEREQ_H + /* $Header$ */ + /** @file epp_ContactCreateReq.h * @brief Definition of epp_ContactCreateReq and epp_ContactCreateReq_ref *************** *** 48,53 **** public: eppobject::epp::epp_string_ref m_id; /**< Desired server-unique identifier for the contact to be created */ ! epp_ContactNameAddress_ref m_ascii_address; /**< Address element, using the 7-bit US-ASCII character set */ ! epp_ContactNameAddress_ref m_i15d_address; /**< Internationalized address element, using unrestricted UTF-8 */ epp_ContactPhone_ref m_voice; /**< Voice telephone number of contact */ epp_ContactPhone_ref m_fax; /**< Facsimile telephone number of contact */ --- 50,56 ---- public: eppobject::epp::epp_string_ref m_id; /**< Desired server-unique identifier for the contact to be created */ ! epp_ContactNameAddress_seq_ref m_addresses; /**< Address elements, has both localized and internationalize */ ! epp_ContactNameAddress_ref m_ascii_address; /**< deprecated: Address element, using the 7-bit US-ASCII character set */ ! epp_ContactNameAddress_ref m_i15d_address; /**< deprecated: Internationalized address element, using unrestricted UTF-8 */ epp_ContactPhone_ref m_voice; /**< Voice telephone number of contact */ epp_ContactPhone_ref m_fax; /**< Facsimile telephone number of contact */ *************** *** 101,104 **** --- 104,147 ---- m_auth_info = _m_auth_info; }; + + + /// Constructor, using simple types when it can + /// @note Cannot set simple types to NULL + epp_ContactCreateReq(const eppobject::epp::epp_Command_ref & _m_cmd, + const eppobject::epp::epp_string & _m_id, + const epp_ContactNameAddress_seq_ref & _m_addresses, + const epp_ContactPhone_ref & _m_voice, + const epp_ContactPhone_ref & _m_fax, + const eppobject::epp::epp_string & _m_email, + const eppobject::epp::epp_AuthInfo_ref & _m_auth_info) + : epp::epp_GenericReq(_m_cmd) + { + m_id.ref(new eppobject::epp::epp_string(_m_id)); + m_addresses = _m_addresses; + m_voice = _m_voice; + m_fax = _m_fax; + m_email.ref(new eppobject::epp::epp_string(_m_email)); + m_auth_info = _m_auth_info; + }; + + /// Constructor, using only references + epp_ContactCreateReq(const eppobject::epp::epp_Command_ref & _m_cmd, + const eppobject::epp::epp_string_ref & _m_id, + const epp_ContactNameAddress_seq_ref & _m_addresses, + const epp_ContactPhone_ref & _m_voice, + const epp_ContactPhone_ref & _m_fax, + const eppobject::epp::epp_string_ref & _m_email, + const eppobject::epp::epp_AuthInfo_ref & _m_auth_info) + : epp::epp_GenericReq(_m_cmd) + { + m_id = _m_id; + m_addresses = _m_addresses; + m_voice = _m_voice; + m_fax = _m_fax; + m_email = _m_email; + m_auth_info = _m_auth_info; + }; + + }; Index: epp_ContactNameAddress.h =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_ContactNameAddress.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** epp_ContactNameAddress.h 17 Jul 2002 13:18:47 -0000 1.8 --- epp_ContactNameAddress.h 27 May 2003 22:05:13 -0000 1.9 *************** *** 29,32 **** --- 29,34 ---- #define __EPP_CONTACTNAMEADDRESS_H + /* $Header$ */ + /** @file epp_ContactNameAddress.h * @brief Definition of epp_ContactNameAddress and epp_ContactNameAddress_ref *************** *** 46,49 **** --- 48,52 ---- eppobject::epp::epp_string_ref m_org; /**< Organization associated with the contact */ epp_ContactAddress_ref m_address; /**< Address associated with the contact */ + epp_ContactPostalInfoType_ref m_type; /** The type of the address: INTernationalize or LOCalized */ /// Null constructor *************** *** 57,65 **** epp_ContactNameAddress(const eppobject::epp::epp_string & _m_name, const eppobject::epp::epp_string & _m_org, ! const epp_ContactAddress_ref & _m_address) { m_name.ref(new eppobject::epp::epp_string(_m_name)); m_org.ref(new eppobject::epp::epp_string(_m_org)); m_address = _m_address; }; --- 60,70 ---- epp_ContactNameAddress(const eppobject::epp::epp_string & _m_name, const eppobject::epp::epp_string & _m_org, ! const epp_ContactAddress_ref & _m_address, ! const epp_ContactPostalInfoType & _m_type = INT) { m_name.ref(new eppobject::epp::epp_string(_m_name)); m_org.ref(new eppobject::epp::epp_string(_m_org)); m_address = _m_address; + m_type.ref(new epp_ContactPostalInfoType(_m_type)); }; *************** *** 67,75 **** epp_ContactNameAddress(const eppobject::epp::epp_string_ref & _m_name, const eppobject::epp::epp_string_ref & _m_org, ! const epp_ContactAddress_ref & _m_address) { m_name = _m_name; m_org = _m_org; m_address = _m_address; }; }; --- 72,82 ---- epp_ContactNameAddress(const eppobject::epp::epp_string_ref & _m_name, const eppobject::epp::epp_string_ref & _m_org, ! const epp_ContactAddress_ref & _m_address, ! const epp_ContactPostalInfoType_ref & _m_type = NULL) { m_name = _m_name; m_org = _m_org; m_address = _m_address; + m_type = _m_type; }; }; *************** *** 77,80 **** --- 84,89 ---- /// Typedef for the ref to the epp_ContactNameAddress class typedef refcnt_ptr<epp_ContactNameAddress> epp_ContactNameAddress_ref; + typedef std::vector<epp_ContactNameAddress_ref> epp_ContactNameAddress_seq; + typedef refcnt_ptr<epp_ContactNameAddress_seq> epp_ContactNameAddress_seq_ref; }} Index: epp_contactXMLbase.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_contactXMLbase.cc,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** epp_contactXMLbase.cc 13 May 2003 22:55:51 -0000 1.14 --- epp_contactXMLbase.cc 27 May 2003 22:05:13 -0000 1.15 *************** *** 26,29 **** --- 26,31 ---- ************************************************************************/ + /* $Header$ */ + /** @file epp_contactXMLbase.cc * @brief Definition of XML helper-functions for contact objects *************** *** 53,57 **** void eppobject::contact::addAddressElement(eppobject::epp::EPP_output & outputobject, const epp_ContactNameAddress_ref & element, ! const eppobject::epp::epp_string & tag, const eppobject::epp::epp_boolean & update /* = false */) { --- 55,59 ---- void eppobject::contact::addAddressElement(eppobject::epp::EPP_output & outputobject, const epp_ContactNameAddress_ref & element, ! const eppobject::epp::epp_string & tag, /* = address */ const eppobject::epp::epp_boolean & update /* = false */) { *************** *** 64,68 **** --- 66,75 ---- // <fixme>not in use right now...</fixme> + map<epp_ContactPostalInfoType, string> postalInfoMap; + postalInfoMap[INT] = "int"; + postalInfoMap[LOC] = "loc"; + outputobject.beginTag(tag); + outputobject.putAttribute("type", postalInfoMap[*element->m_type]); if(element->m_name != NULL) { Index: epp_contactXMLbase.h =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_contactXMLbase.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** epp_contactXMLbase.h 17 Jul 2002 15:02:11 -0000 1.9 --- epp_contactXMLbase.h 27 May 2003 22:05:14 -0000 1.10 *************** *** 29,32 **** --- 29,34 ---- #define __EPP_CONTACTXMLBASE_H + /* $Header$ */ + /** @file epp_contactXMLbase.h * @brief Declaration of XML helper-functions for contact objects *************** *** 57,61 **** void addAddressElement(eppobject::epp::EPP_output & outputobject, const epp_ContactNameAddress_ref & element, ! const eppobject::epp::epp_string & tag, const eppobject::epp::epp_boolean & update = false); --- 59,63 ---- void addAddressElement(eppobject::epp::EPP_output & outputobject, const epp_ContactNameAddress_ref & element, ! const eppobject::epp::epp_string & tag = "contact:postalInfo", const eppobject::epp::epp_boolean & update = false); Index: epp_contactdata.h =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_contactdata.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** epp_contactdata.h 13 May 2003 22:55:51 -0000 1.9 --- epp_contactdata.h 27 May 2003 22:05:14 -0000 1.10 *************** *** 29,32 **** --- 29,34 ---- #define __EPP_CONTACTDATA_H + /* $Header$ */ + /** @file epp_contactdata.h * @brief Declaration of enums/typedefs used in contact objects |
From: Daniel M. <tub...@us...> - 2003-05-27 22:05:51
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src In directory sc8-pr-cvs1:/tmp/cvs-serv32441 Modified Files: epp_ContactCreate.cc main_contactcreate.cc Log Message: got some of contact create working -- still need work on auth info Index: epp_ContactCreate.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_ContactCreate.cc,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** epp_ContactCreate.cc 13 May 2003 22:55:50 -0000 1.12 --- epp_ContactCreate.cc 27 May 2003 22:05:45 -0000 1.13 *************** *** 72,83 **** xml_request.putTag("contact:id",*m_request->m_id); ! if(m_request->m_ascii_address != NULL) { ! addAddressElement(xml_request, m_request->m_ascii_address, "contact:ascii"); ! } // if "m_ascii_address" ! ! if(m_request->m_i15d_address != NULL) { ! addAddressElement(xml_request, m_request->m_i15d_address, "contact:i15d"); ! } // if "m_i15d_address" if(m_request->m_voice != NULL) { --- 72,101 ---- xml_request.putTag("contact:id",*m_request->m_id); ! if( m_request->m_ascii_address != NULL || ! m_request->m_i15d_address != NULL ) { ! ! // this is for backward compatibility with older EPP versions ! ! if(m_request->m_ascii_address != NULL) { ! m_request->m_ascii_address->m_type.ref(new epp_ContactPostalInfoType(INT)); ! addAddressElement(xml_request, m_request->m_ascii_address); ! } // if "m_ascii_address" + if(m_request->m_i15d_address != NULL) { + m_request->m_ascii_address->m_type.ref(new epp_ContactPostalInfoType(LOC)); + addAddressElement(xml_request, m_request->m_i15d_address); + } // if "m_i15d_address" + + } else if ( m_request->m_addresses != NULL && + m_request->m_addresses->size() > 0 ) { + // now let's deal with the newer addresses list... + + for(epp_ContactNameAddress_seq::iterator i = m_request->m_addresses->begin(); + i != m_request->m_addresses->end(); i++) + { + addAddressElement(xml_request, *i); + } + + } if(m_request->m_voice != NULL) { Index: main_contactcreate.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_contactcreate.cc,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** main_contactcreate.cc 13 May 2003 22:55:50 -0000 1.15 --- main_contactcreate.cc 27 May 2003 22:05:46 -0000 1.16 *************** *** 26,29 **** --- 26,31 ---- ************************************************************************/ + /* $Header$ */ + #include <vector> #include <iostream> *************** *** 73,87 **** string username, password; ! if(!handleArgs(test, argc, argv, username, password)) return 1; ! map<unsigned int,string> testDataMap; if(argc > 1) { for(int parm = 1; parm < argc; parm++) { ! if (!strncmp(argv[parm], "-testdata=", 10)) { ! string td = &argv[parm][10]; ! testDataMap = getTestDataMap(td); } } --- 75,91 ---- string username, password; ! string extra_usage = "[-extradata=trid=xxx:contact=id;auth_info;name;org;street1;street2;street3;city;state;country;postal;phone;ext;email;fax;ext]"; ! if(!handleArgs(test, argc, argv, username, password, extra_usage)) return 1; ! map<string,string> extraDataMap; if(argc > 1) { for(int parm = 1; parm < argc; parm++) { ! if (!strncmp(argv[parm], "-extradata=", 11)) { ! cout << "Found extra data param..." << endl; ! string td = &argv[parm][11]; ! extraDataMap = getExtraDataMap(td); } } *************** *** 95,105 **** string trID; ! if(testDataMap.empty()) trID = "ABC-12345"; ! else trID = testDataMap[1]; l_req->m_cmd.ref(new epp_Command(NULL, epp_trid(trID))); ! if(testDataMap.empty()) { l_req->m_id.ref(new epp_string("sh8013")); --- 99,109 ---- string trID; ! if(extraDataMap["trid"] == "") trID = "ABC-12345"; ! else trID = extraDataMap["trid"]; l_req->m_cmd.ref(new epp_Command(NULL, epp_trid(trID))); ! if( extraDataMap["contact"].empty() ) { l_req->m_id.ref(new epp_string("sh8013")); *************** *** 116,120 **** addr->m_address->m_country_code.ref(new epp_string("US")); ! l_req->m_ascii_address = addr; l_req->m_voice.ref(new epp_ContactPhone(epp_string("1234"), --- 120,126 ---- addr->m_address->m_country_code.ref(new epp_string("US")); ! addr->m_type.ref(new epp_ContactPostalInfoType(INT)); ! l_req->m_addresses.ref(new epp_ContactNameAddress_seq()); ! l_req->m_addresses->push_back(addr); l_req->m_voice.ref(new epp_ContactPhone(epp_string("1234"), *************** *** 130,168 **** } else { ! if(testDataMap[2] != "-1") l_req->m_id.ref(new epp_string(testDataMap[2])); ! if(testDataMap[3] != "-1") { l_req->m_auth_info.ref(new epp_AuthInfo()); l_req->m_auth_info->m_type.ref(new epp_AuthInfoType(PW)); ! l_req->m_auth_info->m_value.ref(new epp_string(testDataMap[3])); } epp_ContactNameAddress_ref addr(new epp_ContactNameAddress()); ! if(testDataMap[4] != "-1") addr->m_name.ref(new epp_string(testDataMap[4])); ! if(testDataMap[5] != "-1") addr->m_org.ref(new epp_string(testDataMap[5])); addr->m_address.ref(new epp_ContactAddress()); ! if(testDataMap[6] != "-1") addr->m_address->m_street1.ref(new epp_string(testDataMap[6])); ! if(testDataMap[7] != "-1") addr->m_address->m_street2.ref(new epp_string(testDataMap[7])); ! if(testDataMap[8] != "-1") addr->m_address->m_street3.ref(new epp_string(testDataMap[8])); ! if(testDataMap[9] != "-1") addr->m_address->m_city.ref(new epp_string(testDataMap[9])); ! if(testDataMap[10] != "-1") addr->m_address->m_state_province.ref(new epp_string(testDataMap[10])); ! if(testDataMap[11] != "-1") addr->m_address->m_country_code.ref(new epp_string(testDataMap[11])); ! if(testDataMap[12] != "-1") addr->m_address->m_postal_code.ref(new epp_string(testDataMap[12])); ! l_req->m_ascii_address = addr; ! if(testDataMap[13] != "-1" || testDataMap[14] != "-1") { l_req->m_voice.ref(new epp_ContactPhone()); ! if(testDataMap[13] != "-1") l_req->m_voice->m_value.ref(new epp_string(testDataMap[13])); ! if(testDataMap[14] != "-1") l_req->m_voice->m_extension.ref(new epp_string(testDataMap[14])); } ! if(testDataMap[15] != "-1") l_req->m_email.ref(new epp_string(testDataMap[15])); ! if(testDataMap[16] != "-1" || testDataMap[17] != "-1") { l_req->m_fax.ref(new epp_ContactPhone()); ! if(testDataMap[16] != "-1") l_req->m_fax->m_value.ref(new epp_string(testDataMap[16])); ! if(testDataMap[17] != "-1") l_req->m_fax->m_extension.ref(new epp_string(testDataMap[17])); } --- 136,198 ---- } else { ! string contactDataStr = extraDataMap["contact"]; ! vector<string> contactData; ! ! unsigned int end; ! while((end = contactDataStr.find(';')) != string::npos) { ! ! string tmp = contactDataStr.substr(0,end); ! cout << "The extradata string token ["<< tmp <<"]" << endl; ! if( ! tmp.empty() ) { ! contactData.push_back(tmp); ! } ! ! contactDataStr.erase(0,end+1); ! ! } // while ! ! if ( ! contactDataStr.empty() ) { ! contactData.push_back(contactDataStr); ! } ! ! ! ! if(contactData[0] != "-1") l_req->m_id.ref(new epp_string(contactData[0])); ! if(contactData[1] != "-1") { l_req->m_auth_info.ref(new epp_AuthInfo()); l_req->m_auth_info->m_type.ref(new epp_AuthInfoType(PW)); ! l_req->m_auth_info->m_value.ref(new epp_string(contactData[1])); } epp_ContactNameAddress_ref addr(new epp_ContactNameAddress()); ! if(contactData[2] != "") addr->m_name.ref(new epp_string(contactData[2])); ! if(contactData[3] != "") addr->m_org.ref(new epp_string(contactData[3])); addr->m_address.ref(new epp_ContactAddress()); ! if(contactData[4] != "-1") addr->m_address->m_street1.ref(new epp_string(contactData[4])); ! if(contactData[5] != "-1") addr->m_address->m_street2.ref(new epp_string(contactData[5])); ! if(contactData[6] != "-1") addr->m_address->m_street3.ref(new epp_string(contactData[6])); ! if(contactData[7] != "-1") addr->m_address->m_city.ref(new epp_string(contactData[7])); ! if(contactData[8] != "-1") addr->m_address->m_state_province.ref(new epp_string(contactData[8])); ! if(contactData[9] != "-1") addr->m_address->m_country_code.ref(new epp_string(contactData[9])); ! if(contactData[10] != "-1") addr->m_address->m_postal_code.ref(new epp_string(contactData[10])); ! addr->m_type.ref(new epp_ContactPostalInfoType(INT)); ! l_req->m_addresses.ref(new epp_ContactNameAddress_seq()); ! l_req->m_addresses->push_back(addr); ! if(contactData[11] != "-1" || contactData[12] != "-1") { l_req->m_voice.ref(new epp_ContactPhone()); ! if(contactData[11] != "-1") l_req->m_voice->m_value.ref(new epp_string(contactData[11])); ! if(contactData[12] != "-1") l_req->m_voice->m_extension.ref(new epp_string(contactData[12])); } ! if(contactData[13] != "-1") l_req->m_email.ref(new epp_string(contactData[13])); ! if(contactData[14] != "-1" || contactData[15] != "-1") { l_req->m_fax.ref(new epp_ContactPhone()); ! if(contactData[14] != "-1") l_req->m_fax->m_value.ref(new epp_string(contactData[14])); ! if(contactData[15] != "-1") l_req->m_fax->m_extension.ref(new epp_string(contactData[15])); } |
From: Daniel M. <tub...@us...> - 2003-05-27 20:16:16
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src In directory sc8-pr-cvs1:/tmp/cvs-serv15837a Modified Files: main_contactcheck.cc Log Message: added extra_usage for -? help Index: main_contactcheck.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_contactcheck.cc,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** main_contactcheck.cc 27 May 2003 20:13:57 -0000 1.15 --- main_contactcheck.cc 27 May 2003 20:16:11 -0000 1.16 *************** *** 95,99 **** string username, password; ! if(!handleArgs(test, argc, argv, username, password)) return 1; --- 95,100 ---- string username, password; ! string extra_usage = "[-extradata=trid=xxx:id1=abc:id2=def:...]"; ! if(!handleArgs(test, argc, argv, username, password, extra_usage)) return 1; *************** *** 137,141 **** string key = "id"; key.append(lenny); - cout << "looking for ["<<key<<"]\n"; string contact_id = extraDataMap[key]; if ( contact_id.empty() ) break; --- 138,141 ---- |
From: Daniel M. <tub...@us...> - 2003-05-27 20:14:01
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src In directory sc8-pr-cvs1:/tmp/cvs-serv15015 Modified Files: main_contactcheck.cc Log Message: added cvs header; now using "extradata" Index: main_contactcheck.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_contactcheck.cc,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** main_contactcheck.cc 13 May 2003 22:55:50 -0000 1.14 --- main_contactcheck.cc 27 May 2003 20:13:57 -0000 1.15 *************** *** 26,29 **** --- 26,31 ---- ************************************************************************/ + /* $Header$ */ + #include <vector> #include <iostream> *************** *** 96,107 **** return 1; ! map<unsigned int,string> testDataMap; if(argc > 1) { for(int parm = 1; parm < argc; parm++) { ! if (!strncmp(argv[parm], "-testdata=", 10)) { ! string td = &argv[parm][10]; ! testDataMap = getTestDataMap(td); } } --- 98,110 ---- return 1; ! map<string,string> extraDataMap; if(argc > 1) { for(int parm = 1; parm < argc; parm++) { ! if (!strncmp(argv[parm], "-extradata=", 11)) { ! cout << "Found extra data param..." << endl; ! string td = &argv[parm][11]; ! extraDataMap = getExtraDataMap(td); } } *************** *** 115,120 **** string trID; ! if(testDataMap.empty()) trID = "ABC-12345"; ! else trID = testDataMap[1]; l_req->m_cmd.ref(new epp_Command(NULL, --- 118,123 ---- string trID; ! if(extraDataMap.empty()) trID = "ABC-12345"; ! else trID = extraDataMap["trid"]; l_req->m_cmd.ref(new epp_Command(NULL, *************** *** 123,127 **** epp_string_seq_ref names(new epp_string_seq); ! if(testDataMap.empty()) { names->push_back("sh8013"); names->push_back("sah8013"); --- 126,130 ---- epp_string_seq_ref names(new epp_string_seq); ! if(extraDataMap.empty()) { names->push_back("sh8013"); names->push_back("sah8013"); *************** *** 129,134 **** } else { ! for(unsigned int n = 2; n <= testDataMap.size(); n++) { ! names->push_back(testDataMap[n]); } } --- 132,144 ---- } else { ! char lenny[3]; ! for(unsigned int n = 1; n <= 30; n++) { ! sprintf(lenny,"%d",n); ! string key = "id"; ! key.append(lenny); ! cout << "looking for ["<<key<<"]\n"; ! string contact_id = extraDataMap[key]; ! if ( contact_id.empty() ) break; ! names->push_back(contact_id); } } |
From: Daniel M. <tub...@us...> - 2003-05-27 20:12:54
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src In directory sc8-pr-cvs1:/tmp/cvs-serv14585 Modified Files: main_login.cc Log Message: added CVS header Index: main_login.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_login.cc,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** main_login.cc 22 May 2003 19:26:37 -0000 1.15 --- main_login.cc 27 May 2003 20:12:49 -0000 1.16 *************** *** 26,29 **** --- 26,31 ---- ************************************************************************/ + /* $Header$ */ + /** @file main_login.cc * @brief Test program for the <login> command |
From: Daniel M. <tub...@us...> - 2003-05-27 19:38:57
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src In directory sc8-pr-cvs1:/tmp/cvs-serv32185 Modified Files: epp_Hello.cc Log Message: added CVS headers Index: epp_Hello.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_Hello.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** epp_Hello.cc 18 Jul 2002 09:57:09 -0000 1.7 --- epp_Hello.cc 27 May 2003 19:38:22 -0000 1.8 *************** *** 26,29 **** --- 26,31 ---- ************************************************************************/ + /* $Header$ */ + #include "config.h" #include "epp_Hello.h" |
From: Daniel M. <tub...@us...> - 2003-05-27 19:38:28
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src/transport In directory sc8-pr-cvs1:/tmp/cvs-serv32185/transport Modified Files: epp_TransportSSL.cc Log Message: added CVS headers Index: epp_TransportSSL.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/transport/epp_TransportSSL.cc,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** epp_TransportSSL.cc 27 May 2003 19:33:35 -0000 1.23 --- epp_TransportSSL.cc 27 May 2003 19:38:23 -0000 1.24 *************** *** 26,29 **** --- 26,31 ---- ************************************************************************/ + /* $Header$ */ + /** @file epp_TransportSSL.cc * @brief Definition of epp_TransportSSL functions |
From: Daniel M. <tub...@us...> - 2003-05-27 19:38:28
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src/data In directory sc8-pr-cvs1:/tmp/cvs-serv32185/data Modified Files: epp_eppXMLbase.cc epp_eppdata.h Log Message: added CVS headers Index: epp_eppXMLbase.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_eppXMLbase.cc,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** epp_eppXMLbase.cc 27 May 2003 19:33:52 -0000 1.22 --- epp_eppXMLbase.cc 27 May 2003 19:38:22 -0000 1.23 *************** *** 26,29 **** --- 26,31 ---- ************************************************************************/ + /* $Header$ */ + /** @file epp_eppXMLbase.cc * @brief Definition of XML helper-functions for general use Index: epp_eppdata.h =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_eppdata.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** epp_eppdata.h 13 May 2003 22:55:51 -0000 1.13 --- epp_eppdata.h 27 May 2003 19:38:23 -0000 1.14 *************** *** 29,32 **** --- 29,34 ---- #define __EPP_EPPDATA_H + /* $Header$ */ + /** @file epp_eppdata.h * @brief Declaration of common/generic enums/typedefs used in the RTK |
From: Daniel M. <tub...@us...> - 2003-05-27 19:33:56
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src/data In directory sc8-pr-cvs1:/tmp/cvs-serv30407/data Modified Files: epp_DataCollectionPolicy.cc epp_eppXMLbase.cc Log Message: completed dcp parsing and debug output Index: epp_DataCollectionPolicy.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_DataCollectionPolicy.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** epp_DataCollectionPolicy.cc 22 May 2003 20:26:13 -0000 1.1 --- epp_DataCollectionPolicy.cc 27 May 2003 19:33:52 -0000 1.2 *************** *** 135,140 **** if(j->m_retention != NULL) { - cerr << "<retention>"; - string retention; switch(*j->m_retention) { --- 135,138 ---- Index: epp_eppXMLbase.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_eppXMLbase.cc,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** epp_eppXMLbase.cc 13 May 2003 22:55:51 -0000 1.21 --- epp_eppXMLbase.cc 27 May 2003 19:33:52 -0000 1.22 *************** *** 320,328 **** domtools::dom_ptr eppobject::epp::createDOMDocument(const epp_string & xml) { ! // <FIXME>For testing purposes only: cout << "<Returned_XML>\n"; cout << xml << endl; cout << "\n</Returned_XML>\n"; ! // </fixme> //<FIXME>This try/catch statement is Xerces-specific...</fixme> --- 320,328 ---- domtools::dom_ptr eppobject::epp::createDOMDocument(const epp_string & xml) { ! #ifdef RTK_DEBUG cout << "<Returned_XML>\n"; cout << xml << endl; cout << "\n</Returned_XML>\n"; ! #endif //<FIXME>This try/catch statement is Xerces-specific...</fixme> *************** *** 719,734 **** string recipient = recipientNode->getNodeName(); ! /* skip this whole section for now, until I can get ! the new epp_dcpRecipient instance settled and stuff. ! if(recipient == "other") dcpS.m_recipients->push_back(OTHER_RECIPIENT); else if(recipient =="ours") { ! // XXX have to do other stuff here because "ours" ! // recipients structure is complex ! dcpS.m_recipients->push_back(OURS); ! } else if(recipient =="public") dcpS.m_recipients->push_back(PUBLIK); ! else if(recipient =="same") dcpS.m_recipients->push_back(SAME); ! else if(recipient =="unrelated") dcpS.m_recipients->push_back(UNRELATED); else throw epp_XMLException(__FILE__, __LINE__, "Unknown recipient-type in greeting"); ! */ recipientNode = dom_ptr(recipientNode->getNextSiblingElement()); } // while "recipientNode" --- 719,738 ---- string recipient = recipientNode->getNodeName(); ! epp_dcpRecipient dcprecip; ! ! if(recipient == "other") dcprecip.m_type.ref(new epp_dcpRecipientType(OTHER_RECIPIENT)); else if(recipient =="ours") { ! dcprecip.m_type.ref(new epp_dcpRecipientType(OURS)); ! if ( ! recipientNode->getFirstChildElement()->isNull() ) { ! string ours_rec_desc = recipientNode->getFirstChildElement()->getNodeData(); ! if ( ! ours_rec_desc.empty() ) dcprecip.m_rec_desc.ref(new epp_string(ours_rec_desc)); ! } ! } else if(recipient =="public") dcprecip.m_type.ref(new epp_dcpRecipientType(PUBLIK)); ! else if(recipient =="same") dcprecip.m_type.ref(new epp_dcpRecipientType(SAME)); ! else if(recipient =="unrelated") dcprecip.m_type.ref(new epp_dcpRecipientType(UNRELATED)); else throw epp_XMLException(__FILE__, __LINE__, "Unknown recipient-type in greeting"); ! ! dcpS.m_recipients->push_back(dcprecip); ! recipientNode = dom_ptr(recipientNode->getNextSiblingElement()); } // while "recipientNode" *************** *** 751,757 **** } // if "retentionNode" } // if "retention" ! ! statementNode = dom_ptr(statementNode->getNextSiblingElement()); } // while "statementNode" --- 755,761 ---- } // if "retentionNode" + } // if "retention" ! statementNode = dom_ptr(statementNode->getNextSiblingElement()); } // while "statementNode" *************** *** 759,763 **** dcp->m_statements->push_back(dcpS); } // if "statement" ! DCPChildNode = dom_ptr(DCPChildNode->getNextSiblingElement()); } // while "DCPChildNode" --- 763,787 ---- dcp->m_statements->push_back(dcpS); } // if "statement" ! ! else if(nodeName == "expiry") { ! ! dom_ptr expiryNode = dom_ptr(DCPChildNode->getFirstChildElement()); ! ! if( expiryNode->isNull() ) { ! throw epp_XMLException(__FILE__, __LINE__, "Emtpy expiry-elment in data collection policy"); ! } ! ! string expiry_type = expiryNode->getNodeName(); ! ! dcp->m_expiry.ref(new epp_dcpExpiry()); ! if(expiry_type == "absolute") dcp->m_expiry->m_type.ref(new epp_dcpExpiryType(ABSOLUTE)); ! else if(expiry_type == "relative") dcp->m_expiry->m_type.ref(new epp_dcpExpiryType(RELATIVE)); ! else throw epp_XMLException(__FILE__, __LINE__, "Unknown expiry-type in data collection policy"); ! ! dcp->m_expiry->m_value.ref(new epp_string(expiryNode->getNodeData())); ! ! } // if "expiry" ! ! DCPChildNode = dom_ptr(DCPChildNode->getNextSiblingElement()); } // while "DCPChildNode" *************** *** 810,818 **** DOM_Document eppobject::epp::createDOM_Document(const epp_string & xml) { ! // <FIXME>For testing purposes only: cout << "<Returned_XML>\n"; cout << xml << endl; cout << "\n</Returned_XML>\n"; ! // </fixme> // Initialize Xerces --- 834,842 ---- DOM_Document eppobject::epp::createDOM_Document(const epp_string & xml) { ! #ifdef RTK_DEBUG cout << "<Returned_XML>\n"; cout << xml << endl; cout << "\n</Returned_XML>\n"; ! #endif // Initialize Xerces |
From: Daniel M. <tub...@us...> - 2003-05-27 19:33:55
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src In directory sc8-pr-cvs1:/tmp/cvs-serv30407 Modified Files: main_hello.cc Log Message: completed dcp parsing and debug output Index: main_hello.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_hello.cc,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** main_hello.cc 22 May 2003 20:26:46 -0000 1.13 --- main_hello.cc 27 May 2003 19:33:52 -0000 1.14 *************** *** 148,152 **** cerr << "</purpose>" << endl; } // if "m_purposes" - /* XXX fix this DANDAN if(j->m_recipients != NULL) { --- 148,151 ---- *************** *** 156,173 **** string recipient; ! switch(*i) { ! case OTHER_RECIPIENT: recipient = "other"; break; ! case OURS: recipient = "ours"; break; ! case PUBLIK: recipient = "public"; break; ! case SAME: recipient = "same"; break; ! case UNRELATED: recipient = "unrelated"; break; default: recipient = "**UNKNOWN**"; } ! cerr << "<" << recipient << "/>"; } // for cerr << "</recipient>" << endl; } // if "m_recipients" - */ if(j->m_retention != NULL) { --- 155,173 ---- string recipient; ! switch(*i->m_type) { ! case OTHER_RECIPIENT: recipient = "other/"; break; ! case OURS: ! if ( i->m_rec_desc != NULL ) recipient = "ours>"+*i->m_rec_desc+"</ours"; ! break; ! case PUBLIK: recipient = "public/"; break; ! case SAME: recipient = "same/"; break; ! case UNRELATED: recipient = "unrelated/"; break; default: recipient = "**UNKNOWN**"; } ! cerr << "<" << recipient << ">"; } // for cerr << "</recipient>" << endl; } // if "m_recipients" if(j->m_retention != NULL) { *************** *** 192,195 **** --- 192,209 ---- } // if "m_statement" + if(req->m_dcp->m_expiry != NULL) + { + string expiry, value; + switch(*req->m_dcp->m_expiry->m_type) { + + case ABSOLUTE: expiry = "absolute"; break; + case RELATIVE: expiry = "relative"; break; + default: expiry = "**UNKNOWN**"; + } + + value = *req->m_dcp->m_expiry->m_value; + cerr << "<expiry><"<<expiry<<"/>"<<value<<"</"<<expiry<<"></expiry>" << endl; + } // if "m_access" + cerr << "</dcp>" << endl; } // if "m_dcp" |
From: Daniel M. <tub...@us...> - 2003-05-27 19:33:40
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src/transport In directory sc8-pr-cvs1:/tmp/cvs-serv30268/transport Modified Files: epp_TransportSSL.cc Log Message: added RTK_DEBUG ifdef to toggle the debug on and off Index: epp_TransportSSL.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/transport/epp_TransportSSL.cc,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** epp_TransportSSL.cc 20 May 2003 21:06:17 -0000 1.22 --- epp_TransportSSL.cc 27 May 2003 19:33:35 -0000 1.23 *************** *** 66,74 **** } ! // <FIXME>For testing purposes only: cout << "<Writing_to_server>" << endl; cout << "["<<send_xml<<"]" << endl; cout << "</Writing_to_server>" << endl; ! // </fixme> if(!connected() || !sslserver) { --- 66,74 ---- } ! #ifdef RTK_DEBUG cout << "<Writing_to_server>" << endl; cout << "["<<send_xml<<"]" << endl; cout << "</Writing_to_server>" << endl; ! #endif if(!connected() || !sslserver) { *************** *** 77,81 **** --- 77,83 ---- // write the 4 byte header... + #ifdef RTK_DEBUG cout << "The length of the xml is ["<<send_xml.length()<<"]" << endl; + #endif long int message_length = send_xml.length() + 4; char header_bytes[4]; *************** *** 131,136 **** --- 133,140 ---- header_length -= 4; // less the size of the header + #ifdef RTK_DEBUG cout << "Length of XML from the server is ["<< header_length <<"]" << endl; cout << "Byte 1 ["<< (unsigned int)header[0] <<"] Byte 4 ["<< (unsigned int)header[3] <<"]" << endl; + #endif if ( header_length > 0 ) { |
From: Daniel M. <tub...@us...> - 2003-05-27 18:08:40
|
Update of /cvsroot/epp-rtk/epp-rtk/c++ In directory sc8-pr-cvs1:/tmp/cvs-serv23432 Modified Files: clean.sh Log Message: remove all .deps directories Index: clean.sh =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/clean.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** clean.sh 29 Apr 2003 20:55:57 -0000 1.2 --- clean.sh 27 May 2003 18:08:37 -0000 1.3 *************** *** 6,10 **** rm -f *~ rm -f src/*~ ! rm -rf src/.deps rm -f src/Makefile rm -f src/Makefile.in --- 6,10 ---- rm -f *~ rm -f src/*~ ! rm -rf `find . -name '.deps' -print` rm -f src/Makefile rm -f src/Makefile.in |
From: Daniel M. <tub...@us...> - 2003-05-22 20:44:36
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src In directory sc8-pr-cvs1:/tmp/cvs-serv7171 Modified Files: testTools.cc testTools.h Log Message: added CVS header lines Index: testTools.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/testTools.cc,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** testTools.cc 22 May 2003 18:44:25 -0000 1.20 --- testTools.cc 22 May 2003 20:27:07 -0000 1.21 *************** *** 27,30 **** --- 27,32 ---- + /* $Header$ */ + /** @file testTools.cc * @brief Definition of helper functions used for testing toolkit Index: testTools.h =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/testTools.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** testTools.h 22 May 2003 18:44:25 -0000 1.15 --- testTools.h 22 May 2003 20:27:07 -0000 1.16 *************** *** 30,33 **** --- 30,35 ---- + /* $Header$ */ + /** @file testTools.h * @brief Definition of helper functions used for testing toolkit |
From: Daniel M. <tub...@us...> - 2003-05-22 20:42:40
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src/data In directory sc8-pr-cvs1:/tmp/cvs-serv6579 Modified Files: Makefile.am epp_DataCollectionPolicy.h Added Files: epp_DataCollectionPolicy.cc Log Message: new datacollection policy cc file with operator<<() method for sending a dcp to a stream -- like for debug output. added the cc to the Makefile.am --- NEW FILE: epp_DataCollectionPolicy.cc --- /************************************************************************ * EPP RTK C++ * Copyright (C) 2001, 2002 The Global Name Registry, Limited * * This library 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 library 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 library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Contact information: ep...@gn... * * EPP RTK * The Global Name Registry, Limited * 125 High Holborn * London WC1V 6QA * United Kingdom ************************************************************************/ /* $Header: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_DataCollectionPolicy.cc,v 1.1 2003/05/22 20:26:13 tubadanm Exp $ */ /** @file epp_DataCollectionPolicy.cc * @brief Definition of epp_DataCollectionPolicy and epp_DataCollectionPolicy_ref * @author Daniel Manley */ #include "epp_DataCollectionPolicy.h" using namespace eppobject::epp; using namespace std; ostream& eppobject::epp::operator<<(ostream &stream, epp_DataCollectionPolicy & dcp) { stream << "epp_DataCollectionPolicy: "<<dcp.m_access<<" "<<dcp.m_statements<<" "<<dcp.m_expiry; return stream; } ostream& eppobject::epp::operator<<(ostream &stream, epp_DataCollectionPolicy_ref & dcp) { stream << *dcp; return stream; } ostream& eppobject::epp::operator<<(ostream &stream, epp_dcpAccessType_ref & access) { stream << "m_access ["; if(access != NULL) { switch(*access) { case ALL: stream << "all"; break; case NONE_ACCESS: stream << "none"; break; case NULL_ACCESS: stream << "null"; break; case OTHER: stream << "other"; break; case PERSONAL: stream << "personal"; break; case PERSONAL_AND_OTHER: stream << "personalAndOther"; break; default: stream << "**UNKNOWN**"; } } return stream << "]"; } ostream& eppobject::epp::operator<<(ostream &stream, epp_dcpStatement_seq_ref & statements) { stream << "m_statements ["; if(statements != NULL) { for(epp_dcpStatement_seq::iterator j = statements->begin(); j != statements->end(); j++) { if ( j != statements->begin() ) stream << ","; stream << "m_purposes ["; if(j->m_purposes != NULL) { string purposes = "["; for(epp_dcpPurpose_seq::iterator i = j->m_purposes->begin(); i != j->m_purposes->end(); i++) { if ( i != j->m_purposes->begin() ) purposes += ","; switch(*i) { case ADMIN_PURPOSE: purposes += "admin"; break; case CONTACT: purposes += "contact"; break; case OTHER_PURPOSE: purposes += "other"; break; case PROV: purposes += "prov,"; break; default: purposes += "**UNKNOWN**"; } } // for purposes += "]"; stream << purposes; } // if "m_purposes" stream << "] m_recipient ["; if(j->m_recipients != NULL) { string recipients = ""; for(epp_dcpRecipient_seq::iterator i = j->m_recipients->begin(); i != j->m_recipients->end(); i++) { if ( i != j->m_recipients->begin() ) recipients += ","; switch(*i->m_type) { case OTHER_RECIPIENT: recipients += "other"; break; case OURS: recipients += "ours{"+*i->m_rec_desc+"}"; break; case PUBLIK: recipients += "public"; break; case SAME: recipients += "same"; break; case UNRELATED: recipients += "unrelated"; break; default: recipients += "**UNKNOWN**"; } } // for stream << recipients; } // if "m_recipients" stream << "] m_retention ["; if(j->m_retention != NULL) { cerr << "<retention>"; string retention; switch(*j->m_retention) { case BUSINESS: retention = "business"; break; case INDEFINITE: retention = "indefinite"; break; case LEGAL: retention = "legal"; break; case NONE: retention = "none"; break; case STATED: retention = "stated"; break; default: retention = "**UNKNOWN**"; } stream << retention; } // if "retentions" stream << "]"; } } // if "m_statement" stream << "]"; return stream; } ostream& eppobject::epp::operator<<(ostream &stream, epp_dcpExpiry_ref & expiry) { stream << "m_expiry ["; if ( expiry != NULL ) { stream << "m_type ["; if(expiry->m_type != NULL) { switch(*expiry->m_type) { case ABSOLUTE: stream << "absolute"; break; case RELATIVE: stream << "relative"; break; default: stream << "**UNKNOWN**"; } } stream << "] m_value ["<<*expiry->m_value<<"]"; } stream << "]"; return stream; } Index: Makefile.am =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.am 13 May 2003 22:55:51 -0000 1.5 --- Makefile.am 22 May 2003 20:26:12 -0000 1.6 *************** *** 108,111 **** --- 108,112 ---- libdata_a_SOURCES = \ + epp_DataCollectionPolicy.cc \ epp_ContactPanData.cc \ epp_ContactTrnData.cc \ Index: epp_DataCollectionPolicy.h =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_DataCollectionPolicy.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** epp_DataCollectionPolicy.h 13 May 2003 22:55:51 -0000 1.4 --- epp_DataCollectionPolicy.h 22 May 2003 20:26:13 -0000 1.5 *************** *** 29,32 **** --- 29,34 ---- #define __EPP_DATACOLLECTIONPOLICY_H + /* $Header$ */ + /** @file epp_DataCollectionPolicy.h * @brief Definition of epp_DataCollectionPolicy and epp_DataCollectionPolicy_ref *************** *** 34,37 **** --- 36,40 ---- */ + #include <iostream> #include "epp_eppdata.h" #include "epp_dcpStatement.h" *************** *** 64,72 **** m_expiry = _m_expiry; }; }; /// Typedef for the ref to the epp_DataCollectionPolicy class typedef refcnt_ptr<epp_DataCollectionPolicy> epp_DataCollectionPolicy_ref; ! }} --- 67,82 ---- m_expiry = _m_expiry; }; + + friend std::ostream& operator<<(std::ostream &stream, epp_DataCollectionPolicy & dcp); + }; /// Typedef for the ref to the epp_DataCollectionPolicy class typedef refcnt_ptr<epp_DataCollectionPolicy> epp_DataCollectionPolicy_ref; ! std::ostream& operator<<(std::ostream &stream, epp_DataCollectionPolicy_ref & dcp); ! std::ostream& operator<<(std::ostream &stream, epp_dcpAccessType_ref & access); ! std::ostream& operator<<(std::ostream &stream, epp_dcpStatement_seq_ref & statements); ! std::ostream& operator<<(std::ostream &stream, epp_dcpExpiry_ref & expiry); ! }} |
From: Daniel M. <tub...@us...> - 2003-05-22 20:41:49
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src In directory sc8-pr-cvs1:/tmp/cvs-serv7004 Modified Files: main_hello.cc Log Message: trying out the new operator<<() on the dcp member to debug it Index: main_hello.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_hello.cc,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** main_hello.cc 29 Apr 2003 20:59:41 -0000 1.12 --- main_hello.cc 22 May 2003 20:26:46 -0000 1.13 *************** *** 26,29 **** --- 26,31 ---- ************************************************************************/ + /* $Header$ */ + /** @file main_hello.cc * @brief Test program for the <hello> command *************** *** 146,150 **** cerr << "</purpose>" << endl; } // if "m_purposes" ! /* if(j->m_recipients != NULL) { --- 148,152 ---- cerr << "</purpose>" << endl; } // if "m_purposes" ! /* XXX fix this DANDAN if(j->m_recipients != NULL) { *************** *** 237,241 **** // We then use the above function to print the response // from the server ! printRsp(l_rsp); #endif // Finished --- 239,244 ---- // We then use the above function to print the response // from the server ! printRsp(l_rsp); ! cout << l_rsp->m_dcp << endl; #endif // Finished |
From: Daniel M. <tub...@us...> - 2003-05-22 19:26:41
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src In directory sc8-pr-cvs1:/tmp/cvs-serv9273 Modified Files: main_login.cc Log Message: make login example work with getExtraDataMap() method and added extra_usage string to handleArgs() Index: main_login.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_login.cc,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** main_login.cc 13 May 2003 22:55:50 -0000 1.14 --- main_login.cc 22 May 2003 19:26:37 -0000 1.15 *************** *** 72,86 **** // Handle arguments. This function might change the session object // and username/password ! if(!handleArgs(test, argc, argv, username, password)) return 1; ! map<unsigned int,string> testDataMap; if(argc > 1) { for(int parm = 1; parm < argc; parm++) { ! if (!strncmp(argv[parm], "-testdata=", 10)) { ! string td = &argv[parm][10]; ! testDataMap = getTestDataMap(td); } } --- 72,88 ---- // Handle arguments. This function might change the session object // and username/password ! string extra_usage = "[-extradata=trid=xxx:newpw=yyy]"; ! if(!handleArgs(test, argc, argv, username, password, extra_usage)) return 1; ! map<string,string> extraDataMap; if(argc > 1) { for(int parm = 1; parm < argc; parm++) { ! if (!strncmp(argv[parm], "-extradata=", 11)) { ! cout << "Found extra data param..." << endl; ! string td = &argv[parm][11]; ! extraDataMap = getExtraDataMap(td); } } *************** *** 93,98 **** string trID; ! if(testDataMap.empty()) trID = "ABC-12345"; ! else trID = testDataMap[1]; cmd->m_client_trid.ref(new epp_trid(trID)); --- 95,100 ---- string trID; ! if(extraDataMap.empty()) trID = "ABC-12345"; ! else trID = extraDataMap["trid"]; cmd->m_client_trid.ref(new epp_trid(trID)); *************** *** 114,123 **** l_req->m_client_id.ref(new epp_string(username)); l_req->m_password.ref(new epp_string(password)); ! if(testDataMap.empty()) { l_req->m_new_password.ref(new epp_string("bar-FOO2")); } else { ! if(testDataMap[2] != "-1") { ! l_req->m_new_password.ref(new epp_string(testDataMap[2])); } } --- 116,125 ---- l_req->m_client_id.ref(new epp_string(username)); l_req->m_password.ref(new epp_string(password)); ! if(extraDataMap.empty()) { l_req->m_new_password.ref(new epp_string("bar-FOO2")); } else { ! if(extraDataMap["newpw"] != "") { ! l_req->m_new_password.ref(new epp_string(extraDataMap["newpw"])); } } |
From: Daniel M. <tub...@us...> - 2003-05-22 18:48:52
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src In directory sc8-pr-cvs1:/tmp/cvs-serv13644 Modified Files: testTools.cc testTools.h Log Message: added new getExtraDataMap() method to handle args in this format: key1=value1:key2=value2:etc... also expanded signature of handleArgs() to allow for optional extra_usage string to show stuff like "-extradata=newpw=xxx" Index: testTools.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/testTools.cc,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** testTools.cc 13 May 2003 22:55:50 -0000 1.19 --- testTools.cc 22 May 2003 18:44:25 -0000 1.20 *************** *** 175,179 **** bool handleArgs(epp_Session & sess, int argc, char * argv[], ! string & username, string & password) { // CHANGE TRANSPORT HERE: --- 175,180 ---- bool handleArgs(epp_Session & sess, int argc, char * argv[], ! string & username, string & password, ! const string & extra_usage) { // CHANGE TRANSPORT HERE: *************** *** 202,206 **** // Return with a line showing allowed command line arguments ! cout << argv[0]; if(transport->getType() != "epp_TransportIOStream") { --- 203,212 ---- // Return with a line showing allowed command line arguments ! string progname = argv[0]; ! string prognamespaces = progname; ! unsigned int i; ! for ( i = 0; i < progname.length(); i++ ) { prognamespaces.replace(i, 1, " "); } ! ! cout << progname; if(transport->getType() != "epp_TransportIOStream") { *************** *** 214,221 **** // Only relevant for SSL-transport // <FIXME>Bug: -ca must include full path to file...</fixme> ! cout << " -c=<cert> [-cadir=<cacertdir> -ca=<cacert>]"; } ! cout << endl; return false; } // if "-?" --- 220,233 ---- // Only relevant for SSL-transport // <FIXME>Bug: -ca must include full path to file...</fixme> ! cout << endl; ! cout << prognamespaces << " -c=<cert> [-cadir=<cacertdir> -ca=<cacert>]"; } ! if (!extra_usage.empty()) { ! cout << endl; ! cout << prognamespaces << " " << extra_usage; ! } ! ! cout << endl; return false; } // if "-?" *************** *** 405,408 **** --- 417,421 ---- map<unsigned int,string> dataMap; + cout << "The entire testdata string is ["<<testdata<<"]" << endl; if(testdata.length() > 0) { *************** *** 412,421 **** } ! int begin = 1; ! int end = 1; unsigned int argc = 1; while((end = testdata.find('\"', begin)) != string::npos) { string tmp = testdata.substr(begin,end-begin); if(tmp != " ") { dataMap[argc] = tmp; --- 425,435 ---- } ! unsigned int begin = 1; ! unsigned int end = 1; unsigned int argc = 1; while((end = testdata.find('\"', begin)) != string::npos) { string tmp = testdata.substr(begin,end-begin); + cout << "The testdata string token ["<< tmp <<"]" << endl; if(tmp != " ") { dataMap[argc] = tmp; *************** *** 428,429 **** --- 442,491 ---- } // getTestDataMap + + // This is an alternative to getTestDataMap -- it uses ":" + // separated values instead of '\"' separated one. + map<string,string> getExtraDataMap(const string & extradata) + { + map<string,string> dataMap; + + string tmpstring = extradata; + cout << "The entire extradata string is ["<<tmpstring<<"]" << endl; + if(tmpstring.length() > 0) { + + unsigned int end = 1; + while((end = tmpstring.find(':')) != string::npos) { + + string tmp = tmpstring.substr(0,end); + cout << "The extradata string token ["<< tmp <<"]" << endl; + if( ! tmp.empty() ) { + + string key, value; + unsigned int equal_sign = tmp.find('='); + if ( equal_sign != string::npos ) { + key = tmp.substr(0,equal_sign); + value = tmp.substr(equal_sign+1,tmp.length()); + cout << "key: ["<<key<<"] value ["<<value<<"]\n"; + dataMap[key] = value; + } + } + + tmpstring.erase(0,end+1); + cout << "what's leftover: ["<<tmpstring<<"]\n"; + + } // while + + if ( ! tmpstring.empty() ) { + string key, value; + unsigned int equal_sign = tmpstring.find('='); + if ( equal_sign != string::npos ) { + key = tmpstring.substr(0,equal_sign); + value = tmpstring.substr(equal_sign+1,tmpstring.length()); + cout << "key: ["<<key<<"] value ["<<value<<"]\n"; + dataMap[key] = value; + } + } + + } // if "tmpstring" + return dataMap; + + } // getExtraDataMap Index: testTools.h =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/testTools.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** testTools.h 28 Apr 2003 20:50:39 -0000 1.14 --- testTools.h 22 May 2003 18:44:25 -0000 1.15 *************** *** 97,105 **** * @param username Login name on server * @param password Password on server * @return true if arguments set correcetly, otherwise false */ bool handleArgs(eppobject::epp::epp_Session & sess, int argc, char * argv[], ! std::string & username, std::string & password); /** Function that tries to login to a server using information in the --- 97,107 ---- * @param username Login name on server * @param password Password on server + * @param extra_usage Extra usage parameters * @return true if arguments set correcetly, otherwise false */ bool handleArgs(eppobject::epp::epp_Session & sess, int argc, char * argv[], ! std::string & username, std::string & password, ! const std::string & extra_usage = (std::string)""); /** Function that tries to login to a server using information in the *************** *** 119,122 **** --- 121,132 ---- */ std::map<unsigned int,std::string> getTestDataMap(const std::string & testdata); + + /** Function that takes an extradata string and puts each token element + * into a map -- tokens are separated by ':'. + * Used as an alternative to getTestDataMap() + * @param testdata String with extra data + * @return Map of extradata elements + */ + std::map<std::string,std::string> getExtraDataMap(const std::string & extradata); #endif |
From: Daniel M. <tub...@us...> - 2003-05-20 21:23:27
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src/transport In directory sc8-pr-cvs1:/tmp/cvs-serv15430/transport Modified Files: epp_TransportSSL.cc Log Message: fixed writing to server with EPP header length Index: epp_TransportSSL.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/transport/epp_TransportSSL.cc,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** epp_TransportSSL.cc 29 Apr 2003 20:58:12 -0000 1.21 --- epp_TransportSSL.cc 20 May 2003 21:06:17 -0000 1.22 *************** *** 53,63 **** void epp_TransportSSL::writeToServer(const string & xml_string) { - // <FIXME>For testing purposes only: - cout << "<Writing_to_server>\n"; - cout << xml_string; - cout << endl; - cout << "\n</Writing_to_server>\n"; - // </fixme> - string send_xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>"; send_xml += xml_string; --- 53,56 ---- *************** *** 73,76 **** --- 66,75 ---- } + // <FIXME>For testing purposes only: + cout << "<Writing_to_server>" << endl; + cout << "["<<send_xml<<"]" << endl; + cout << "</Writing_to_server>" << endl; + // </fixme> + if(!connected() || !sslserver) { throw epp_TrException(__FILE__, __LINE__, "Not connected to server"); *************** *** 78,88 **** // write the 4 byte header... long int message_length = send_xml.length() + 4; char header_bytes[4]; bzero(header_bytes, 4); ! header_bytes[0] = ( message_length & 0xff ) >> 24; ! header_bytes[1] = ( message_length & 0xff ) >> 16; ! header_bytes[2] = ( message_length & 0xff ) >> 8; ! header_bytes[3] = ( message_length & 0xff ); if ( not sslserver->putchars(header_bytes, 4) ) { --- 77,88 ---- // write the 4 byte header... + cout << "The length of the xml is ["<<send_xml.length()<<"]" << endl; long int message_length = send_xml.length() + 4; char header_bytes[4]; bzero(header_bytes, 4); ! header_bytes[0] = ( message_length >> 24 ) & 0xff; ! header_bytes[1] = ( message_length >> 16 ) & 0xff; ! header_bytes[2] = ( message_length >> 8 ) & 0xff; ! header_bytes[3] = ( message_length ) & 0xff ; if ( not sslserver->putchars(header_bytes, 4) ) { *************** *** 130,133 **** --- 130,136 ---- header_length -= 4; // less the size of the header + + cout << "Length of XML from the server is ["<< header_length <<"]" << endl; + cout << "Byte 1 ["<< (unsigned int)header[0] <<"] Byte 4 ["<< (unsigned int)header[3] <<"]" << endl; if ( header_length > 0 ) { |
Update of /cvsroot/epp-rtk/epp-rtk/c++/src/data In directory sc8-pr-cvs1:/tmp/cvs-serv698/data Modified Files: Makefile.am epp_Command.h epp_ContactTrnData.cc epp_ContactTrnData.h epp_DataCollectionPolicy.h epp_DomainInfoReq.h epp_DomainTrnData.cc epp_DomainTrnData.h epp_Exception.h epp_LoginReq.h epp_LogoutReq.h epp_MessageQueue.h epp_PollResData.h epp_Response.h epp_Result.h epp_contactXMLbase.cc epp_contactdata.h epp_dcpStatement.h epp_domainXMLbase.cc epp_domaindata.h epp_eppXMLbase.cc epp_eppXMLbase.h epp_eppdata.h epp_hostXMLbase.cc epp_hostdata.h Added Files: epp_ContactPanData.cc epp_ContactPanData.h epp_DomainPanData.cc epp_DomainPanData.h epp_ExtMessage.h epp_ExtResultValue.h epp_HostPanData.cc epp_HostPanData.h epp_ResultValue.h epp_dcpExpiry.h epp_dcpRecipient.h Log Message: committing compilable code for 07/05 -- now have to work out bugs : Modified Files: : Makefile.am epp_ContactCheck.cc epp_ContactCreate.cc : epp_ContactDelete.cc epp_ContactInfo.cc epp_ContactTransfer.cc : epp_ContactUpdate.cc epp_DomainCheck.cc epp_DomainCreate.cc : epp_DomainDelete.cc epp_DomainInfo.cc epp_DomainRenew.cc : epp_DomainTransfer.cc epp_DomainUpdate.cc epp_HostCheck.cc : epp_HostCreate.cc epp_HostDelete.cc epp_HostInfo.cc : epp_HostUpdate.cc epp_Login.cc epp_Logout.cc epp_Poll.cc : epp_Session.h main_contactcheck.cc main_contactcreate.cc : main_contactdelete.cc main_contactinfo.cc : main_contacttransfer.cc main_contactupdate.cc : main_domainupdate.cc main_login.cc main_loginunspec.cc : testTools.cc data/Makefile.am data/epp_Command.h : data/epp_ContactTrnData.cc data/epp_ContactTrnData.h : data/epp_DataCollectionPolicy.h data/epp_DomainInfoReq.h : data/epp_DomainTrnData.cc data/epp_DomainTrnData.h : data/epp_Exception.h data/epp_LoginReq.h data/epp_LogoutReq.h : data/epp_MessageQueue.h data/epp_PollResData.h : data/epp_Response.h data/epp_Result.h : data/epp_contactXMLbase.cc data/epp_contactdata.h : data/epp_dcpStatement.h data/epp_domainXMLbase.cc : data/epp_domaindata.h data/epp_eppXMLbase.cc : data/epp_eppXMLbase.h data/epp_eppdata.h : data/epp_hostXMLbase.cc data/epp_hostdata.h : Added Files: : data/epp_ContactPanData.cc data/epp_ContactPanData.h : data/epp_DomainPanData.cc data/epp_DomainPanData.h : data/epp_ExtMessage.h data/epp_ExtResultValue.h : data/epp_HostPanData.cc data/epp_HostPanData.h : data/epp_ResultValue.h data/epp_dcpExpiry.h : data/epp_dcpRecipient.h --- NEW FILE: epp_ContactPanData.cc --- /************************************************************************ * EPP RTK C++ * Copyright (C) 2001, 2002 The Global Name Registry, Limited * * This library 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 library 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 library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Contact information: ep...@gn... * * EPP RTK * The Global Name Registry, Limited * 125 High Holborn * London WC1V 6QA * United Kingdom ************************************************************************/ /** @file epp_ContactPanData.cc * @brief Additional definitions for epp_ContactPanData * @author Asbjorn Steira Mikkelsen * @see epp_ContactPanData.h */ #include <domtools/dom_wrapper.h> #include "epp_ContactPanData.h" #include "epp_contactXMLbase.h" #include "epp_XMLException.h" using namespace std; using namespace eppobject::contact; using namespace eppobject::epp; using namespace domtools; epp_PollResData_ref epp_ContactPanData::createPollResData(const dom_ptr & panNode) { epp_ContactPanData_ref domt(new epp_ContactPanData()); if(!panNode->isNull()) { dom_ptr DPDChildNode = dom_ptr(panNode->getFirstChildElement()); string elemPrefix = panNode->getPrefix(); while(!DPDChildNode->isNull()) { string nodeName = DPDChildNode->getNodeName(); if(nodeName == string(elemPrefix + ":id")) { domt->m_id.ref(new epp_string(DPDChildNode->getNodeData())); // cout << "name: " << *domt->m_name << endl; string result = DPDChildNode->getAttribute("paResult"); // cout << "result: " << result << endl; if(result == "1") domt->m_result.ref(new epp_boolean(true)); else if(result == "0") domt->m_result.ref(new epp_boolean(false)); else throw epp_XMLException(__FILE__, __LINE__, "Empty or unknown result-attribute in host:panData"); } // if "name" else if(nodeName == string(elemPrefix + ":paTRID")) { domt->m_trid.ref(new epp_TransID()); dom_ptr trIDChildNode = dom_ptr(DPDChildNode->getFirstChildElement()); while(!trIDChildNode->isNull()) { string trIDNodeName = trIDChildNode->getNodeName(); if(trIDNodeName == "svTRID") { domt->m_trid->m_server_trid.ref(new epp_trid(trIDChildNode->getNodeData())); // cout << "svTRID: " << *res->m_trans_id->m_server_trid << endl; } else if(trIDNodeName == "clTRID") { domt->m_trid->m_client_trid.ref(new epp_trid(trIDChildNode->getNodeData())); // cout << "clTRID: " << *res->m_trans_id->m_client_trid << endl; } trIDChildNode = dom_ptr(trIDChildNode->getNextSiblingElement()); } // while "trIDChildNode" } // if "paTRID" else if(nodeName == string(elemPrefix + ":paDate")) { domt->m_date.ref(new epp_datetime(DPDChildNode->getNodeData())); // cout << "paDate: " << *domt->m_expiration_date << endl; } // if "paDate" DPDChildNode = dom_ptr(DPDChildNode->getNextSiblingElement()); } // while "DTChildNode" } // if "panNode" return domt; } // createPollResData --- NEW FILE: epp_ContactPanData.h --- /************************************************************************ * EPP RTK C++ * Copyright (C) 2001, 2002 The Global Name Registry, Limited * * This library 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 library 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 library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Contact information: ep...@gn... * * EPP RTK * The Global Name Registry, Limited * 125 High Holborn * London WC1V 6QA * United Kingdom ************************************************************************/ #ifndef __EPP_CONTACTPANDATA_H #define __EPP_CONTACTPANDATA_H /** @file epp_ContactPanData.h * @brief Definition of epp_ContactPanData and epp_ContactPanData_ref * @author Asbjorn Steira Mikkelsen */ #include "epp_eppdata.h" #include "epp_PollResData.h" #include "epp_TransID.h" namespace eppobject { namespace contact { /// Class containing elements describing a contact transfer. /// @see epp_PollResData for additional information class epp_ContactPanData : public epp::epp_PollResData { public: epp::epp_string_ref m_id; /**< The ID of the contact object */ epp::epp_boolean_ref m_result; /**< */ epp::epp_TransID_ref m_trid; /**< The TRID from the request which submitted this pending action */ epp::epp_datetime_ref m_date; /**< Date and time the pending action was completed (to success or failure) */ /// Null constructor, setting #m_type epp_ContactPanData() { m_type = "contact:panData"; }; /// Destructor virtual ~epp_ContactPanData() {} /// Constructor, using simple types when it can, setting #m_type /// @note Cannot set simple types to NULL epp_ContactPanData(const epp::epp_string & _m_id, const epp::epp_boolean & _m_result, const epp::epp_TransID & _m_trid, const epp::epp_datetime & _m_date) { m_type = "contact:panData"; m_id.ref(new epp::epp_string(_m_id)); m_result.ref(new epp::epp_boolean(_m_result)); m_trid.ref(new epp::epp_TransID(_m_trid)); m_date.ref(new epp::epp_datetime(_m_date)); }; /// Constructor, using only references, setting #m_type epp_ContactPanData(const epp::epp_string_ref & _m_id, const epp::epp_boolean_ref & _m_result, const epp::epp_TransID_ref & _m_trid, const epp::epp_datetime_ref & _m_date) { m_type = "contact:panData"; m_id = _m_id; m_result = _m_result; m_trid = _m_trid; m_date = _m_date; }; /// Returns the type of object /// @return Type of epp_PollResData object epp::epp_string getType() { return m_type; }; /** Parses a panData dom_ptr, fills in the public attributes of this class, * and returns a ref to an #epp_PollResData object that is really an * epp_ContactPanData object * @param trnNode The panData dom_ptr node * @return The corresponding epp_ContactPanData object */ epp::epp_PollResData_ref createPollResData(const domtools::dom_ptr & trnNode); }; /// Typedef for the ref to the epp_ContactPanData class typedef refcnt_ptr<epp_ContactPanData> epp_ContactPanData_ref; /// Creates a pointer to an epp_ContactPanData-object and returns it /// as an epp_PollResData pointer /// @return Pointer to an epp_ContactPanData object static epp::epp_PollResData * createContactPanResData() { return new epp_ContactPanData(); } }} #endif --- NEW FILE: epp_DomainPanData.cc --- /************************************************************************ * EPP RTK C++ * Copyright (C) 2001, 2002 The Global Name Registry, Limited * * This library 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 library 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 library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Contact information: ep...@gn... * * EPP RTK * The Global Name Registry, Limited * 125 High Holborn * London WC1V 6QA * United Kingdom ************************************************************************/ /** @file epp_DomainPanData.cc * @brief Additional definitions for epp_DomainPanData * @author Asbjorn Steira Mikkelsen * @see epp_DomainPanData.h */ #include <domtools/dom_wrapper.h> #include "epp_DomainPanData.h" #include "epp_domainXMLbase.h" #include "epp_XMLException.h" using namespace std; using namespace eppobject::domain; using namespace eppobject::epp; using namespace domtools; epp_PollResData_ref epp_DomainPanData::createPollResData(const dom_ptr & panNode) { epp_DomainPanData_ref domt(new epp_DomainPanData()); if(!panNode->isNull()) { dom_ptr DPDChildNode = dom_ptr(panNode->getFirstChildElement()); string elemPrefix = panNode->getPrefix(); while(!DPDChildNode->isNull()) { string nodeName = DPDChildNode->getNodeName(); if(nodeName == string(elemPrefix + ":name")) { domt->m_name.ref(new epp_string(DPDChildNode->getNodeData())); // cout << "name: " << *domt->m_name << endl; string result = DPDChildNode->getAttribute("paResult"); // cout << "result: " << result << endl; if(result == "1") domt->m_result.ref(new epp_boolean(true)); else if(result == "0") domt->m_result.ref(new epp_boolean(false)); else throw epp_XMLException(__FILE__, __LINE__, "Empty or unknown result-attribute in domain:panData"); } // if "name" else if(nodeName == string(elemPrefix + ":paTRID")) { domt->m_trid.ref(new epp_TransID()); dom_ptr trIDChildNode = dom_ptr(DPDChildNode->getFirstChildElement()); while(!trIDChildNode->isNull()) { string trIDNodeName = trIDChildNode->getNodeName(); if(trIDNodeName == "svTRID") { domt->m_trid->m_server_trid.ref(new epp_trid(trIDChildNode->getNodeData())); // cout << "svTRID: " << *res->m_trans_id->m_server_trid << endl; } else if(trIDNodeName == "clTRID") { domt->m_trid->m_client_trid.ref(new epp_trid(trIDChildNode->getNodeData())); // cout << "clTRID: " << *res->m_trans_id->m_client_trid << endl; } trIDChildNode = dom_ptr(trIDChildNode->getNextSiblingElement()); } // while "trIDChildNode" } // if "paTRID" else if(nodeName == string(elemPrefix + ":paDate")) { domt->m_date.ref(new epp_datetime(DPDChildNode->getNodeData())); // cout << "paDate: " << *domt->m_expiration_date << endl; } // if "paDate" DPDChildNode = dom_ptr(DPDChildNode->getNextSiblingElement()); } // while "DTChildNode" } // if "panNode" return domt; } // createPollResData --- NEW FILE: epp_DomainPanData.h --- /************************************************************************ * EPP RTK C++ * Copyright (C) 2001, 2002 The Global Name Registry, Limited * * This library 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 library 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 library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Contact information: ep...@gn... * * EPP RTK * The Global Name Registry, Limited * 125 High Holborn * London WC1V 6QA * United Kingdom ************************************************************************/ #ifndef __EPP_DOMAINPANDATA_H #define __EPP_DOMAINPANDATA_H /** @file epp_DomainPanData.h * @brief Definition of epp_DomainPanData and epp_DomainPanData_ref * @author Asbjorn Steira Mikkelsen */ #include "epp_eppdata.h" #include "epp_PollResData.h" #include "epp_TransID.h" namespace eppobject { namespace domain { /// Class containing elements describing a domain transfer. /// @see epp_PollResData for additional information class epp_DomainPanData : public epp::epp_PollResData { public: epp::epp_string_ref m_name; /**< Fully qualified name of the domain object */ epp::epp_boolean_ref m_result; /**< */ epp::epp_TransID_ref m_trid; /**< The TRID from the request which submitted this pending action */ epp::epp_datetime_ref m_date; /**< Date and time the pending action was completed (to success or failure) */ /// Null constructor, setting #m_type epp_DomainPanData() { m_type = "domain:panData"; }; /// Destructor virtual ~epp_DomainPanData() {} /// Constructor, using simple types when it can, setting #m_type /// @note Cannot set simple types to NULL epp_DomainPanData(const epp::epp_string & _m_name, const epp::epp_boolean & _m_result, const epp::epp_TransID & _m_trid, const epp::epp_datetime & _m_date) { m_type = "domain:panData"; m_name.ref(new epp::epp_string(_m_name)); m_result.ref(new epp::epp_boolean(_m_result)); m_trid.ref(new epp::epp_TransID(_m_trid)); m_date.ref(new epp::epp_datetime(_m_date)); }; /// Constructor, using only references, setting #m_type epp_DomainPanData(const epp::epp_string_ref & _m_name, const epp::epp_boolean_ref & _m_result, const epp::epp_TransID_ref & _m_trid, const epp::epp_datetime_ref & _m_date) { m_type = "domain:panData"; m_name = _m_name; m_result = _m_result; m_trid = _m_trid; m_date = _m_date; }; /// Returns the type of object /// @return Type of epp_PollResData object epp::epp_string getType() { return m_type; }; /** Parses a trnData dom_ptr, fills in the public attributes of this class, * and returns a ref to an #epp_PollResData object that is really an * epp_DomainPanData object * @param trnNode The trnData dom_ptr node * @return The corresponding epp_DomainPanData object */ epp::epp_PollResData_ref createPollResData(const domtools::dom_ptr & trnNode); }; /// Typedef for the ref to the epp_DomainPanData class typedef refcnt_ptr<epp_DomainPanData> epp_DomainPanData_ref; /// Creates a pointer to an epp_DomainPanData-object and returns it /// as an epp_PollResData pointer /// @return Pointer to an epp_DomainPanData object static epp::epp_PollResData * createDomainPollResData() { return new epp_DomainPanData(); } }} #endif --- NEW FILE: epp_ExtMessage.h --- /************************************************************************ * EPP RTK C++ * Copyright (C) 2001, 2002 The Global Name Registry, Limited * * This library 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 library 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 library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Contact information: ep...@gn... * * EPP RTK * The Global Name Registry, Limited * 125 High Holborn * London WC1V 6QA * United Kingdom ************************************************************************/ #ifndef __EPP_EXT_MESSAGE_H #define __EPP_EXT_MESSAGE_H /** @file epp_ExtMessage.h * @brief Definition of epp_ExtMessage and epp_ExtMessage_ref * @author Daniel Manley */ #include "epp_eppdata.h" #include "epp_ResultValue.h" namespace eppobject { namespace epp { /// Class containing elements used to describe success/failure of /// a command in server responses class epp_ExtMessage { public: epp_string_ref m_lang; /**< Text language of the reason message (iso639) */ epp_string_ref m_value; /**< The response message */ /// Null constructor epp_ExtMessage() {}; /// Destructor virtual ~epp_ExtMessage() {}; /// Constructor, using simple types when it can /// @note Cannot set simple types to NULL epp_ExtMessage(const epp_string & _m_lang, const epp_string & _m_value) { m_lang.ref(new epp_string(_m_lang)); m_value.ref(new epp_string(_m_value)); }; /// Constructor, using only references epp_ExtMessage(const epp_string_ref & _m_lang, const epp_string_ref & _m_value) { m_lang = _m_lang; m_value = _m_value; }; }; /// Typedef for the ref to the epp_ExtMessage class typedef refcnt_ptr<epp_ExtMessage> epp_ExtMessage_ref; }} #endif --- NEW FILE: epp_ExtResultValue.h --- /************************************************************************ * EPP RTK C++ * Copyright (C) 2001, 2002 The Global Name Registry, Limited * * This library 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 library 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 library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Contact information: ep...@gn... * * EPP RTK * The Global Name Registry, Limited * 125 High Holborn * London WC1V 6QA * United Kingdom ************************************************************************/ #ifndef __EPP_EXT_RESULT_VALUE_H #define __EPP_EXT_RESULT_VALUE_H /** @file epp_ExtResultValue.h * @brief Definition of epp_ExtResultValue and epp_ExtResultValue_ref * @author Daniel Manley */ #include "epp_eppdata.h" #include "epp_ResultValue.h" namespace eppobject { namespace epp { /// Class containing elements used to describe success/failure of /// a command in server responses class epp_ExtResultValue { public: epp_ResultValue_ref m_value; /**< The xml element from the request which caused the error */ epp_string_ref m_reason; /**< The free text reason for the error */ /// Null constructor epp_ExtResultValue() {}; /// Destructor virtual ~epp_ExtResultValue() {}; /// Constructor, using simple types when it can /// @note Cannot set simple types to NULL epp_ExtResultValue(const epp_ResultValue & _m_value, const epp_string & _m_reason) { m_value.ref(new epp_ResultValue(_m_value)); m_reason.ref(new epp_string(_m_reason)); }; /// Constructor, using only references epp_ExtResultValue(const epp_ResultValue_ref & _m_value, const epp_string_ref & _m_reason) { m_value = _m_value; m_reason = _m_reason; }; }; /// Typedef for the ref to the epp_ExtResultValue class typedef refcnt_ptr<epp_ExtResultValue> epp_ExtResultValue_ref; }} #endif --- NEW FILE: epp_HostPanData.cc --- /************************************************************************ * EPP RTK C++ * Copyright (C) 2001, 2002 The Global Name Registry, Limited * * This library 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 library 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 library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Contact information: ep...@gn... * * EPP RTK * The Global Name Registry, Limited * 125 High Holborn * London WC1V 6QA * United Kingdom ************************************************************************/ /** @file epp_HostPanData.cc * @brief Additional definitions for epp_HostPanData * @author Asbjorn Steira Mikkelsen * @see epp_HostPanData.h */ #include <domtools/dom_wrapper.h> #include "epp_HostPanData.h" #include "epp_hostXMLbase.h" #include "epp_XMLException.h" using namespace std; using namespace eppobject::host; using namespace eppobject::epp; using namespace domtools; epp_PollResData_ref epp_HostPanData::createPollResData(const dom_ptr & panNode) { epp_HostPanData_ref domt(new epp_HostPanData()); if(!panNode->isNull()) { dom_ptr DPDChildNode = dom_ptr(panNode->getFirstChildElement()); string elemPrefix = panNode->getPrefix(); while(!DPDChildNode->isNull()) { string nodeName = DPDChildNode->getNodeName(); if(nodeName == string(elemPrefix + ":name")) { domt->m_name.ref(new epp_string(DPDChildNode->getNodeData())); // cout << "name: " << *domt->m_name << endl; string result = DPDChildNode->getAttribute("paResult"); // cout << "result: " << result << endl; if(result == "1") domt->m_result.ref(new epp_boolean(true)); else if(result == "0") domt->m_result.ref(new epp_boolean(false)); else throw epp_XMLException(__FILE__, __LINE__, "Empty or unknown result-attribute in host:panData"); } // if "name" else if(nodeName == string(elemPrefix + ":paTRID")) { domt->m_trid.ref(new epp_TransID()); dom_ptr trIDChildNode = dom_ptr(DPDChildNode->getFirstChildElement()); while(!trIDChildNode->isNull()) { string trIDNodeName = trIDChildNode->getNodeName(); if(trIDNodeName == "svTRID") { domt->m_trid->m_server_trid.ref(new epp_trid(trIDChildNode->getNodeData())); // cout << "svTRID: " << *res->m_trans_id->m_server_trid << endl; } else if(trIDNodeName == "clTRID") { domt->m_trid->m_client_trid.ref(new epp_trid(trIDChildNode->getNodeData())); // cout << "clTRID: " << *res->m_trans_id->m_client_trid << endl; } trIDChildNode = dom_ptr(trIDChildNode->getNextSiblingElement()); } // while "trIDChildNode" } // if "paTRID" else if(nodeName == string(elemPrefix + ":paDate")) { domt->m_date.ref(new epp_datetime(DPDChildNode->getNodeData())); // cout << "paDate: " << *domt->m_expiration_date << endl; } // if "paDate" DPDChildNode = dom_ptr(DPDChildNode->getNextSiblingElement()); } // while "DTChildNode" } // if "panNode" return domt; } // createPollResData --- NEW FILE: epp_HostPanData.h --- /************************************************************************ * EPP RTK C++ * Copyright (C) 2001, 2002 The Global Name Registry, Limited * * This library 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 library 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 library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Contact information: ep...@gn... * * EPP RTK * The Global Name Registry, Limited * 125 High Holborn * London WC1V 6QA * United Kingdom ************************************************************************/ #ifndef __EPP_HOSTPANDATA_H #define __EPP_HOSTPANDATA_H /** @file epp_HostPanData.h * @brief Definition of epp_HostPanData and epp_HostPanData_ref * @author Asbjorn Steira Mikkelsen */ #include "epp_eppdata.h" #include "epp_PollResData.h" #include "epp_TransID.h" namespace eppobject { namespace host { /// Class containing elements describing a host transfer. /// @see epp_PollResData for additional information class epp_HostPanData : public eppobject::epp::epp_PollResData { public: eppobject::epp::epp_string_ref m_name; /**< Fully qualified name of the host object */ eppobject::epp::epp_boolean_ref m_result; /**< */ eppobject::epp::epp_TransID_ref m_trid; /**< The TRID from the request which submitted this pending action */ eppobject::epp::epp_datetime_ref m_date; /**< Date and time the pending action was completed (to success or failure) */ /// Null constructor, setting #m_type epp_HostPanData() { m_type = "host:panData"; }; /// Destructor virtual ~epp_HostPanData() {} /// Constructor, using simple types when it can, setting #m_type /// @note Cannot set simple types to NULL epp_HostPanData(const eppobject::epp::epp_string & _m_name, const eppobject::epp::epp_boolean & _m_result, const eppobject::epp::epp_TransID & _m_trid, const eppobject::epp::epp_datetime & _m_date) { m_type = "host:panData"; m_name.ref(new eppobject::epp::epp_string(_m_name)); m_result.ref(new eppobject::epp::epp_boolean(_m_result)); m_trid.ref(new eppobject::epp::epp_TransID(_m_trid)); m_date.ref(new eppobject::epp::epp_datetime(_m_date)); }; /// Constructor, using only references, setting #m_type epp_HostPanData(const eppobject::epp::epp_string_ref & _m_name, const eppobject::epp::epp_boolean_ref & _m_result, const eppobject::epp::epp_TransID_ref & _m_trid, const eppobject::epp::epp_datetime_ref & _m_date) { m_type = "host:panData"; m_name = _m_name; m_result = _m_result; m_trid = _m_trid; m_date = _m_date; }; /// Returns the type of object /// @return Type of epp_PollResData object eppobject::epp::epp_string getType() { return m_type; }; /** Parses a trnData dom_ptr, fills in the public attributes of this class, * and returns a ref to an #epp_PollResData object that is really an * epp_HostPanData object * @param trnNode The trnData dom_ptr node * @return The corresponding epp_HostPanData object */ eppobject::epp::epp_PollResData_ref createPollResData(const domtools::dom_ptr & trnNode); }; /// Typedef for the ref to the epp_HostPanData class typedef refcnt_ptr<epp_HostPanData> epp_HostPanData_ref; /// Creates a pointer to an epp_HostPanData-object and returns it /// as an epp_PollResData pointer /// @return Pointer to an epp_HostPanData object static eppobject::epp::epp_PollResData * createHostPollResData() { return new epp_HostPanData(); } }} #endif --- NEW FILE: epp_ResultValue.h --- /************************************************************************ * EPP RTK C++ * Copyright (C) 2001, 2002 The Global Name Registry, Limited * * This library 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 library 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 library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Contact information: ep...@gn... * * EPP RTK * The Global Name Registry, Limited * 125 High Holborn * London WC1V 6QA * United Kingdom ************************************************************************/ #ifndef __EPP_RESULT_VALUE_H #define __EPP_RESULT_VALUE_H /** @file epp_ResultValue.h * @brief Definition of epp_ResultValue and epp_ResultValue_ref * @author Daniel Manley */ #include "epp_eppdata.h" namespace eppobject { namespace epp { /// Class containing elements used to describe success/failure of /// a command in server responses class epp_ResultValue { public: epp_string_ref m_namespace; /**< Client-provided values that caused server error conditions */ epp_xml_string_ref m_xml_string; /**< Human-readable description of the response code */ epp_string_ref m_element_name; /**< Language of the human-readable response (iso639) */ epp_string_ref m_element_value; /**< ID to uniquely identify the message returned (used for the Poll command) */ /// Null constructor epp_ResultValue() {}; /// Destructor virtual ~epp_ResultValue() {}; /// Constructor, using simple types when it can /// @note Cannot set simple types to NULL epp_ResultValue(const epp_string & _m_namespace, const epp_xml_string & _m_xml_string, const epp_string & _m_element_name, const epp_string & _m_element_value) { m_namespace.ref(new epp_string(_m_namespace)); m_xml_string.ref(new epp_xml_string(_m_xml_string)); m_element_name.ref(new epp_string(_m_element_name)); m_element_value.ref(new epp_string(_m_element_value)); }; /// Constructor, using only references epp_ResultValue(const epp_string_ref & _m_namespace, const epp_xml_string_ref & _m_xml_string, const epp_string_ref & _m_element_name, const epp_string_ref & _m_element_value) { m_namespace = _m_namespace; m_xml_string = _m_xml_string; m_element_name = _m_element_name; m_element_value = _m_element_value; }; }; /// Typedef for the ref to the epp_ResultValue class typedef refcnt_ptr<epp_ResultValue> epp_ResultValue_ref; }} #endif --- NEW FILE: epp_dcpExpiry.h --- /************************************************************************ * EPP RTK C++ * Copyright (C) 2001, 2002 The Global Name Registry, Limited * * This library 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 library 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 library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Contact information: ep...@gn... * * EPP RTK * The Global Name Registry, Limited * 125 High Holborn * London WC1V 6QA * United Kingdom ************************************************************************/ #ifndef __EPP_DCP_EXPIRY_H #define __EPP_DCP_EXPIRY_H /** @file epp_dcpExpiry.h * @brief Definition of epp_dcpExpiry and epp_dcpExpiry_ref * @author Daniel Manley */ #include "epp_eppdata.h" #include "epp_ResultValue.h" namespace eppobject { namespace epp { /// Class containing elements used to describe success/failure of /// a command in server responses class epp_dcpExpiry { public: epp_dcpExpiryType_ref m_type; /**< The DCP expiry type */ epp_string_ref m_value; /**< The expiry date of the DCP -- there is not strict format for this field */ /// Null constructor epp_dcpExpiry() {}; /// Destructor virtual ~epp_dcpExpiry() {}; /// Constructor, using simple types when it can /// @note Cannot set simple types to NULL epp_dcpExpiry(const epp_dcpExpiryType & _m_type, const epp_string & _m_value) { m_type.ref(new epp_dcpExpiryType(_m_type)); m_value.ref(new epp_string(_m_value)); }; /// Constructor, using only references epp_dcpExpiry(const epp_dcpExpiryType & _m_type, const epp_string_ref & _m_value) { m_type = _m_type; m_value = _m_value; }; }; /// Typedef for the ref to the epp_dcpExpiry class typedef refcnt_ptr<epp_dcpExpiry> epp_dcpExpiry_ref; }} #endif --- NEW FILE: epp_dcpRecipient.h --- /************************************************************************ * EPP RTK C++ * Copyright (C) 2001, 2002 The Global Name Registry, Limited * * This library 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 library 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 library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Contact information: ep...@gn... * * EPP RTK * The Global Name Registry, Limited * 125 High Holborn * London WC1V 6QA * United Kingdom ************************************************************************/ #ifndef __EPP_DCP_RECIPIENT_H #define __EPP_DCP_RECIPIENT_H /** @file epp_dcpRecipient.h * @brief Definition of epp_dcpRecipient and epp_dcpRecipient_ref * @author Daniel Manley */ #include "epp_eppdata.h" namespace eppobject { namespace epp { /// Class containing elements used to describe success/failure of /// a command in server responses class epp_dcpRecipient { public: epp_dcpRecipientType_ref m_type; /**< The recipient type */ epp_string_ref m_rec_desc; /**< The description of the "ours" recipient */ /// Null constructor epp_dcpRecipient() {}; /// Destructor virtual ~epp_dcpRecipient() {}; /// Constructor, using simple types when it can /// @note Cannot set simple types to NULL epp_dcpRecipient(const epp_dcpRecipientType & _m_type, const epp_string & _m_rec_desc) { m_type.ref(new epp_dcpRecipientType(_m_type)); m_rec_desc.ref(new epp_string(_m_rec_desc)); }; /// Constructor, using only references epp_dcpRecipient(const epp_dcpRecipientType & _m_type, const epp_string_ref & _m_rec_desc) { m_type = _m_type; m_rec_desc = _m_rec_desc; }; }; /// Typedef for the ref to the epp_dcpRecipient class typedef refcnt_ptr<epp_dcpRecipient> epp_dcpRecipient_ref; }} #endif Index: Makefile.am =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.am 29 Apr 2003 20:59:42 -0000 1.4 --- Makefile.am 13 May 2003 22:55:51 -0000 1.5 *************** *** 15,18 **** --- 15,19 ---- epp_ContactInfoRsp.h \ epp_ContactNameAddress.h \ + epp_ContactPanData.h \ epp_ContactPhone.h \ epp_ContactStatus.h \ *************** *** 25,29 **** epp_ContactUpdateRsp.h \ epp_ContactVoice.h \ - epp_Credentials.h \ epp_DataCollectionPolicy.h \ epp_DomainCheckReq.h \ --- 26,29 ---- *************** *** 36,39 **** --- 36,40 ---- epp_DomainInfoReq.h \ epp_DomainInfoRsp.h \ + epp_DomainPanData.h \ epp_DomainPeriod.h \ epp_DomainRenewReq.h \ *************** *** 48,51 **** --- 49,54 ---- epp_DomainUpdateRsp.h \ epp_Exception.h \ + epp_ExtMessage.h \ + epp_ExtResultValue.h \ epp_GenericCheckRsp.h \ epp_GenericReq.h \ *************** *** 61,64 **** --- 64,68 ---- epp_HostInfoReq.h \ epp_HostInfoRsp.h \ + epp_HostPanData.h \ epp_HostStatus.h \ epp_HostUpdateAddRemove.h \ *************** *** 82,85 **** --- 86,90 ---- epp_Result.h \ epp_ResultData.h \ + epp_ResultValue.h \ epp_Service.h \ epp_ServiceMenu.h \ *************** *** 89,92 **** --- 94,99 ---- epp_contactXMLbase.h \ epp_contactdata.h \ + epp_dcpExpiry.h \ + epp_dcpRecipient.h \ epp_dcpStatement.h \ epp_domainXMLbase.h \ *************** *** 101,106 **** --- 108,116 ---- libdata_a_SOURCES = \ + epp_ContactPanData.cc \ epp_ContactTrnData.cc \ + epp_DomainPanData.cc \ epp_DomainTrnData.cc \ + epp_HostPanData.cc \ epp_PollResFactory.cc \ epp_contactXMLbase.cc \ Index: epp_Command.h =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_Command.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** epp_Command.h 17 Jul 2002 13:37:30 -0000 1.10 --- epp_Command.h 13 May 2003 22:55:51 -0000 1.11 *************** *** 36,41 **** #include "epp_eppdata.h" - #include "epp_Credentials.h" #include "../epp_Extension.h" namespace eppobject { namespace epp { --- 36,41 ---- #include "epp_eppdata.h" #include "../epp_Extension.h" + #include "epp_Credentials.h" namespace eppobject { namespace epp { *************** *** 45,50 **** public: ! epp_Credentials_ref m_creds; /**< Client identity credentials element that provides client identity information */ ! epp_Extension_ref m_ext; /**< Extension element used for server-defined command extensions */ epp_trid_ref m_client_trid; /**< Client transaction ID element that uniquely identifies the command to the client */ --- 45,49 ---- public: ! epp_extension_seq_ref m_extentions; /**< Extension elements used for server-defined command extensions */ epp_trid_ref m_client_trid; /**< Client transaction ID element that uniquely identifies the command to the client */ *************** *** 57,76 **** /// Constructor, using simple types when it can /// @note Cannot set simple types to NULL epp_Command(const epp_Credentials_ref & _m_creds, const epp_Extension_ref & _m_ext, const epp_trid & _m_client_trid) { ! m_creds = _m_creds; ! m_ext = _m_ext; m_client_trid.ref(new epp_trid(_m_client_trid)); }; /// Constructor, using only references epp_Command(const epp_Credentials_ref & _m_creds, const epp_Extension_ref & _m_ext, const epp_trid_ref & _m_client_trid) { ! m_creds = _m_creds; ! m_ext = _m_ext; m_client_trid = _m_client_trid; }; --- 56,97 ---- /// Constructor, using simple types when it can /// @note Cannot set simple types to NULL + /// @deprecated Credentials are no longer present epp_Command(const epp_Credentials_ref & _m_creds, const epp_Extension_ref & _m_ext, const epp_trid & _m_client_trid) { ! m_extentions = new(epp_extension_seq); ! epp_Extension ext(*_m_ext); ! m_extentions->push_back(ext); m_client_trid.ref(new epp_trid(_m_client_trid)); }; /// Constructor, using only references + /// @deprecated Credentials are no longer present epp_Command(const epp_Credentials_ref & _m_creds, const epp_Extension_ref & _m_ext, const epp_trid_ref & _m_client_trid) { ! m_extentions = new(epp_extension_seq); ! epp_Extension ext(*_m_ext); ! m_extentions->push_back(ext); ! m_client_trid = _m_client_trid; ! }; ! ! ! /// Constructor, using simple types when it can ! /// @note Cannot set simple types to NULL ! epp_Command(const epp_extension_seq_ref & _m_extentions, ! const epp_trid & _m_client_trid) ! { ! m_extentions = _m_extentions; ! m_client_trid.ref(new epp_trid(_m_client_trid)); ! }; ! ! /// Constructor, using only references ! epp_Command(const epp_extension_seq_ref & _m_extentions, ! const epp_trid_ref & _m_client_trid) ! { ! m_extentions = _m_extentions; m_client_trid = _m_client_trid; }; Index: epp_ContactTrnData.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_ContactTrnData.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** epp_ContactTrnData.cc 28 Apr 2003 20:50:44 -0000 1.3 --- epp_ContactTrnData.cc 13 May 2003 22:55:51 -0000 1.4 *************** *** 42,46 **** using namespace domtools; ! eppobject::epp::epp_PollResData_ref epp_ContactTrnData::createTrnData(const domtools::dom_ptr & trnNode) { epp_ContactTrnData_ref cont(new epp_ContactTrnData()); --- 42,46 ---- using namespace domtools; ! epp_PollResData_ref epp_ContactTrnData::createPollResData(const dom_ptr & trnNode) { epp_ContactTrnData_ref cont(new epp_ContactTrnData()); Index: epp_ContactTrnData.h =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_ContactTrnData.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** epp_ContactTrnData.h 17 Jul 2002 13:18:47 -0000 1.3 --- epp_ContactTrnData.h 13 May 2003 22:55:51 -0000 1.4 *************** *** 110,114 **** * @return The corresponding epp_ContactTrnData object */ ! eppobject::epp::epp_PollResData_ref createTrnData(const domtools::dom_ptr & trnNode); }; --- 110,114 ---- * @return The corresponding epp_ContactTrnData object */ ! eppobject::epp::epp_PollResData_ref createPollResData(const domtools::dom_ptr & trnNode); }; Index: epp_DataCollectionPolicy.h =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_DataCollectionPolicy.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** epp_DataCollectionPolicy.h 17 Jul 2002 13:37:30 -0000 1.3 --- epp_DataCollectionPolicy.h 13 May 2003 22:55:51 -0000 1.4 *************** *** 36,39 **** --- 36,40 ---- #include "epp_eppdata.h" #include "epp_dcpStatement.h" + #include "epp_dcpExpiry.h" namespace eppobject { namespace epp { *************** *** 46,49 **** --- 47,51 ---- epp_dcpAccessType_ref m_access; /**< Describes access provided by the server to data received from the client */ epp_dcpStatement_seq_ref m_statements; /**< Describes data collection purposes, data recipients, and data retention */ + epp_dcpExpiry_ref m_expiry; /**< The date of expiration of the DCP */ /// Null constructor *************** *** 55,62 **** /// Constructor, using only references epp_DataCollectionPolicy(const epp_dcpAccessType_ref & _m_access, ! const epp_dcpStatement_seq_ref & _m_statements) { m_access = _m_access; m_statements = _m_statements; }; }; --- 57,66 ---- /// Constructor, using only references epp_DataCollectionPolicy(const epp_dcpAccessType_ref & _m_access, ! const epp_dcpStatement_seq_ref & _m_statements, ! const epp_dcpExpiry_ref & _m_expiry) { m_access = _m_access; m_statements = _m_statements; + m_expiry = _m_expiry; }; }; Index: epp_DomainInfoReq.h =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_DomainInfoReq.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** epp_DomainInfoReq.h 17 Jul 2002 13:11:21 -0000 1.11 --- epp_DomainInfoReq.h 13 May 2003 22:55:51 -0000 1.12 *************** *** 36,39 **** --- 36,40 ---- #include "epp_domaindata.h" #include "epp_GenericReq.h" + #include "epp_AuthInfo.h" namespace eppobject { namespace domain { *************** *** 46,49 **** --- 47,51 ---- eppobject::epp::epp_string_ref m_name; /**< Fully qualified name of the domain object to be queried */ epp_DomainHostsType_ref m_hosts_type; /**< Used to control return of information describing hosts related to the domain object */ + eppobject::epp::epp_AuthInfo_ref m_auth_info; /**< Optional auto info to test the value at the server */ /// Null constructor *************** *** 57,65 **** epp_DomainInfoReq(const eppobject::epp::epp_Command_ref & _m_cmd, const eppobject::epp::epp_string & _m_name, ! const epp_DomainHostsType_ref & _m_hosts_type) : epp::epp_GenericReq(_m_cmd) { m_name.ref(new eppobject::epp::epp_string(_m_name)); m_hosts_type = _m_hosts_type; }; --- 59,69 ---- epp_DomainInfoReq(const eppobject::epp::epp_Command_ref & _m_cmd, const eppobject::epp::epp_string & _m_name, ! const epp_DomainHostsType_ref & _m_hosts_type, ! const eppobject::epp::epp_AuthInfo_ref & _m_auth_info = NULL) : epp::epp_GenericReq(_m_cmd) { m_name.ref(new eppobject::epp::epp_string(_m_name)); m_hosts_type = _m_hosts_type; + m_auth_info = _m_auth_info; }; *************** *** 67,75 **** epp_DomainInfoReq(const eppobject::epp::epp_Command_ref & _m_cmd, const eppobject::epp::epp_string_ref & _m_name, ! const epp_DomainHostsType_ref & _m_hosts_type) : epp::epp_GenericReq(_m_cmd) { m_name = _m_name; m_hosts_type = _m_hosts_type; }; }; --- 71,81 ---- epp_DomainInfoReq(const eppobject::epp::epp_Command_ref & _m_cmd, const eppobject::epp::epp_string_ref & _m_name, ! const epp_DomainHostsType_ref & _m_hosts_type, ! const eppobject::epp::epp_AuthInfo_ref & _m_auth_info = NULL) : epp::epp_GenericReq(_m_cmd) { m_name = _m_name; m_hosts_type = _m_hosts_type; + m_auth_info = _m_auth_info; }; }; Index: epp_DomainTrnData.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_DomainTrnData.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** epp_DomainTrnData.cc 28 Apr 2003 20:50:46 -0000 1.4 --- epp_DomainTrnData.cc 13 May 2003 22:55:51 -0000 1.5 *************** *** 42,46 **** using namespace domtools; ! eppobject::epp::epp_PollResData_ref epp_DomainTrnData::createTrnData(const domtools::dom_ptr & trnNode) { epp_DomainTrnData_ref domt(new epp_DomainTrnData()); --- 42,46 ---- using namespace domtools; ! eppobject::epp::epp_PollResData_ref epp_DomainTrnData::createPollResData(const domtools::dom_ptr & trnNode) { epp_DomainTrnData_ref domt(new epp_DomainTrnData()); *************** *** 97,99 **** return domt; ! } // createTrnData --- 97,99 ---- return domt; ! } // createPollResData Index: epp_DomainTrnData.h =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_DomainTrnData.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** epp_DomainTrnData.h 17 Jul 2002 13:11:21 -0000 1.4 --- epp_DomainTrnData.h 13 May 2003 22:55:51 -0000 1.5 *************** *** 117,121 **** * @return The corresponding epp_DomainTrnData object */ ! eppobject::epp::epp_PollResData_ref createTrnData(const domtools::dom_ptr & trnNode); }; --- 117,121 ---- * @return The corresponding epp_DomainTrnData object */ ! eppobject::epp::epp_PollResData_ref createPollResData(const domtools::dom_ptr & trnNode); }; Index: epp_Exception.h =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_Exception.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** epp_Exception.h 28 Apr 2003 20:50:50 -0000 1.10 --- epp_Exception.h 13 May 2003 22:55:51 -0000 1.11 *************** *** 51,55 **** epp_result_seq_ref m_details; /**< Object describing the encountered error(s) */ epp_TransID_ref m_trans_id; /**< Transaction identifier assigned by the server to the command */ ! epp_xml_string_ref m_ext_string; /**< Extension element used for server-defined response extensions */ /// Null constructor --- 51,55 ---- epp_result_seq_ref m_details; /**< Object describing the encountered error(s) */ epp_TransID_ref m_trans_id; /**< Transaction identifier assigned by the server to the command */ ! epp_xml_string_seq_ref m_ext_strings; /**< Extension elements used for server-defined response extensions */ /// Null constructor *************** *** 62,70 **** epp_Exception(const epp_result_seq_ref & _m_details, const epp_TransID_ref & _m_trans_id, ! const epp_xml_string_ref & _m_ext_string = epp_xml_string_ref(new epp_xml_string(""))) { m_details = _m_details; m_trans_id = _m_trans_id; ! m_ext_string = _m_ext_string; }; --- 62,70 ---- epp_Exception(const epp_result_seq_ref & _m_details, const epp_TransID_ref & _m_trans_id, ! const epp_xml_string_seq_ref & _m_ext_strings = epp_xml_string_seq_ref(new epp_xml_string_seq)) { m_details = _m_details; m_trans_id = _m_trans_id; ! m_ext_strings = _m_ext_strings; }; Index: epp_LoginReq.h =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_LoginReq.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** epp_LoginReq.h 17 Jul 2002 13:44:48 -0000 1.11 --- epp_LoginReq.h 13 May 2003 22:55:51 -0000 1.12 *************** *** 36,39 **** --- 36,40 ---- #include "epp_eppdata.h" #include "epp_GenericReq.h" + #include "epp_Options.h" namespace eppobject { namespace epp { *************** *** 44,47 **** --- 45,52 ---- public: + epp_string_ref m_client_id; /**< Client identifier assigned to the client by the server */ + epp_string_ref m_password; /**< Client plain text password */ + epp_string_ref m_new_password; /**< New client plain text password */ + epp_Options_ref m_options; /**< Client options for the command/session */ epp_objuri_seq_ref m_services; /**< Namespace URIs representing the objects to be managed during the session */ epp_exturi_seq_ref m_extensions; /**< Namespace URIs representing object extensions to be managed during the session */ *************** *** 55,62 **** --- 60,75 ---- /// Constructor, using only references epp_LoginReq(const epp_Command_ref & _m_cmd, + const epp_string_ref & _m_client_id, + const epp_string_ref & _m_password, + const epp_string_ref & _m_new_password, + const epp_Options_ref & _m_options, const epp_objuri_seq_ref & _m_services, const epp_exturi_seq_ref & _m_extensions) : epp_GenericReq(_m_cmd) { + m_client_id = _m_client_id; + m_password = _m_password; + m_new_password = _m_new_password; + m_options = _m_options; m_services = _m_services; m_extensions = _m_extensions; Index: epp_LogoutReq.h =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_LogoutReq.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** epp_LogoutReq.h 17 Jul 2002 13:44:48 -0000 1.9 --- epp_LogoutReq.h 13 May 2003 22:55:51 -0000 1.10 *************** *** 43,47 **** public: ! epp_Extension_ref m_ext; /**< Extension element used for server-defined command extensions */ epp_trid_ref m_client_trid; /**< Client transaction ID element that uniquely identifies the command to the client */ --- 43,47 ---- public: ! epp_extension_seq_ref m_extensions; /**< Extension elements used for server-defined command extensions */ epp_trid_ref m_client_trid; /**< Client transaction ID element that uniquely identifies the command to the client */ *************** *** 54,69 **** /// Constructor, using simple types when it can /// @note Cannot set simple types to NULL epp_LogoutReq(const epp_Extension_ref & _m_ext, const epp_trid & _m_client_trid) { ! m_ext = _m_ext; m_client_trid.ref(new epp_trid(_m_client_trid)); }; /// Constructor, using only references epp_LogoutReq(const epp_Extension_ref & _m_ext, const epp_trid_ref & _m_client_trid) { ! m_ext = _m_ext; m_client_trid = _m_client_trid; }; --- 54,92 ---- /// Constructor, using simple types when it can /// @note Cannot set simple types to NULL + /// @deprecated epp_LogoutReq(const epp_Extension_ref & _m_ext, const epp_trid & _m_client_trid) { ! m_extensions = new(epp_extension_seq); ! epp_Extension ext(*_m_ext); ! m_extensions->push_back(ext); m_client_trid.ref(new epp_trid(_m_client_trid)); }; /// Constructor, using only references + /// @deprecated epp_LogoutReq(const epp_Extension_ref & _m_ext, const epp_trid_ref & _m_client_trid) { ! m_extensions = new(epp_extension_seq); ! epp_Extension ext(*_m_ext); ! m_extensions->push_back(ext); ! m_client_trid = _m_client_trid; ! }; ! ! /// Constructor, using simple types when it can ! /// @note Cannot set simple types to NULL ! epp_LogoutReq(const epp_extension_seq_ref & _m_extensions, ! const epp_trid & _m_client_trid) ! { ! m_extensions = _m_extensions; ! m_client_trid.ref(new epp_trid(_m_client_trid)); ! }; ! ! /// Constructor, using only references ! epp_LogoutReq(const epp_extension_seq_ref & _m_extensions, ! const epp_trid_ref & _m_client_trid) ! { ! m_extensions = _m_extensions; m_client_trid = _m_client_trid; }; Index: epp_MessageQueue.h =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_MessageQueue.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** epp_MessageQueue.h 17 Jul 2002 13:44:48 -0000 1.4 --- epp_MessageQueue.h 13 May 2003 22:55:51 -0000 1.5 *************** *** 35,38 **** --- 35,39 ---- #include "epp_eppdata.h" + #include "epp_ExtMessage.h" namespace eppobject { namespace epp { *************** *** 44,47 **** --- 45,50 ---- epp_long_ref m_count; /**< Number of service messages queued for client retrieval */ epp_datetime_ref m_queue_date; /**< Date and time that a particular message was enqueued */ + epp_ExtMessage_ref m_msg; /**< The actual queued message */ + ... [truncated message content] |
Update of /cvsroot/epp-rtk/epp-rtk/c++/src In directory sc8-pr-cvs1:/tmp/cvs-serv698 Modified Files: Makefile.am epp_ContactCheck.cc epp_ContactCreate.cc epp_ContactDelete.cc epp_ContactInfo.cc epp_ContactTransfer.cc epp_ContactUpdate.cc epp_DomainCheck.cc epp_DomainCreate.cc epp_DomainDelete.cc epp_DomainInfo.cc epp_DomainRenew.cc epp_DomainTransfer.cc epp_DomainUpdate.cc epp_HostCheck.cc epp_HostCreate.cc epp_HostDelete.cc epp_HostInfo.cc epp_HostUpdate.cc epp_Login.cc epp_Logout.cc epp_Poll.cc epp_Session.h main_contactcheck.cc main_contactcreate.cc main_contactdelete.cc main_contactinfo.cc main_contacttransfer.cc main_contactupdate.cc main_domainupdate.cc main_login.cc main_loginunspec.cc testTools.cc Log Message: committing compilable code for 07/05 -- now have to work out bugs : Modified Files: : Makefile.am epp_ContactCheck.cc epp_ContactCreate.cc : epp_ContactDelete.cc epp_ContactInfo.cc epp_ContactTransfer.cc : epp_ContactUpdate.cc epp_DomainCheck.cc epp_DomainCreate.cc : epp_DomainDelete.cc epp_DomainInfo.cc epp_DomainRenew.cc : epp_DomainTransfer.cc epp_DomainUpdate.cc epp_HostCheck.cc : epp_HostCreate.cc epp_HostDelete.cc epp_HostInfo.cc : epp_HostUpdate.cc epp_Login.cc epp_Logout.cc epp_Poll.cc : epp_Session.h main_contactcheck.cc main_contactcreate.cc : main_contactdelete.cc main_contactinfo.cc : main_contacttransfer.cc main_contactupdate.cc : main_domainupdate.cc main_login.cc main_loginunspec.cc : testTools.cc data/Makefile.am data/epp_Command.h : data/epp_ContactTrnData.cc data/epp_ContactTrnData.h : data/epp_DataCollectionPolicy.h data/epp_DomainInfoReq.h : data/epp_DomainTrnData.cc data/epp_DomainTrnData.h : data/epp_Exception.h data/epp_LoginReq.h data/epp_LogoutReq.h : data/epp_MessageQueue.h data/epp_PollResData.h : data/epp_Response.h data/epp_Result.h : data/epp_contactXMLbase.cc data/epp_contactdata.h : data/epp_dcpStatement.h data/epp_domainXMLbase.cc : data/epp_domaindata.h data/epp_eppXMLbase.cc : data/epp_eppXMLbase.h data/epp_eppdata.h : data/epp_hostXMLbase.cc data/epp_hostdata.h : Added Files: : data/epp_ContactPanData.cc data/epp_ContactPanData.h : data/epp_DomainPanData.cc data/epp_DomainPanData.h : data/epp_ExtMessage.h data/epp_ExtResultValue.h : data/epp_HostPanData.cc data/epp_HostPanData.h : data/epp_ResultValue.h data/epp_dcpExpiry.h : data/epp_dcpRecipient.h Index: Makefile.am =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile.am 29 Apr 2003 20:59:39 -0000 1.9 --- Makefile.am 13 May 2003 22:55:50 -0000 1.10 *************** *** 9,13 **** domaininfo domainrenew domaintransfer domainupdate \ hostcheck hostcreate hostdelete hostinfo hostupdate \ ! loginunspec status exportedheaders = \ --- 9,13 ---- domaininfo domainrenew domaintransfer domainupdate \ hostcheck hostcreate hostdelete hostinfo hostupdate \ ! loginunspec exportedheaders = \ *************** *** 78,82 **** epp_HostInfo.cc \ epp_HostUpdate.cc \ ! epp_Login.cc \ epp_Logout.cc \ epp_Poll.cc \ --- 78,82 ---- epp_HostInfo.cc \ epp_HostUpdate.cc \ ! epp_Login.cc \ epp_Logout.cc \ epp_Poll.cc \ *************** *** 154,155 **** --- 154,156 ---- loginunspec_SOURCES = \ main_loginunspec.cc $(common) + Index: epp_ContactCheck.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_ContactCheck.cc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** epp_ContactCheck.cc 28 Apr 2003 20:50:09 -0000 1.10 --- epp_ContactCheck.cc 13 May 2003 22:55:50 -0000 1.11 *************** *** 63,68 **** xml_request.beginTag("command"); - addCredsElement(xml_request,m_request->m_cmd->m_creds); - xml_request.beginTag("check"); --- 63,66 ---- *************** *** 81,85 **** xml_request.endTag("check"); ! addExtensionElement(xml_request, m_request->m_cmd->m_ext); if(m_request->m_cmd->m_client_trid != NULL) { --- 79,83 ---- xml_request.endTag("check"); ! addExtensionElements(xml_request, m_request->m_cmd->m_extentions); if(m_request->m_cmd->m_client_trid != NULL) { Index: epp_ContactCreate.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_ContactCreate.cc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** epp_ContactCreate.cc 28 Apr 2003 20:50:10 -0000 1.11 --- epp_ContactCreate.cc 13 May 2003 22:55:50 -0000 1.12 *************** *** 64,69 **** xml_request.beginTag("command"); - addCredsElement(xml_request,m_request->m_cmd->m_creds); - xml_request.beginTag("create"); --- 64,67 ---- *************** *** 125,129 **** xml_request.endTag("create"); ! addExtensionElement(xml_request, m_request->m_cmd->m_ext); if(m_request->m_cmd->m_client_trid != NULL) { --- 123,127 ---- xml_request.endTag("create"); ! addExtensionElements(xml_request, m_request->m_cmd->m_extentions); if(m_request->m_cmd->m_client_trid != NULL) { Index: epp_ContactDelete.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_ContactDelete.cc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** epp_ContactDelete.cc 28 Apr 2003 20:50:10 -0000 1.11 --- epp_ContactDelete.cc 13 May 2003 22:55:50 -0000 1.12 *************** *** 64,69 **** xml_request.beginTag("command"); - addCredsElement(xml_request,m_request->m_cmd->m_creds); - xml_request.beginTag("delete"); xml_request.beginTag("contact:delete"); --- 64,67 ---- *************** *** 76,80 **** xml_request.endTag("delete"); ! addExtensionElement(xml_request, m_request->m_cmd->m_ext); if(m_request->m_cmd->m_client_trid != NULL) { --- 74,78 ---- xml_request.endTag("delete"); ! addExtensionElements(xml_request, m_request->m_cmd->m_extentions); if(m_request->m_cmd->m_client_trid != NULL) { Index: epp_ContactInfo.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_ContactInfo.cc,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** epp_ContactInfo.cc 28 Apr 2003 20:50:11 -0000 1.14 --- epp_ContactInfo.cc 13 May 2003 22:55:50 -0000 1.15 *************** *** 63,68 **** xml_request.beginTag("command"); - addCredsElement(xml_request,m_request->m_cmd->m_creds); - xml_request.beginTag("info"); xml_request.beginTag("contact:info"); --- 63,66 ---- *************** *** 75,79 **** xml_request.endTag("info"); ! addExtensionElement(xml_request, m_request->m_cmd->m_ext); if(m_request->m_cmd->m_client_trid != NULL) { --- 73,77 ---- xml_request.endTag("info"); ! addExtensionElements(xml_request, m_request->m_cmd->m_extentions); if(m_request->m_cmd->m_client_trid != NULL) { Index: epp_ContactTransfer.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_ContactTransfer.cc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** epp_ContactTransfer.cc 28 Apr 2003 20:50:12 -0000 1.11 --- epp_ContactTransfer.cc 13 May 2003 22:55:50 -0000 1.12 *************** *** 66,71 **** xml_request.beginTag("command"); - addCredsElement(xml_request,m_request->m_cmd->m_creds); - xml_request.beginTag("transfer"); --- 66,69 ---- *************** *** 87,91 **** xml_request.endTag("transfer"); ! addExtensionElement(xml_request, m_request->m_cmd->m_ext); if(m_request->m_cmd->m_client_trid != NULL) { --- 85,89 ---- xml_request.endTag("transfer"); ! addExtensionElements(xml_request, m_request->m_cmd->m_extentions); if(m_request->m_cmd->m_client_trid != NULL) { Index: epp_ContactUpdate.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_ContactUpdate.cc,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** epp_ContactUpdate.cc 28 Apr 2003 20:50:12 -0000 1.12 --- epp_ContactUpdate.cc 13 May 2003 22:55:50 -0000 1.13 *************** *** 64,69 **** xml_request.beginTag("command"); - addCredsElement(xml_request,m_request->m_cmd->m_creds); - xml_request.beginTag("update"); xml_request.beginTag("contact:update"); --- 64,67 ---- *************** *** 80,84 **** xml_request.endTag("update"); ! addExtensionElement(xml_request, m_request->m_cmd->m_ext); if(m_request->m_cmd->m_client_trid != NULL) { --- 78,82 ---- xml_request.endTag("update"); ! addExtensionElements(xml_request, m_request->m_cmd->m_extentions); if(m_request->m_cmd->m_client_trid != NULL) { Index: epp_DomainCheck.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_DomainCheck.cc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** epp_DomainCheck.cc 28 Apr 2003 20:50:12 -0000 1.10 --- epp_DomainCheck.cc 13 May 2003 22:55:50 -0000 1.11 *************** *** 63,68 **** xml_request.beginTag("command"); - addCredsElement(xml_request,m_request->m_cmd->m_creds); - xml_request.beginTag("check"); --- 63,66 ---- *************** *** 81,85 **** xml_request.endTag("check"); ! addExtensionElement(xml_request, m_request->m_cmd->m_ext); if(m_request->m_cmd->m_client_trid != NULL) { --- 79,83 ---- xml_request.endTag("check"); ! addExtensionElements(xml_request, m_request->m_cmd->m_extentions); if(m_request->m_cmd->m_client_trid != NULL) { Index: epp_DomainCreate.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_DomainCreate.cc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** epp_DomainCreate.cc 28 Apr 2003 20:50:13 -0000 1.11 --- epp_DomainCreate.cc 13 May 2003 22:55:50 -0000 1.12 *************** *** 64,69 **** xml_request.beginTag("command"); - addCredsElement(xml_request,m_request->m_cmd->m_creds); - xml_request.beginTag("create"); xml_request.beginTag("domain:create"); --- 64,67 ---- *************** *** 127,131 **** xml_request.endTag("create"); ! addExtensionElement(xml_request, m_request->m_cmd->m_ext); if(m_request->m_cmd->m_client_trid != NULL) { --- 125,129 ---- xml_request.endTag("create"); ! addExtensionElements(xml_request, m_request->m_cmd->m_extentions); if(m_request->m_cmd->m_client_trid != NULL) { Index: epp_DomainDelete.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_DomainDelete.cc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** epp_DomainDelete.cc 28 Apr 2003 20:50:13 -0000 1.11 --- epp_DomainDelete.cc 13 May 2003 22:55:50 -0000 1.12 *************** *** 63,68 **** xml_request.beginTag("command"); - addCredsElement(xml_request,m_request->m_cmd->m_creds); - xml_request.beginTag("delete"); xml_request.beginTag("domain:delete"); --- 63,66 ---- *************** *** 75,79 **** xml_request.endTag("delete"); ! addExtensionElement(xml_request, m_request->m_cmd->m_ext); if(m_request->m_cmd->m_client_trid != NULL) { --- 73,77 ---- xml_request.endTag("delete"); ! addExtensionElements(xml_request, m_request->m_cmd->m_extentions); if(m_request->m_cmd->m_client_trid != NULL) { Index: epp_DomainInfo.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_DomainInfo.cc,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** epp_DomainInfo.cc 28 Apr 2003 20:50:14 -0000 1.12 --- epp_DomainInfo.cc 13 May 2003 22:55:50 -0000 1.13 *************** *** 63,68 **** xml_request.beginTag("command"); - addCredsElement(xml_request,m_request->m_cmd->m_creds); - xml_request.beginTag("info"); xml_request.beginTag("domain:info"); --- 63,66 ---- *************** *** 83,87 **** xml_request.endTag("info"); ! addExtensionElement(xml_request, m_request->m_cmd->m_ext); if(m_request->m_cmd->m_client_trid != NULL) { --- 81,85 ---- xml_request.endTag("info"); ! addExtensionElements(xml_request, m_request->m_cmd->m_extentions); if(m_request->m_cmd->m_client_trid != NULL) { Index: epp_DomainRenew.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_DomainRenew.cc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** epp_DomainRenew.cc 28 Apr 2003 20:50:14 -0000 1.11 --- epp_DomainRenew.cc 13 May 2003 22:55:50 -0000 1.12 *************** *** 65,70 **** xml_request.beginTag("command"); - addCredsElement(xml_request,m_request->m_cmd->m_creds); - xml_request.beginTag("renew"); xml_request.beginTag("domain:renew"); --- 65,68 ---- *************** *** 93,97 **** xml_request.endTag("renew"); ! addExtensionElement(xml_request, m_request->m_cmd->m_ext); if(m_request->m_cmd->m_client_trid != NULL) { --- 91,95 ---- xml_request.endTag("renew"); ! addExtensionElements(xml_request, m_request->m_cmd->m_extentions); if(m_request->m_cmd->m_client_trid != NULL) { Index: epp_DomainTransfer.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_DomainTransfer.cc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** epp_DomainTransfer.cc 28 Apr 2003 20:50:16 -0000 1.11 --- epp_DomainTransfer.cc 13 May 2003 22:55:50 -0000 1.12 *************** *** 67,72 **** xml_request.beginTag("command"); - addCredsElement(xml_request,m_request->m_cmd->m_creds); - xml_request.beginTag("transfer"); --- 67,70 ---- *************** *** 98,102 **** xml_request.endTag("transfer"); ! addExtensionElement(xml_request, m_request->m_cmd->m_ext); if(m_request->m_cmd->m_client_trid != NULL) { --- 96,100 ---- xml_request.endTag("transfer"); ! addExtensionElements(xml_request, m_request->m_cmd->m_extentions); if(m_request->m_cmd->m_client_trid != NULL) { Index: epp_DomainUpdate.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_DomainUpdate.cc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** epp_DomainUpdate.cc 28 Apr 2003 20:50:16 -0000 1.11 --- epp_DomainUpdate.cc 13 May 2003 22:55:50 -0000 1.12 *************** *** 63,68 **** xml_request.beginTag("command"); - addCredsElement(xml_request,m_request->m_cmd->m_creds); - xml_request.beginTag("update"); xml_request.beginTag("domain:update"); --- 63,66 ---- *************** *** 79,83 **** xml_request.endTag("update"); ! addExtensionElement(xml_request, m_request->m_cmd->m_ext); if(m_request->m_cmd->m_client_trid != NULL) { --- 77,81 ---- xml_request.endTag("update"); ! addExtensionElements(xml_request, m_request->m_cmd->m_extentions); if(m_request->m_cmd->m_client_trid != NULL) { Index: epp_HostCheck.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_HostCheck.cc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** epp_HostCheck.cc 28 Apr 2003 20:50:17 -0000 1.10 --- epp_HostCheck.cc 13 May 2003 22:55:50 -0000 1.11 *************** *** 63,68 **** xml_request.beginTag("command"); - addCredsElement(xml_request,m_request->m_cmd->m_creds); - xml_request.beginTag("check"); --- 63,66 ---- *************** *** 81,85 **** xml_request.endTag("check"); ! addExtensionElement(xml_request, m_request->m_cmd->m_ext); if(m_request->m_cmd->m_client_trid != NULL) { --- 79,83 ---- xml_request.endTag("check"); ! addExtensionElements(xml_request, m_request->m_cmd->m_extentions); if(m_request->m_cmd->m_client_trid != NULL) { Index: epp_HostCreate.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_HostCreate.cc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** epp_HostCreate.cc 28 Apr 2003 20:50:17 -0000 1.10 --- epp_HostCreate.cc 13 May 2003 22:55:50 -0000 1.11 *************** *** 63,68 **** xml_request.beginTag("command"); - addCredsElement(xml_request,m_request->m_cmd->m_creds); - xml_request.beginTag("create"); xml_request.beginTag("host:create"); --- 63,66 ---- *************** *** 92,96 **** xml_request.endTag("create"); ! addExtensionElement(xml_request, m_request->m_cmd->m_ext); if(m_request->m_cmd->m_client_trid != NULL) { --- 90,94 ---- xml_request.endTag("create"); ! addExtensionElements(xml_request, m_request->m_cmd->m_extentions); if(m_request->m_cmd->m_client_trid != NULL) { Index: epp_HostDelete.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_HostDelete.cc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** epp_HostDelete.cc 28 Apr 2003 20:50:18 -0000 1.11 --- epp_HostDelete.cc 13 May 2003 22:55:50 -0000 1.12 *************** *** 64,69 **** xml_request.beginTag("command"); - addCredsElement(xml_request,m_request->m_cmd->m_creds); - xml_request.beginTag("delete"); xml_request.beginTag("host:delete"); --- 64,67 ---- *************** *** 76,80 **** xml_request.endTag("delete"); ! addExtensionElement(xml_request, m_request->m_cmd->m_ext); if(m_request->m_cmd->m_client_trid != NULL) { --- 74,78 ---- xml_request.endTag("delete"); ! addExtensionElements(xml_request, m_request->m_cmd->m_extentions); if(m_request->m_cmd->m_client_trid != NULL) { Index: epp_HostInfo.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_HostInfo.cc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** epp_HostInfo.cc 28 Apr 2003 20:50:19 -0000 1.11 --- epp_HostInfo.cc 13 May 2003 22:55:50 -0000 1.12 *************** *** 63,68 **** xml_request.beginTag("command"); - addCredsElement(xml_request,m_request->m_cmd->m_creds); - xml_request.beginTag("info"); xml_request.beginTag("host:info"); --- 63,66 ---- *************** *** 75,79 **** xml_request.endTag("info"); ! addExtensionElement(xml_request, m_request->m_cmd->m_ext); if(m_request->m_cmd->m_client_trid != NULL) { --- 73,77 ---- xml_request.endTag("info"); ! addExtensionElements(xml_request, m_request->m_cmd->m_extentions); if(m_request->m_cmd->m_client_trid != NULL) { Index: epp_HostUpdate.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_HostUpdate.cc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** epp_HostUpdate.cc 28 Apr 2003 20:50:20 -0000 1.10 --- epp_HostUpdate.cc 13 May 2003 22:55:50 -0000 1.11 *************** *** 64,69 **** xml_request.beginTag("command"); - addCredsElement(xml_request,m_request->m_cmd->m_creds); - xml_request.beginTag("update"); xml_request.beginTag("host:update"); --- 64,67 ---- *************** *** 80,84 **** xml_request.endTag("update"); ! addExtensionElement(xml_request, m_request->m_cmd->m_ext); if(m_request->m_cmd->m_client_trid != NULL) { --- 78,82 ---- xml_request.endTag("update"); ! addExtensionElements(xml_request, m_request->m_cmd->m_extentions); if(m_request->m_cmd->m_client_trid != NULL) { Index: epp_Login.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_Login.cc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** epp_Login.cc 18 Jul 2002 09:57:09 -0000 1.9 --- epp_Login.cc 13 May 2003 22:55:50 -0000 1.10 *************** *** 60,69 **** xml_request.beginTag("command"); - if(m_request->m_cmd->m_creds != NULL) { - addCredsElement(xml_request, m_request->m_cmd->m_creds); - } // if "m_cmd->m_creds" - xml_request.beginTag("login"); xml_request.beginTag("svcs"); --- 60,89 ---- xml_request.beginTag("command"); xml_request.beginTag("login"); + if(m_request->m_client_id != NULL) { + xml_request.putTag("clID", *m_request->m_client_id); + } // if "m_client_id" + + if(m_request->m_password != NULL) { + xml_request.putTag("pw", *m_request->m_password); + } // if "m_password" + + if(m_request->m_new_password != NULL) { + xml_request.putTag("newPW", *m_request->m_new_password); + } // if "m_new_password" + + if(m_request->m_options != NULL) { + xml_request.beginTag("options"); + + if(m_request->m_options->m_version != NULL) { + xml_request.putTag("version", *m_request->m_options->m_version); + } + if(m_request->m_options->m_lang != NULL) { + xml_request.putTag("lang", *m_request->m_options->m_lang); + } + xml_request.endTag("options"); + } // if "m_options" + xml_request.beginTag("svcs"); *************** *** 94,98 **** xml_request.endTag("login"); ! addExtensionElement(xml_request, m_request->m_cmd->m_ext); if(m_request->m_cmd->m_client_trid != NULL) { --- 114,118 ---- xml_request.endTag("login"); ! addExtensionElements(xml_request, m_request->m_cmd->m_extentions); if(m_request->m_cmd->m_client_trid != NULL) { Index: epp_Logout.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_Logout.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** epp_Logout.cc 18 Jul 2002 09:57:09 -0000 1.8 --- epp_Logout.cc 13 May 2003 22:55:50 -0000 1.9 *************** *** 61,65 **** xml_request.putTag("logout",""); ! addExtensionElement(xml_request, m_request->m_ext); if(m_request->m_client_trid != NULL) { --- 61,65 ---- xml_request.putTag("logout",""); ! addExtensionElements(xml_request, m_request->m_extensions); if(m_request->m_client_trid != NULL) { Index: epp_Poll.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_Poll.cc,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** epp_Poll.cc 28 Apr 2003 20:50:20 -0000 1.12 --- epp_Poll.cc 13 May 2003 22:55:50 -0000 1.13 *************** *** 63,68 **** xml_request.beginTag("command"); - addCredsElement(xml_request,m_request->m_cmd->m_creds); - xml_request.beginTag("poll"); initReqMap(); --- 63,66 ---- *************** *** 78,82 **** xml_request.endTag("poll"); ! addExtensionElement(xml_request, m_request->m_cmd->m_ext); if(m_request->m_cmd->m_client_trid != NULL) { --- 76,80 ---- xml_request.endTag("poll"); ! addExtensionElements(xml_request, m_request->m_cmd->m_extentions); if(m_request->m_cmd->m_client_trid != NULL) { *************** *** 124,128 **** throw epp_XMLException(__FILE__, __LINE__, "Unknown poll resData"); } else { ! m_response->m_res_data = ptr->createTrnData(resChildNode); } --- 122,126 ---- throw epp_XMLException(__FILE__, __LINE__, "Unknown poll resData"); } else { ! m_response->m_res_data = ptr->createPollResData(resChildNode); } Index: epp_Session.h =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_Session.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** epp_Session.h 18 Jul 2002 09:57:09 -0000 1.8 --- epp_Session.h 13 May 2003 22:55:50 -0000 1.9 *************** *** 100,105 **** --- 100,110 ---- static const epp_short EPP_COMMAND_COMPLETED_SUCCESSFULLY = 1000; + static const epp_short EPP_COMMAND_COMPLETED_SUCCESSFULLY_ACTION_PENDING = 1001; + static const epp_short EPP_COMMAND_COMPLETED_SUCCESSFULLY_NO_MESSAGES = 1300; + static const epp_short EPP_COMMAND_COMPLETED_SUCCESSFULLY_ACK_TO_DEQUEUE = 1301; + /// @deprecated static const epp_short EPP_COMMAND_COMPLETED_SUCCESSFULLY_MESSAGE_PRESENT = 1301; + static const epp_short EPP_COMMAND_COMPLETED_SUCCESSFULLY_ENDING_SESSION = 1500; *************** *** 132,136 **** --- 137,145 ---- static const epp_short EPP_DATA_MANAGEMENT_POLICY_VIOLATION = 2308; static const epp_short EPP_COMMAND_FAILED = 2400; + static const epp_short EPP_COMMAND_FAILED_SERVER_CLOSING_CONNECTION = 2500; + /// @deprecated static const epp_short EPP_COMMAND_FAILED_SERVER_ENDING_SESSION = 2500; + static const epp_short EPP_AUTHENTICATION_ERROR_SERVER_CLOSING_CONNECTION = 2501; + /// @deprecated static const epp_short EPP_TIMEOUT_SERVER_ENDING_SESSION = 2501; static const epp_short EPP_SESSION_LIMIT_EXCEEDED_SERVER_CLOSING_CONNECTION = 2502; Index: main_contactcheck.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_contactcheck.cc,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** main_contactcheck.cc 28 Apr 2003 20:50:22 -0000 1.13 --- main_contactcheck.cc 13 May 2003 22:55:50 -0000 1.14 *************** *** 119,123 **** l_req->m_cmd.ref(new epp_Command(NULL, - NULL, epp_trid(trID))); --- 119,122 ---- Index: main_contactcreate.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_contactcreate.cc,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** main_contactcreate.cc 28 Apr 2003 20:50:24 -0000 1.14 --- main_contactcreate.cc 13 May 2003 22:55:50 -0000 1.15 *************** *** 99,103 **** l_req->m_cmd.ref(new epp_Command(NULL, - NULL, epp_trid(trID))); --- 99,102 ---- Index: main_contactdelete.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_contactdelete.cc,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** main_contactdelete.cc 28 Apr 2003 20:50:24 -0000 1.13 --- main_contactdelete.cc 13 May 2003 22:55:50 -0000 1.14 *************** *** 85,89 **** l_req->m_cmd.ref(new epp_Command(NULL, - NULL, epp_trid(trID))); --- 85,88 ---- Index: main_contactinfo.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_contactinfo.cc,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** main_contactinfo.cc 28 Apr 2003 20:50:24 -0000 1.15 --- main_contactinfo.cc 13 May 2003 22:55:50 -0000 1.16 *************** *** 249,253 **** l_req->m_cmd.ref(new epp_Command(NULL, - NULL, epp_trid(trID))); --- 249,252 ---- Index: main_contacttransfer.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_contacttransfer.cc,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** main_contacttransfer.cc 28 Apr 2003 20:50:26 -0000 1.13 --- main_contacttransfer.cc 13 May 2003 22:55:50 -0000 1.14 *************** *** 115,119 **** l_req->m_cmd.ref(new epp_Command(NULL, - NULL, epp_trid(trID))); --- 115,118 ---- Index: main_contactupdate.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_contactupdate.cc,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** main_contactupdate.cc 28 Apr 2003 20:50:28 -0000 1.14 --- main_contactupdate.cc 13 May 2003 22:55:50 -0000 1.15 *************** *** 87,91 **** l_req->m_cmd.ref(new epp_Command(NULL, - NULL, epp_trid(trID))); --- 87,90 ---- Index: main_domainupdate.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_domainupdate.cc,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** main_domainupdate.cc 28 Apr 2003 20:50:31 -0000 1.14 --- main_domainupdate.cc 13 May 2003 22:55:50 -0000 1.15 *************** *** 87,91 **** l_req->m_cmd.ref(new epp_Command(NULL, - NULL, epp_trid(trID))); --- 87,90 ---- Index: main_login.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_login.cc,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** main_login.cc 28 Apr 2003 20:50:36 -0000 1.13 --- main_login.cc 13 May 2003 22:55:50 -0000 1.14 *************** *** 89,113 **** try { - // Fill in options part of request - epp_Options_ref ops(new epp_Options(epp_string("1.0"), - epp_string("en"))); - - // Fill in credentials part of request - epp_Credentials_ref creds(new epp_Credentials()); - creds->m_client_id.ref(new epp_string(username)); - creds->m_password.ref(new epp_string(password)); - if(testDataMap.empty()) { - creds->m_new_password.ref(new epp_string("bar-FOO2")); - } - else { - if(testDataMap[2] != "-1") { - creds->m_new_password.ref(new epp_string(testDataMap[2])); - } - } - creds->m_options = ops; - // Fill in command part of request epp_Command_ref cmd(new epp_Command()); - cmd->m_creds = creds; string trID; --- 89,94 ---- *************** *** 129,132 **** --- 110,131 ---- epp_LoginReq_ref l_req(new epp_LoginReq()); l_req->m_cmd = cmd; + + // Fill in credentials part of the login + l_req->m_client_id.ref(new epp_string(username)); + l_req->m_password.ref(new epp_string(password)); + if(testDataMap.empty()) { + l_req->m_new_password.ref(new epp_string("bar-FOO2")); + } + else { + if(testDataMap[2] != "-1") { + l_req->m_new_password.ref(new epp_string(testDataMap[2])); + } + } + // Fill in options part of request + epp_Options_ref ops(new epp_Options(epp_string("1.0"), + epp_string("en"))); + l_req->m_options = ops; + + l_req->m_services = sers; l_req->m_extensions = extSers; Index: main_loginunspec.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_loginunspec.cc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** main_loginunspec.cc 28 Apr 2003 20:50:37 -0000 1.9 --- main_loginunspec.cc 13 May 2003 22:55:50 -0000 1.10 *************** *** 64,83 **** return 1; try { ! epp_Options_ref ops(new epp_Options(epp_string("1.0"), ! epp_string("en"))); ! ! epp_Credentials_ref creds(new epp_Credentials()); ! ! creds->m_client_id.ref(new epp_string(username)); ! creds->m_password.ref(new epp_string(password)); ! creds->m_new_password.ref(new epp_string("bar-FOO2")); ! creds->m_options = ops; ! epp_Command_ref cmd(new epp_Command()); - cmd->m_creds = creds; // Requesting weather forecast through Extension: ! cmd->m_ext.ref((epp_Extension *)new epp_UnspecTest()); cmd->m_client_trid.ref(new epp_trid("ABC-12345")); --- 64,88 ---- return 1; + map<unsigned int,string> testDataMap; + + if(argc > 1) { + for(int parm = 1; parm < argc; parm++) { + + if (!strncmp(argv[parm], "-testdata=", 10)) { + string td = &argv[parm][10]; + testDataMap = getTestDataMap(td); + } + } + } + try { ! epp_Command_ref cmd(new epp_Command()); // Requesting weather forecast through Extension: ! epp_extension_seq_ref exts(new epp_extension_seq); ! epp_UnspecTest unspec_test; ! exts->push_back((epp_Extension)unspec_test); ! cmd->m_extentions = exts; cmd->m_client_trid.ref(new epp_trid("ABC-12345")); *************** *** 97,100 **** --- 102,121 ---- epp_Login_ref l_obj(new epp_Login()); + // Fill in credentials part of the login + l_req->m_client_id.ref(new epp_string(username)); + l_req->m_password.ref(new epp_string(password)); + if(testDataMap.empty()) { + l_req->m_new_password.ref(new epp_string("bar-FOO2")); + } + else { + if(testDataMap[2] != "-1") { + l_req->m_new_password.ref(new epp_string(testDataMap[2])); + } + } + // Fill in options part of request + epp_Options_ref ops(new epp_Options(epp_string("1.0"), + epp_string("en"))); + l_req->m_options = ops; + l_obj->setRequestData(*l_req); *************** *** 110,125 **** // Let us do something more with the unspec-object: ! if(l_rsp->m_rsp->m_ext_string != NULL) { ! epp_UnspecTest_ref extension(new epp_UnspecTest()); ! extension->fromXML(epp_string(*l_rsp->m_rsp->m_ext_string)); ! epp_Weather_ref weather = extension->getResponseData(); ! if(weather != NULL) { ! if(weather->m_today != NULL) ! cout << "<today>" << *weather->m_today << "</today>" << endl; ! ! if(weather->m_tomorrow != NULL) ! cout << "<tomorrow>" << *weather->m_tomorrow << "</tomorrow>" << endl; } } --- 131,150 ---- // Let us do something more with the unspec-object: ! if(l_rsp->m_rsp->m_ext_strings != NULL) { ! for(epp_string_seq::iterator i = l_rsp->m_rsp->m_ext_strings->begin(); ! i != l_rsp->m_rsp->m_ext_strings->end(); i++) { ! epp_UnspecTest_ref extension(new epp_UnspecTest()); ! extension->fromXML(epp_string(*i)); ! epp_Weather_ref weather = extension->getResponseData(); ! if(weather != NULL) ! { ! if(weather->m_today != NULL) ! cout << "<today>" << *weather->m_today << "</today>" << endl; ! ! if(weather->m_tomorrow != NULL) ! cout << "<tomorrow>" << *weather->m_tomorrow << "</tomorrow>" << endl; ! } } } Index: testTools.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/testTools.cc,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** testTools.cc 29 Apr 2003 20:59:42 -0000 1.18 --- testTools.cc 13 May 2003 22:55:50 -0000 1.19 *************** *** 70,77 **** } - if(i->m_id != NULL) { - cerr << " id=\"" << *i->m_id << "\""; - } - cerr << ">" << *i->m_msg << "</msg>" << endl; } // if "m_msg" --- 70,73 ---- *************** *** 80,87 **** if(i->m_values != NULL) { ! for(epp_string_seq::iterator j = i->m_values->begin(); j != i->m_values->end(); j++) { ! cerr << "<value>" << *j << "</value>" << endl; } } // if "m_values" --- 76,85 ---- if(i->m_values != NULL) { ! for(epp_resultvalue_seq::iterator j = i->m_values->begin(); j != i->m_values->end(); j++) { ! // DANDAN ! // XXX fix this to properly show the struct ! cerr << "<value>" << *(j->m_element_value) << "</value>" << endl; } } // if "m_values" *************** *** 123,129 **** printResultsSeq(response->m_results); ! if(response->m_ext_string != NULL) { cerr << "<extension>" << endl; ! cerr << *response->m_ext_string << "</extension>" << endl; } // if "m_ext_string" --- 121,132 ---- printResultsSeq(response->m_results); ! if(response->m_ext_strings != NULL) { cerr << "<extension>" << endl; ! for(epp_xml_string_seq::iterator i = response->m_ext_strings->begin(); ! i != response->m_ext_strings->end(); i++) ! { ! cerr << *i << endl; ! } ! cerr << "</extension>" << endl; } // if "m_ext_string" *************** *** 332,342 **** epp_LoginReq_ref l_req(new epp_LoginReq()); l_req->m_cmd.ref(new epp_Command()); - l_req->m_cmd->m_creds.ref(new epp_Credentials()); // Fill in credentials information ! l_req->m_cmd->m_creds->m_options.ref(new epp_Options(epp_string("1.0"), ! epp_string("en"))); ! l_req->m_cmd->m_creds->m_client_id.ref(new epp_string(username)); ! l_req->m_cmd->m_creds->m_password.ref(new epp_string(password)); // Fill in client transaction ID --- 335,344 ---- epp_LoginReq_ref l_req(new epp_LoginReq()); l_req->m_cmd.ref(new epp_Command()); // Fill in credentials information ! l_req->m_options.ref(new epp_Options(epp_string("1.0"), ! epp_string("en"))); ! l_req->m_client_id.ref(new epp_string(username)); ! l_req->m_password.ref(new epp_string(password)); // Fill in client transaction ID |
From: Daniel M. <tub...@us...> - 2003-04-29 21:34:36
|
Update of /cvsroot/epp-rtk/epp-rtk/c++ In directory sc8-pr-cvs1:/tmp/cvs-serv18381 Modified Files: final.sh Log Message: do same check for autoconf-1.4 as debug.sh Index: final.sh =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/final.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** final.sh 24 Apr 2002 14:42:02 -0000 1.4 --- final.sh 29 Apr 2003 21:34:29 -0000 1.5 *************** *** 1,3 **** #!/bin/bash ! automake && autoconf && ./configure $* && make clean && make CXXFLAGS="--ansi -O2 -DRELEASE" && make install --- 1,8 ---- #!/bin/bash ! which automake-1.4 >/dev/null 2>&1 ! if [ $? -eq 0 ]; then ! automake-1.4 && autoconf && ./configure $* && make clean && make CXXFLAGS="--ansi -O2 -DRELEASE" && make install ! else ! automake && autoconf && ./configure $* && make clean && make CXXFLAGS="--ansi -O2 -DRELEASE" && make install ! fi |
From: Daniel M. <tub...@us...> - 2003-04-29 21:27:32
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src/ssl In directory sc8-pr-cvs1:/tmp/cvs-serv14552/src/ssl Modified Files: Makefile.am Log Message: added include location of /usr/local/openssl/include to be consistent with src Makefile.am Index: Makefile.am =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/ssl/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.am 12 Mar 2002 13:33:22 -0000 1.4 --- Makefile.am 29 Apr 2003 21:27:27 -0000 1.5 *************** *** 11,15 **** npssl.cc ! INCLUDES =-I/usr/local/ssl/include CLEANFILES = *~ --- 11,15 ---- npssl.cc ! INCLUDES =-I/usr/local/ssl/include -I/usr/local/openssl/include CLEANFILES = *~ |
From: Daniel M. <tub...@us...> - 2003-04-29 21:00:29
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src In directory sc8-pr-cvs1:/tmp/cvs-serv2810/src Modified Files: Makefile.am main_hello.cc testTools.cc Removed Files: epp_Status.cc epp_Status.h main_status.cc Log Message: removed status command code and files removed status data in result from server brought most of dcp code up to spec with EPP 07 Index: Makefile.am =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile.am 28 Apr 2003 20:49:30 -0000 1.8 --- Makefile.am 29 Apr 2003 20:59:39 -0000 1.9 *************** *** 38,42 **** epp_Poll.h \ epp_Session.h \ - epp_Status.h \ epp_Unspec.h \ ltoa.h \ --- 38,41 ---- *************** *** 82,87 **** epp_Logout.cc \ epp_Poll.cc \ ! epp_Session.cc \ ! epp_Status.cc CLEANFILES = *~ --- 81,85 ---- epp_Logout.cc \ epp_Poll.cc \ ! epp_Session.cc CLEANFILES = *~ *************** *** 99,105 **** poll_SOURCES = \ main_poll.cc $(common) - - status_SOURCES = \ - main_status.cc $(common) contactcheck_SOURCES = \ --- 97,100 ---- Index: main_hello.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_hello.cc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** main_hello.cc 28 Apr 2003 20:50:32 -0000 1.11 --- main_hello.cc 29 Apr 2003 20:59:41 -0000 1.12 *************** *** 108,115 **** case ALL: access = "all"; break; ! case NO_ACCESS: access = "noAccess"; break; case NULL_ACCESS: access = "null"; break; ! case SOCIAL: access = "social"; break; ! case TECHNICAL: access = "technical"; break; default: access = "**UNKNOWN**"; } --- 108,116 ---- case ALL: access = "all"; break; ! case NONE_ACCESS: access = "noneAccess"; break; case NULL_ACCESS: access = "null"; break; ! case OTHER: access = "other"; break; ! case PERSONAL: access = "personal"; break; ! case PERSONAL_AND_OTHER: access = "personalAndOther"; break; default: access = "**UNKNOWN**"; } *************** *** 133,141 **** string purpose; switch(*i) { case CONTACT: purpose = "contact"; break; - case DN_REG: purpose = "dnReg"; break; - case IP_REG: purpose = "ipReg"; break; case OTHER_PURPOSE: purpose = "other"; break; ! case TM_REG: purpose = "tmReg"; break; default: purpose = "**UNKNOWN**"; } --- 134,141 ---- string purpose; switch(*i) { + case ADMIN_PURPOSE: purpose = "admin"; break; case CONTACT: purpose = "contact"; break; case OTHER_PURPOSE: purpose = "other"; break; ! case PROV: purpose = "prov"; break; default: purpose = "**UNKNOWN**"; } *************** *** 146,150 **** cerr << "</purpose>" << endl; } // if "m_purposes" ! if(j->m_recipients != NULL) { --- 146,150 ---- cerr << "</purpose>" << endl; } // if "m_purposes" ! /* if(j->m_recipients != NULL) { *************** *** 167,171 **** cerr << "</recipient>" << endl; } // if "m_recipients" ! if(j->m_retention != NULL) { --- 167,171 ---- cerr << "</recipient>" << endl; } // if "m_recipients" ! */ if(j->m_retention != NULL) { *************** *** 175,182 **** switch(*j->m_retention) { case BUSINESS: retention = "business"; break; - case FUNCTIONAL: retention = "functional"; break; case INDEFINITE: retention = "indefinite"; break; case LEGAL: retention = "legal"; break; case NONE: retention = "none"; break; default: retention = "**UNKNOWN**"; } --- 175,182 ---- switch(*j->m_retention) { case BUSINESS: retention = "business"; break; case INDEFINITE: retention = "indefinite"; break; case LEGAL: retention = "legal"; break; case NONE: retention = "none"; break; + case STATED: retention = "stated"; break; default: retention = "**UNKNOWN**"; } Index: testTools.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/testTools.cc,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** testTools.cc 28 Apr 2003 20:50:38 -0000 1.17 --- testTools.cc 29 Apr 2003 20:59:42 -0000 1.18 *************** *** 86,122 **** } } // if "m_values" ! ! if(i->m_data != NULL) { ! cerr << "<data>"; ! ! if(i->m_data->m_status != NULL && i->m_data->m_status->m_cltrid != NULL) { ! cerr << endl; ! } ! ! //<fixme>Error in draft/idl? Can max handle 1 element... ! if(i->m_data->m_status != NULL) { ! ! if(i->m_data->m_status->m_cltrid != NULL) { ! cerr << "<status>" << endl; ! cerr << "<clTRID"; ! ! if(i->m_data->m_status->m_ack != NULL) { ! if(*i->m_data->m_status->m_ack) { ! cerr << " ack=\"1\""; ! } else { ! cerr << " ack=\"0\""; ! } ! } ! ! cerr << ">" << *i->m_data->m_status->m_cltrid << "</clTRID>" << endl; ! cerr << "</status>" << endl; ! } ! else { ! cerr << "<status/>"; ! } ! ! } ! cerr << "</data>" << endl; ! } // if "m_data" cerr << "</result>" << endl; } // for --- 86,90 ---- } } // if "m_values" ! cerr << "</result>" << endl; } // for --- epp_Status.cc DELETED --- --- epp_Status.h DELETED --- --- main_status.cc DELETED --- |