From dfca12d7813b63c86b019c988c24fa1a5b80a5fa Mon Sep 17 00:00:00 2001 From: Ren RenJuan Date: Thu, 16 Jan 2014 20:28:52 +0000 Subject: [PATCH] * --- ACTK1_0/Makefile | 38 +++-- ACTK1_0/OTE/LPECheckCommandTest.cpp | 2 +- ACTK1_0/OTE/LPECheckResponseTest.cpp | 2 +- .../OteDomainTransferRegistrantCommand.hpp | 2 +- ACTK1_0/OTE/OteLPECreateCommandTest.cpp | 2 +- ACTK1_0/se/AeDomainCreateCommand.cpp | 132 --------------- ACTK1_0/se/AeDomainCreateCommand.hpp | 150 ------------------ ACTK1_0/se/AeDomainCreateCommandTest.cpp | 86 ---------- ACTK1_0/se/AeDomainInfoResponse.cpp | 57 ------- ACTK1_0/se/AeDomainInfoResponse.hpp | 72 --------- .../se/AeDomainModifyRegistrantCommand.cpp | 93 ----------- .../se/AeDomainModifyRegistrantCommand.hpp | 46 ------ ACTK1_0/se/AeDomainObjectType.cpp | 25 --- ACTK1_0/se/AeDomainObjectType.hpp | 19 --- .../se/AeDomainTransferRegistrantCommand.cpp | 92 ----------- .../se/AeDomainTransferRegistrantCommand.hpp | 88 ---------- .../se/AeDomainTransferRegistrantResponse.cpp | 37 ----- .../se/AeDomainTransferRegistrantResponse.hpp | 44 ----- ACTK1_0/se/AeExtension.cpp | 14 -- ACTK1_0/se/AeExtension.hpp | 29 ---- ACTK1_0/se/ContactCheckCommandTest.cpp | 2 +- ACTK1_0/se/ContactCheckResponseTest.cpp | 2 +- ACTK1_0/se/ContactDeleteCommandTest.cpp | 2 +- ACTK1_0/se/ContactInfoCommandTest.cpp | 2 +- ACTK1_0/se/ContactInfoResponseTest.cpp | 2 +- .../se/ContactTransferRequestCommandTest.cpp | 2 +- ACTK1_0/se/DomainCheckCommandTest.cpp | 2 +- ACTK1_0/se/DomainCheckResponseTest.cpp | 2 +- ACTK1_0/se/DomainDeleteCommandTest.cpp | 2 +- ACTK1_0/se/DomainInfoCommandTest.cpp | 2 +- .../se/DomainInfoKVResponseExtensionTest.cpp | 2 +- ACTK1_0/se/DomainKVCommandExtensionTest.cpp | 2 +- .../se/DomainRegistrantTransferCommand.hpp | 2 +- .../DomainRegistrantTransferCommandTest.cpp | 4 +- .../DomainRegistrantTransferResponseTest.cpp | 2 +- ACTK1_0/se/DomainTransferQueryCommandTest.cpp | 2 +- ACTK1_0/se/DomainUpdateCommandTest.cpp | 2 +- ACTK1_0/se/EnumDomainInfoResponseTest.cpp | 2 +- ACTK1_0/se/HelloTest.cpp | 2 +- ACTK1_0/se/HostCheckCommandTest.cpp | 2 +- ACTK1_0/se/HostCreateCommandTest.cpp | 2 +- ACTK1_0/se/HostDeleteCommandTest.cpp | 2 +- ACTK1_0/se/HostInfoCommandTest.cpp | 2 +- ACTK1_0/se/HostInfoResponseTest.cpp | 2 +- ACTK1_0/se/IPVersionTest.cpp | 2 +- ACTK1_0/se/LoginCommandTest.cpp | 2 +- ACTK1_0/se/LogoutCommandTest.cpp | 2 +- ACTK1_0/se/PollAckCommandTest.cpp | 2 +- ACTK1_0/se/PollResponseTest.cpp | 2 +- ACTK1_0/se/RegistrantTransferCommandType.hpp | 1 + ACTK1_0/se/XMLGregorianCalendar.cpp | 2 +- ...DomainSecDNSCreateCommandExtensionTest.cpp | 2 +- .../DomainSecDNSInfoResponseExtensionTest.cpp | 2 +- ...DomainSecDNSUpdateCommandExtensionTest.cpp | 2 +- ACTK1_0/session/CommandCounterTest.cpp | 2 +- ACTK1_0/session/SessionManagerTest.cpp | 4 +- ACTK1_0/session/SessionTest.cpp | 4 +- AusRegEPPTK/se/AeDomainCreateCommandTest.cpp | 2 +- .../se/ArDomainPolicyDeleteCommandTest.cpp | 2 +- .../se/ArDomainPolicyUndeleteCommandTest.cpp | 2 +- .../se/ArDomainUndeleteCommandTest.cpp | 2 +- AusRegEPPTK/se/ArDomainUnrenewCommandTest.cpp | 6 +- .../se/ArDomainUnrenewResponseTest.cpp | 2 +- AusRegEPPTK/se/AuDomainCreateCommandTest.cpp | 2 +- AusRegEPPTK/se/AuDomainInfoResponseTest.cpp | 2 +- AusRegEPPTK/se/AuDomainInfoResponsev1Test.cpp | 2 +- .../AuDomainModifyRegistrantCommandTest.cpp | 2 +- .../AuDomainTransferRegistrantCommandTest.cpp | 8 +- ...AuDomainTransferRegistrantResponseTest.cpp | 2 +- AusRegEPPTK/se/ContactCheckCommandTest.cpp | 2 +- AusRegEPPTK/se/ContactCheckResponseTest.cpp | 2 +- AusRegEPPTK/se/ContactDeleteCommandTest.cpp | 2 +- AusRegEPPTK/se/ContactInfoCommandTest.cpp | 2 +- AusRegEPPTK/se/ContactInfoResponseTest.cpp | 2 +- .../se/ContactTransferRequestCommandTest.cpp | 2 +- AusRegEPPTK/se/DomainCheckCommandTest.cpp | 2 +- AusRegEPPTK/se/DomainCheckResponseTest.cpp | 2 +- AusRegEPPTK/se/DomainDeleteCommandTest.cpp | 2 +- AusRegEPPTK/se/DomainInfoCommandTest.cpp | 2 +- .../se/DomainInfoKVResponseExtensionTest.cpp | 2 +- .../se/DomainKVCommandExtensionTest.cpp | 2 +- .../DomainRegistrantTransferCommandTest.cpp | 4 +- .../DomainRegistrantTransferResponseTest.cpp | 2 +- .../se/DomainTransferQueryCommandTest.cpp | 2 +- AusRegEPPTK/se/DomainUpdateCommandTest.cpp | 2 +- AusRegEPPTK/se/EnumDomainInfoResponseTest.cpp | 2 +- AusRegEPPTK/se/HelloTest.cpp | 2 +- AusRegEPPTK/se/HostCheckCommandTest.cpp | 2 +- AusRegEPPTK/se/HostCreateCommandTest.cpp | 2 +- AusRegEPPTK/se/HostDeleteCommandTest.cpp | 2 +- AusRegEPPTK/se/HostInfoCommandTest.cpp | 2 +- AusRegEPPTK/se/HostInfoResponseTest.cpp | 2 +- AusRegEPPTK/se/IPVersionTest.cpp | 2 +- AusRegEPPTK/se/LoginCommandTest.cpp | 2 +- AusRegEPPTK/se/LogoutCommandTest.cpp | 2 +- AusRegEPPTK/se/PollAckCommandTest.cpp | 2 +- AusRegEPPTK/se/PollResponseTest.cpp | 2 +- ...DomainSecDNSCreateCommandExtensionTest.cpp | 2 +- .../DomainSecDNSInfoResponseExtensionTest.cpp | 2 +- ...DomainSecDNSUpdateCommandExtensionTest.cpp | 2 +- AusRegEPPTK/session/CommandCounterTest.cpp | 2 +- AusRegEPPTK/session/SessionManagerTest.cpp | 2 +- AusRegEPPTK/session/SessionTest.cpp | 2 +- 103 files changed, 125 insertions(+), 1088 deletions(-) delete mode 100644 ACTK1_0/se/AeDomainCreateCommand.cpp delete mode 100644 ACTK1_0/se/AeDomainCreateCommand.hpp delete mode 100644 ACTK1_0/se/AeDomainCreateCommandTest.cpp delete mode 100644 ACTK1_0/se/AeDomainInfoResponse.cpp delete mode 100644 ACTK1_0/se/AeDomainInfoResponse.hpp delete mode 100644 ACTK1_0/se/AeDomainModifyRegistrantCommand.cpp delete mode 100644 ACTK1_0/se/AeDomainModifyRegistrantCommand.hpp delete mode 100644 ACTK1_0/se/AeDomainObjectType.cpp delete mode 100644 ACTK1_0/se/AeDomainObjectType.hpp delete mode 100644 ACTK1_0/se/AeDomainTransferRegistrantCommand.cpp delete mode 100644 ACTK1_0/se/AeDomainTransferRegistrantCommand.hpp delete mode 100644 ACTK1_0/se/AeDomainTransferRegistrantResponse.cpp delete mode 100644 ACTK1_0/se/AeDomainTransferRegistrantResponse.hpp delete mode 100644 ACTK1_0/se/AeExtension.cpp delete mode 100644 ACTK1_0/se/AeExtension.hpp diff --git a/ACTK1_0/Makefile b/ACTK1_0/Makefile index 772bda3..84c50a0 100644 --- a/ACTK1_0/Makefile +++ b/ACTK1_0/Makefile @@ -1,8 +1,8 @@ ################################################## # Makefile for building lib and main test routine# ################################################## -#LOCATION=DEBIAN_7 -LOCATION=DEBIAN_6 +LOCATION=DEBIAN_7 +#LOCATION=DEBIAN_6 #LOCATION=OSX_10_8 SYSTEM = $(shell uname -s) @@ -100,20 +100,40 @@ $(BUILD_OBJ_DIR)/%.o: %.c $(CC) $(CPPFLAGS) -c -o $@ $(INCLUDE_DIR) $< -LDFLAGS_TESTS = -L$(BUILD_LIB_DIR) -lACTK1_0 \ +ARTKLIBS = -L$(BUILD_LIB_DIR) -lACTK1_0 \ -L$(XALAN_LIB_DIR) -lxalan-c -lxalanMsg \ -L$(XERCES_LIB_DIR) -lxerces-c \ -lssl \ -lrt $(BUILD_OBJ_DIR)/%: $(BUILD_OBJ_DIR)/%.o - $(CXX) $(LDFLAGS_TESTS) -o $@ $< + $(CXX) $(ARTKLIBS) -o $@ $< .PHONY: doc clean dclean -####### Build rules -#libAusreg_EPP_toolkit.a: $(OBJECTS) -# $(LIB_ARCHIVER) $(LIB_FLAGS) $(BUILD_LIB_DIR)/$@ $^ +# +# The toolkit raises the c++ "static initialization fiasco" situation. +# +ARTKOBJS= build/XMLGregorianCalendar.o build/XMLParser.o build/XMLWriter.o build/ACSession.o build/DomainAddRem.o build/EnumDomainInfoResponse.o build/log.o build/PostalInfoType.o build/SessionManagerPropertiesImpl.o \ +build/AddRemType.o build/DomainCheckResponse.o build/EnumDomainUpdateCommand.o build/LPECheckResponse.o build/Properties.o build/SessionPoolImpl.o \ +build/boolean.o build/DomainCreateCommand.o build/EnumType.o build/LPECreateCommand.o build/ProtocolExtensionCommand.o build/SSLException.o \ +build/CertificateUserMismatchException.o build/DomainCreateResponse.o build/EPPDateFormatter.o build/LPECreateResponse.o build/ReceiveSE.o build/StandardCommandType.o \ +build/CheckResponse.o build/DomainInfoKVResponseExtension.o build/EPPWriter.o build/NamespaceResolver.o build/RegistrantObjectType.o build/StandardObjectType.o \ +build/CLTRID.o build/DomainInfoResponse.o build/ErrorPkg.o build/NAPTR.o build/RegistrantTransferCommandType.o build/StringUtils.o \ +build/CommandCounter.o build/DomainKVCommandExtension.o build/Greeting.o build/NotificationResponse.o build/ResponseExtension.o build/SyncExtension.o \ +build/Command.o build/DomainNotificationResponse.o build/HostAddRem.o build/ObjectCommand.o build/Response.o build/SystemProperties.o \ +build/config.o build/DomainRegistrantTransferCommand.o build/HostCheckResponse.o build/OteDomainInfoResponse.o build/ResultCounter.o build/Timer.o \ +build/Constants.o build/DomainRegistrantTransferResponse.o build/HostCreateCommand.o build/OteDomainModifyRegistrantCommand.o build/Result.o build/TLSContext.o \ +build/ContactCheckResponse.o build/DomainRenewCommand.o build/HostCreateResponse.o build/OteDomainObjectType.o build/SecDNSChgType.o build/TLSSession.o \ +build/ContactCreateCommand.o build/DomainRenewResponse.o build/HostInfoResponse.o build/OteDomainTransferRegistrantCommand.o build/SecDNSDSData.o build/TLSSocket.o \ +build/ContactCreateResponse.o build/DomainSecDNSCreateCommandExtension.o build/HostUpdateCommand.o build/OteDomainTransferRegistrantResponse.o build/SecDNSDSOrKeyType.o build/TransferCommand.o \ +build/ContactInfoResponse.o build/DomainSecDNSInfoResponseExtension.o build/InetAddress.o build/OteExtension.o build/SecDNSExtension.o build/TransferOp.o \ +build/ContactNotificationResponse.o build/DomainSecDNSUpdateCommandExtension.o build/InfoResponse.o build/OteLPECreateCommand.o build/SecDNSKeyData.o build/TransferResponse.o \ +build/ContactTransferResponse.o build/DomainTransferResponse.o build/init.o build/Period.o build/SecDNSRemType.o build/UserPassMismatchException.o \ +build/ContactUpdateCommand.o build/DomainUpdateCommand.o build/IPVersion.o build/PeriodUnit.o build/SendSE.o build/XMLDocument.o \ +build/CreateResponse.o build/DomainUpdateSyncCommandExtension.o build/KVExtension.o build/PollOperation.o build/SessionFactory.o \ +build/DataResponse.o build/E164Extension.o build/Logger.o build/PollResponse.o build/SessionManagerFactory.o \ +build/Disclose.o build/EnumDomainCreateCommand.o build/LoginCommand.o build/PostalInfo.o build/SessionManagerImpl.o .PHONY: tests @@ -126,8 +146,8 @@ dirs: -mkdir -p $(BUILD_OBJ_DIR) libACTK1_0.so: -$(BUILD_LIB_DIR)/libACTK1_0.so: $(objs) - $(CXX) $(LDFLAGS) $(PRODORDEV) -shared $^ -o $@ +$(BUILD_LIB_DIR)/libACTK1_0.so: $(objs) + $(CXX) $(LDFLAGS) $(PRODORDEV) -shared $(ARTKOBJS) -o $@ doc: doxygen etc/Doxyfile diff --git a/ACTK1_0/OTE/LPECheckCommandTest.cpp b/ACTK1_0/OTE/LPECheckCommandTest.cpp index e3b21f2..b1eedf2 100644 --- a/ACTK1_0/OTE/LPECheckCommandTest.cpp +++ b/ACTK1_0/OTE/LPECheckCommandTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { CLTRID::setClID("JTKUTEST"); Timer::setTime("20070101.010101"); diff --git a/ACTK1_0/OTE/LPECheckResponseTest.cpp b/ACTK1_0/OTE/LPECheckResponseTest.cpp index a9545e3..aa61ecf 100644 --- a/ACTK1_0/OTE/LPECheckResponseTest.cpp +++ b/ACTK1_0/OTE/LPECheckResponseTest.cpp @@ -12,7 +12,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); const string xml = "Command completed successfullyexample.comexample.netIn useexample.orgABC-1234554322-XYZ"; diff --git a/ACTK1_0/OTE/OteDomainTransferRegistrantCommand.hpp b/ACTK1_0/OTE/OteDomainTransferRegistrantCommand.hpp index 401d216..96c332d 100644 --- a/ACTK1_0/OTE/OteDomainTransferRegistrantCommand.hpp +++ b/ACTK1_0/OTE/OteDomainTransferRegistrantCommand.hpp @@ -1,6 +1,6 @@ #ifndef __OTE_DOMAIN_TRANSFER_REGISTRANT_COMMAND_HPP #define __OTE_DOMAIN_TRANSFER_REGISTRANT_COMMAND_HPP - +#include #include "common/Deprecated.hpp" #include "se/ProtocolExtensionCommand.hpp" class XMLGregorianCalendar; diff --git a/ACTK1_0/OTE/OteLPECreateCommandTest.cpp b/ACTK1_0/OTE/OteLPECreateCommandTest.cpp index 5f3f0b2..597b9fc 100644 --- a/ACTK1_0/OTE/OteLPECreateCommandTest.cpp +++ b/ACTK1_0/OTE/OteLPECreateCommandTest.cpp @@ -9,7 +9,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); const string registrantName = "AusRegistry"; const string registrantID = "01241326211"; diff --git a/ACTK1_0/se/AeDomainCreateCommand.cpp b/ACTK1_0/se/AeDomainCreateCommand.cpp deleted file mode 100644 index 8b146f7..0000000 --- a/ACTK1_0/se/AeDomainCreateCommand.cpp +++ /dev/null @@ -1,132 +0,0 @@ -#include "se/AeDomainCreateCommand.hpp" -#include "xml/XMLHelper.hpp" -#include "se/AeExtension.hpp" -#include "common/ErrorPkg.hpp" - -namespace { - Extension& aeExtension() { - static Extension* aeExtension = new AeExtension(); - return *aeExtension; - } -}; // anonymous namespace - -AeDomainCreateCommand::AeDomainCreateCommand ( - const std::string& name, - const std::string& pw, - const std::string* registrantID, - const std::vector* techContacts, - const std::string &aeEligibilityType, - int aePolicyReason, - const std::string &aeRegistrantName) : DomainCreateCommand ( - name, pw, registrantID, techContacts) -{ - setExtension (aeEligibilityType, aePolicyReason, aeRegistrantName); -} - -AeDomainCreateCommand::AeDomainCreateCommand ( - const std::string& name, - const std::string& pw, - const std::string* registrantID, - const std::vector* techContacts, - const std::vector* adminContacts, - const std::vector* billingContacts, - const std::vector* nameservers, - const Period* period, - const std::string &aeEligibilityType, - int aePolicyReason, - const std::string &aeRegistrantName, - const std::string *aeRegistrantID, - const std::string *aeRegistrantIDType, - const std::string *aeEligibilityName, - const std::string *aeEligibilityID, - const std::string *aeEligibilityIDType) : DomainCreateCommand ( - name, pw, registrantID, techContacts, nameservers, - adminContacts, billingContacts, period) -{ - setExtension (aeEligibilityType, aePolicyReason, - aeRegistrantName, aeRegistrantID, aeRegistrantIDType, - aeEligibilityName, aeEligibilityID, aeEligibilityIDType); -} - -void AeDomainCreateCommand::setExtension (const std::string& eligibilityType, - int policyReason, - const std::string& registrantName) -{ - setExtension (eligibilityType, policyReason, registrantName, - NULL, NULL, NULL, NULL, NULL); -} - -void AeDomainCreateCommand::setExtension ( - const std::string& eligibilityType, - int policyReason, - const std::string ®istrantName, - const std::string* registrantID, - const std::string ®istrantIDType) -{ - setExtension (eligibilityType, policyReason, registrantName, - registrantID, ®istrantIDType, NULL, NULL, NULL); -} - -void AeDomainCreateCommand::setExtension ( - const std::string& eligibilityType, - int policyReason, - const std::string& registrantName, - const std::string* registrantID, - const std::string* registrantIDType, - const std::string* eligibilityName, - const std::string* eligibilityID, - const std::string* eligibilityIDType) -{ - if ((registrantID && registrantIDType == NULL) - || (registrantID == NULL && registrantIDType) - || (eligibilityID && eligibilityIDType == NULL) - || (eligibilityID == NULL && eligibilityIDType)) - { - throw IllegalArgException(ErrorPkg::getMessage( - "se.domaincreate.ae.missing_ar")); - } - - DOMElement *aeextCreate = xmlWriter->appendChild( - xmlWriter->appendChild( - command, - "extension"), - "create", - aeExtension().getURI()); - - XMLHelper::setAttribute(aeextCreate, - "xsi:schemaLocation", - aeExtension().getSchemaLocation()); - - DOMElement* aeProperties = xmlWriter->appendChild( - aeextCreate, "aeProperties"); - - XMLHelper::setTextContent( - xmlWriter->appendChild(aeProperties, "registrantName"), - registrantName); - - if (registrantID && registrantIDType) - xmlWriter->appendChild (aeProperties, - "registrantID", *registrantID, - "type", *registrantIDType); - - XMLHelper::setTextContent( - xmlWriter->appendChild(aeProperties, "eligibilityType"), - eligibilityType); - - if (eligibilityName) - { - XMLHelper::setTextContent( - xmlWriter->appendChild(aeProperties, "eligibilityName"), - *eligibilityName); - - if (eligibilityID && eligibilityIDType) - xmlWriter->appendChild(aeProperties, - "eligibilityID", *eligibilityID, - "type", *eligibilityIDType); - } - - XMLHelper::setTextContent( - xmlWriter->appendChild(aeProperties, "policyReason"), - policyReason); -} - diff --git a/ACTK1_0/se/AeDomainCreateCommand.hpp b/ACTK1_0/se/AeDomainCreateCommand.hpp deleted file mode 100644 index efecd96..0000000 --- a/ACTK1_0/se/AeDomainCreateCommand.hpp +++ /dev/null @@ -1,150 +0,0 @@ -#ifndef __AEDOMAINCREATECOMMAND_HPP -#define __AEDOMAINCREATECOMMAND_HPP - -#include "common/Deprecated.hpp" -#include "se/DomainCreateCommand.hpp" - -/** - * Extension of EPP urn:ietf:params:xml:ns:domain-1.0 create command specified - * in RFC3731 to urn:X-ae:params:xml:ns:aeext-1.0. .ae domains must be - * provisioned using this class rather than {@link DomainCreateCommand}, as the - * ae extension data is mandatory. - * Use this class to generate a standards-compliant XML document, given simple - * input parameters. The toXML method in Command serialises this object to - * XML. - * The response expected from a server should be handled by a {@link - * DomainCreateResponse} object. - * - * @deprecated AE eligibility extensions should now be managed through the - * @c extension defined in the - * urn:X-ar:params:xml:ns:kv-1.0 namespace. This can be done - * through the toolkit by using a @c DomainCreateCommand and - * appending a @c DomainKVCommandExtension object containing - * the AE eligibility extensions. - * - * See - * {@link DomainCreateCommand.appendExtension(CommandExtension)} - * and - * {@link DomainKVCommandExtension}. - */ -class AeDomainCreateCommand : public DomainCreateCommand -{ -public: - /** - * Minimal constructor for creating a domain:create + aeext:create - * EPP command. These parameters are the least required for a valid - * .ae domain create command. - */ - DEPRECATED( - AeDomainCreateCommand (const std::string& name, - const std::string& pw, - const std::string* registrantID, - const std::vector* techContacts, - const std::string &aeEligibilityType, - int aePolicyReason, - const std::string& aeRegistrantName)); - /** - * Full data specification constructor for a domain:create + aeext:create - * EPP command. Please refer to the urn:X-ae:params:xml:ns:aeext-1.0 schema - * for specification of the required fields. - * The mapping of parameter names to ae extension fields is given in the - * parameter documentation. - * - * @param name The name of the new domain. - * - * @param pw The password to assign to the domain (also known as authInfo - * or authorisation information). - * - * @param registrantID The identifier of an existing contact to assign as - * the registrant contact for this domain. Failure to ensure the contact - * exists prior to using them in this way will result in an EPP result of - * '2303 "Object does not exist"'. - * - * @param techContacts The identifiers of existing contacts to assign as - * technical contacts for this domain. Failure to ensure the contacts - * exist prior to using them in this way will result in an EPP result of - * '2303 "Object does not exist"'. - * - * @param adminContacts See techContacts (substitute administrative for - * technical). - * - * @param billingContacts See techContacts (substitute billing for - * technical). - * - * @param nameservers The names of existing hosts to delegate the domain - * being created to. Failure to ensure the hosts exist prior to using them - * in this way will result in an EPP result of '2303 "Object does not - * exist"'. - * - * @param period The initial registration period of the domain object. A - * server may define a default initial registration period if not specified - * by the client. - * - * @param aeEligibilityType aeext:eligType. - * - * @param aePolicyReason aeext:policyReason. - * - * @param aeRegistrantName aeext:registrantName. - * - * @param aeRegistrantID aeext:registrantID. - * - * @param aeRegistrantIDType aeext:registrantID type attribute. - * - * @param aeEligibilityName aeext:eligibilityName. - * - * @param aeEligibilityID aeext:eligibilityID. - * - * @param aeEligibilityIDType aeext:eligibilityID type attribute. - */ - DEPRECATED( - AeDomainCreateCommand (const std::string& name, - const std::string& pw, - const std::string* registrantID, - const std::vector* techContacts, - const std::vector* adminContacts, - const std::vector* billingContacts, - const std::vector* nameservers, - const Period *period, - const std::string &aeEligibilityType, - int aePolicyReason, - const std::string& aeRegistrantName, - const std::string* aeRegistrantID, - const std::string* aeRegistrantIDType, - const std::string* aeEligibilityName, - const std::string* aeEligibilityID, - const std::string* aeEligibilityIDType)); -private: - void setExtension (const std::string& eligibilityType, - int PolicyReason, - const std::string& registrantName); - - void setExtension (const std::string& eligibilityType, - int PolicyReason, - const std::string& registrantName, - const std::string* registrantID, - const std::string& registrantIDType); - - /** - * <extension> - *  <create xmlns="urn:X-ae:params:xml:ns:aeext-1.0"> - *   <registrantName>registrantName</registrantName> - *   <registrantID type="registrantIDType">registrantID</registrantID> - *   <eligibilityType>eligibilityType</eligibilityType> - *   <eligibilityName>eligibilityName</eligibilityName> - *   <eligibilityID type="eligibilityIDType">eligibilityID</eligibilityID> - *   <policyReason>policyReason</policyReason> - *  </create> - * </extension> - */ - void setExtension (const std::string& eligibilityType, - int policyReason, - const std::string& registrantName, - const std::string* registrantID, - const std::string* registrantIDType, - const std::string* eligibilityName, - const std::string* eligibilityID, - const std::string* eligibilityIDType); -}; - - -#endif // __AEDOMAINCREATECOMMAND_HPP diff --git a/ACTK1_0/se/AeDomainCreateCommandTest.cpp b/ACTK1_0/se/AeDomainCreateCommandTest.cpp deleted file mode 100644 index dae539b..0000000 --- a/ACTK1_0/se/AeDomainCreateCommandTest.cpp +++ /dev/null @@ -1,86 +0,0 @@ -#include "se/ContactCheckCommand.hpp" -#include "se/AeDomainCreateCommand.hpp" -#include "se/CLTRID.hpp" -#include "session/Timer.hpp" -#include "common/init.hpp" -#include "common/Test.hpp" - -using namespace std; - -void doWork() -{ - init("/home/drde/etc/toolkit2.conf"); - - const string registrantName = "AusRegistry"; - const string registrantID = "01241326211"; - const string registrantIDType = "Trade License"; - const string eligibilityType = "Trade License (IT)"; - const int policyReason = 1; - const string eligibilityName = "Blah"; - const string eligibilityID = "1231239523"; - const string eligibilityIDType = "Trademark"; - - /** - * Test that the XML string generated for a minimal create domain command - * matches the expected XML for an EPP create domain command with those - * parameters. - */ - { - Timer::setTime("20070101.010101"); - CLTRID::setClID("JTKUTEST"); - - vector techIds; - techIds.push_back("JTKCON2"); - string registrant("JTKCON"); - AeDomainCreateCommand cmd("jtkutest.co.ae", "jtkUT3st", ®istrant, &techIds, - eligibilityType, policyReason, registrantName); - const string xml(cmd.toXML()); - ASSERT_EQ(xml, - "jtkutest.co.aeJTKCONJTKCON2jtkUT3stAusRegistryTrade License (IT)1JTKUTEST.20070101.010101.0"); - } - - /** - * Test that the XML string generated for a sample create domain command - * specified with all available parameters matches the expected XML for - * an EPP create domain command with those parameters. - * - */ - { - Timer::setTime("20070101.010101"); - CLTRID::setClID("JTKUTEST"); - - vector techIds; - techIds.push_back("JTKCON2"); - - vector adminContacts; - adminContacts.push_back("JTKCON"); - adminContacts.push_back("JTKCON2"); - - string registrant("JTKCON"); - - vector nameServers; - nameServers.push_back("ns1.ausregistry.net"); - nameServers.push_back("ns2.ausregistry.net"); - - Period period(48, PeriodUnit::MONTHS()); - - AeDomainCreateCommand cmd( - "jtkutest.co.ae", "jtkUT3st", ®istrant, - &techIds, &adminContacts, - NULL, &nameServers, &period, - eligibilityType, policyReason, - registrantName, ®istrantID, - ®istrantIDType, &eligibilityName, - &eligibilityID, &eligibilityIDType); - const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.co.ae48ns1.ausregistry.netns2.ausregistry.netJTKCONJTKCONJTKCON2JTKCON2jtkUT3stAusRegistry01241326211Trade License (IT)Blah12312395231JTKUTEST.20070101.010101.0"); - - } -} - -int main(int argc, char* argv[]) -{ - TEST_run(doWork); - return TEST_errorCount(); -} - diff --git a/ACTK1_0/se/AeDomainInfoResponse.cpp b/ACTK1_0/se/AeDomainInfoResponse.cpp deleted file mode 100644 index a929425..0000000 --- a/ACTK1_0/se/AeDomainInfoResponse.cpp +++ /dev/null @@ -1,57 +0,0 @@ -#include "se/AeDomainInfoResponse.hpp" -#include "se/StandardObjectType.hpp" - -#include // atoi() - -using namespace std; - -const std::string AeDomainInfoResponse::AEEXT_EXPR(Response::RESPONSE_EXPR() + "/e:extension/aeext:infData"); -const std::string AeDomainInfoResponse::AE_PROPERTIES_EXPR(AeDomainInfoResponse::AEEXT_EXPR + "/aeext:aeProperties"); -const std::string AeDomainInfoResponse::AE_REGISTRANT_NAME_EXPR(AeDomainInfoResponse::AE_PROPERTIES_EXPR + "/aeext:registrantName/text()"); -const std::string AeDomainInfoResponse::AE_REGISTRANT_ID_EXPR(AeDomainInfoResponse::AE_PROPERTIES_EXPR + "/aeext:registrantID/text()"); -const std::string AeDomainInfoResponse::AE_REGISTRANT_ID_TYPE_EXPR(AeDomainInfoResponse::AE_PROPERTIES_EXPR + "/aeext:registrantID/@type"); -const std::string AeDomainInfoResponse::AE_ELI_TYPE_EXPR(AeDomainInfoResponse::AE_PROPERTIES_EXPR + "/aeext:eligibilityType/text()"); -const std::string AeDomainInfoResponse::AE_ELI_NAME_EXPR(AeDomainInfoResponse::AE_PROPERTIES_EXPR + "/aeext:eligibilityName/text()"); -const std::string AeDomainInfoResponse::AE_ELI_ID_EXPR(AeDomainInfoResponse::AE_PROPERTIES_EXPR + "/aeext:eligibilityID/text()"); -const std::string AeDomainInfoResponse::AE_ELI_ID_TYPE_EXPR(AeDomainInfoResponse::AE_PROPERTIES_EXPR + "/aeext:eligibilityID/@type"); -const std::string AeDomainInfoResponse::AE_POLICY_REASON_EXPR(AeDomainInfoResponse::AE_PROPERTIES_EXPR + "/aeext:policyReason/text()"); - - - -AeDomainInfoResponse::AeDomainInfoResponse() : DomainInfoResponse() -{ - policyReason = 0; -} - -void AeDomainInfoResponse::fromXML (XMLDocument *xmlDoc) throw (ParsingException) -{ - DomainInfoResponse::fromXML(xmlDoc); - - if (!(resultArray[0].succeeded())) { - return; - } - - try - { - registrantName = xmlDoc->getNodeValue (AE_REGISTRANT_NAME_EXPR); - registrantID = xmlDoc->getNodeValue (AE_REGISTRANT_ID_EXPR); - registrantIDType = xmlDoc->getNodeValue (AE_REGISTRANT_ID_TYPE_EXPR); - eligibilityType = xmlDoc->getNodeValue (AE_ELI_TYPE_EXPR); - eligibilityName = xmlDoc->getNodeValue (AE_ELI_NAME_EXPR); - eligibilityID = xmlDoc->getNodeValue (AE_ELI_ID_EXPR); - eligibilityIDType = xmlDoc->getNodeValue (AE_ELI_ID_TYPE_EXPR); - - string polReasonStr = xmlDoc->getNodeValue (AE_POLICY_REASON_EXPR); - if (polReasonStr.length() > 0) { - policyReason = atoi (polReasonStr.c_str()); - } - } - catch (XPathExpressionException& e) - { - maintLogger->warning(e.getMessage()); - ParsingException pe("Could not parse AeDomainInfoResponse object."); - pe.causedBy(e); - throw pe; - } -} - diff --git a/ACTK1_0/se/AeDomainInfoResponse.hpp b/ACTK1_0/se/AeDomainInfoResponse.hpp deleted file mode 100644 index 2e2378d..0000000 --- a/ACTK1_0/se/AeDomainInfoResponse.hpp +++ /dev/null @@ -1,72 +0,0 @@ -#ifndef __AE_DOMAIN_INFO_RESPONSE_HPP -#define __AE_DOMAIN_INFO_RESPONSE_HPP - -#include "common/Deprecated.hpp" -#include "se/DomainInfoResponse.hpp" - -#include - -/** - * Extension of the domain mapping of the EPP info response, as defined in - * RFC3730 and RFC3731, to .ae domain names, the specification of which is in - * the XML schema definition urn:X-ae:params:xml:ns:aeext-1.0. - * Instances of this class provide an interface to access all of the - * information available through EPP for a .ae domain name. - * This relies on the instance first being initialised by a suitable EPP domain - * info response using the method fromXML. For flexibility, this - * implementation extracts the data from the response using XPath queries, the - * expressions for which are defined statically. - - * @deprecated AE eligibility extensions should now be managed through the - * @c extension defined in the - * urn:X-ar:params:xml:ns:kv-1.0 namespace. This can be done - * through the toolkit by using a @c DomainInfoResponse and - * registering a @c DomainInfoKVResponseExtension object, which - * will contain the AE eligibility extensions. - * - * See - * {@link DomainInfoResponse.registerExtension(ResponseExtension)} - * and - * {@link DomainInfoKVResponseExtension}. - */ -class AeDomainInfoResponse : public DomainInfoResponse -{ -public: - DEPRECATED(AeDomainInfoResponse()); - - const std::string& getRegistrantName() const { return registrantName; }; - const std::string& getAERegistrantID() const { return registrantID; }; - const std::string& getRegistrantIDType() const { return registrantIDType; }; - const std::string& getEligibilityType() const { return eligibilityType; }; - const std::string& getEligibilityName() const { return eligibilityName; }; - const std::string& getEligibilityID() const { return eligibilityID; }; - const std::string& getEligibilityIDType() const { return eligibilityIDType; }; - int getPolicyReason() const { return policyReason; }; - - virtual void fromXML (XMLDocument *xmlDoc) throw (ParsingException); - -private: - static const std::string AEEXT_EXPR, - AE_PROPERTIES_EXPR, - AE_REGISTRANT_NAME_EXPR, - AE_REGISTRANT_ID_EXPR, - AE_REGISTRANT_ID_TYPE_EXPR, - AE_ELI_TYPE_EXPR, - AE_ELI_NAME_EXPR, - AE_ELI_ID_EXPR, - AE_ELI_ID_TYPE_EXPR, - AE_POLICY_REASON_EXPR; - - std::string registrantName, - registrantID, - registrantIDType, - eligibilityType, - eligibilityName, - eligibilityID, - eligibilityIDType; - - int policyReason; -}; - -#endif // __AE_DOMAIN_INFO_RESPONSE_HPP - diff --git a/ACTK1_0/se/AeDomainModifyRegistrantCommand.cpp b/ACTK1_0/se/AeDomainModifyRegistrantCommand.cpp deleted file mode 100644 index db10b91..0000000 --- a/ACTK1_0/se/AeDomainModifyRegistrantCommand.cpp +++ /dev/null @@ -1,93 +0,0 @@ -#include "se/AeDomainModifyRegistrantCommand.hpp" -#include "common/ErrorPkg.hpp" -#include "se/AeExtension.hpp" -#include "xml/XMLHelper.hpp" - -namespace { - AeExtension& aeExtension() { - static AeExtension* aeExtension = new AeExtension(); - return *aeExtension; - } -}; // anonymous namespace - -AeDomainModifyRegistrantCommand::AeDomainModifyRegistrantCommand( - const std::string& name, - const std::string& registrantName, - const std::string& explanation, - const std::string* eligibilityType, - int policyReason, - const std::string* registrantID, - const std::string* registrantIDType, - const std::string* eligibilityName, - const std::string* eligibilityID, - const std::string* eligibilityIDType) : DomainUpdateCommand(name) -{ - if (eligibilityType == NULL - || (registrantID == NULL && registrantIDType != NULL) - || (registrantID != NULL && registrantIDType == NULL) - || (eligibilityID == NULL && eligibilityIDType != NULL) - || (eligibilityID != NULL && eligibilityIDType == NULL)) - { - throw IllegalArgException( - ErrorPkg::getMessage("se.domain.modify.ae.missing_arg")); - } - - DOMElement* aeextUpdate = xmlWriter->appendChild( - xmlWriter->appendChild(command, "extension"), - "update", - aeExtension().getURI()); - - aeextUpdate->setAttribute( - XStr("xsi:schemaLocation").str(), - XStr(aeExtension().getSchemaLocation()).str()); - - DOMElement* aeProperties = xmlWriter->appendChild(aeextUpdate, - "aeProperties"); - - XMLHelper::setTextContent( - xmlWriter->appendChild(aeProperties, "registrantName"), - registrantName); - - if (registrantID != NULL && registrantIDType != NULL) - { - xmlWriter->appendChild( - aeProperties, - "registrantID", - *registrantID, - "type", - *registrantIDType); - } - - if (eligibilityType != NULL) - { - XMLHelper::setTextContent( - xmlWriter->appendChild(aeProperties, "eligibilityType"), - *eligibilityType); - } - - if (eligibilityName != NULL) - { - XMLHelper::setTextContent( - xmlWriter->appendChild(aeProperties, "eligibilityName"), - *eligibilityName); - } - - if (eligibilityID != NULL && eligibilityIDType != NULL) - { - xmlWriter->appendChild( - aeProperties, - "eligibilityID", - *eligibilityID, - "type", - *eligibilityIDType); - } - - XMLHelper::setTextContent( - xmlWriter->appendChild(aeProperties, "policyReason"), - policyReason); - - XMLHelper::setTextContent( - xmlWriter->appendChild(aeextUpdate, "explanation"), - explanation); -} - diff --git a/ACTK1_0/se/AeDomainModifyRegistrantCommand.hpp b/ACTK1_0/se/AeDomainModifyRegistrantCommand.hpp deleted file mode 100644 index f67f0a0..0000000 --- a/ACTK1_0/se/AeDomainModifyRegistrantCommand.hpp +++ /dev/null @@ -1,46 +0,0 @@ -#ifndef __AE_DOMAIN_MODIFY_REGISTRANT_COMMAND_HPP -#define __AE_DOMAIN_MODIFY_REGISTRANT_COMMAND_HPP - -#include "common/Deprecated.hpp" -#include "se/DomainUpdateCommand.hpp" - -/** - * An extension of the domain mapping of the EPP update command, as defined in - * RFC3730 and RFC3731, to .ae domain names, the specification of which is in - * the XML schema definition urn:X-ae:params:xml:ns:aeext-1.0. - * This class should only be used to correct ae extension data for .ae domain - * names, and only where the legal registrant has not changed. - * Use this class to generate a standards-compliant XML document, given simple - * input parameters. The toXML method in Command serialises this object to - * XML. - * - * @deprecated AE eligibility extensions should now be managed through the - * @c extension defined in the - * urn:X-ar:params:xml:ns:kv-1.0 namespace. This can be done - * through the toolkit by using a @c DomainUpdateCommand and - * appending a @c DomainKVCommandExtension object containing - * the AE eligibility extensions. - * - * See - * {@link DomainUpdateCommand.appendExtension(CommandExtension)} - * and - * {@link DomainKVCommandExtension}. - */ -class AeDomainModifyRegistrantCommand : public DomainUpdateCommand -{ -public: - DEPRECATED( - AeDomainModifyRegistrantCommand(const std::string& name, - const std::string& registrantName, - const std::string& explanation, - const std::string* eligibilityType = NULL, - int policyReason = 0, - const std::string* registrantID = NULL, - const std::string* registrantIDType = NULL, - const std::string* eligibilityName = NULL, - const std::string* eligibilityID = NULL, - const std::string* eligibilityIDType = NULL)); -}; - -#endif // __AE_DOMAIN_MODIFY_REGISTRANT_COMMAND_HPP - diff --git a/ACTK1_0/se/AeDomainObjectType.cpp b/ACTK1_0/se/AeDomainObjectType.cpp deleted file mode 100644 index 718cb60..0000000 --- a/ACTK1_0/se/AeDomainObjectType.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include "AeDomainObjectType.hpp" - -#include - -const std::string& AeDomainObjectType::getName() const { - static const std::string name = "aedom"; - return name; -} - -const std::string& AeDomainObjectType::getURI() const { - static const std::string uri = "urn:X-ae:params:xml:ns:aedomain-1.0"; - return uri; -} - -const std::string& AeDomainObjectType::getSchemaLocation() const { - static const std::string schemaLocation = - "urn:X-ae:params:xml:ns:aedomain-1.0 aedomain-1.0.xsd"; - return schemaLocation; -} - -const std::string& AeDomainObjectType::getIdentType() const { - static const std::string ident = "name"; - return ident; -} - diff --git a/ACTK1_0/se/AeDomainObjectType.hpp b/ACTK1_0/se/AeDomainObjectType.hpp deleted file mode 100644 index 38485a5..0000000 --- a/ACTK1_0/se/AeDomainObjectType.hpp +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef AEDOMAIN_OBJECT_TYPE -#define AEDOMAIN_OBJECT_TYPE - -#include "ObjectType.hpp" - -#include - -class AeDomainObjectType : public ObjectType { -public: - virtual ~AeDomainObjectType(void) { } - - virtual const std::string& getName() const; - virtual const std::string& getURI() const; - virtual const std::string& getSchemaLocation() const; - virtual const std::string& getIdentType() const; -}; - -#endif // AEDOMAIN_OBJECT_TYPE - diff --git a/ACTK1_0/se/AeDomainTransferRegistrantCommand.cpp b/ACTK1_0/se/AeDomainTransferRegistrantCommand.cpp deleted file mode 100644 index 70df3ef..0000000 --- a/ACTK1_0/se/AeDomainTransferRegistrantCommand.cpp +++ /dev/null @@ -1,92 +0,0 @@ -#include "se/AeDomainTransferRegistrantCommand.hpp" -#include "se/XMLGregorianCalendar.hpp" - -#include "se/AeExtension.hpp" -#include "se/AeDomainObjectType.hpp" -#include "se/RegistrantTransferCommandType.hpp" -#include "se/CommandType.hpp" -#include "se/Period.hpp" -#include "common/ErrorPkg.hpp" - -#include "se/EPPDateFormatter.hpp" - -#include "xml/XMLHelper.hpp" - -namespace { - Extension& aeExtension() { - static Extension* aeExt = new AeExtension(); - return *aeExt; - } - - const RegistrantTransferCommandType rtrnType; - AeDomainObjectType aedomType; -} // anonymous namespace - -AeDomainTransferRegistrantCommand::AeDomainTransferRegistrantCommand ( - const std::string& name, - const XMLGregorianCalendar& curExpDate, - const std::string& eligibilityType, - int policyReason, - const std::string& registrantName, - const std::string& explanation, - const std::string* registrantID, - const std::string* registrantIDType, - const std::string* eligibilityName, - const std::string* eligibilityID, - const std::string* eligibilityIDType, - const Period* period) : ProtocolExtensionCommand( - &rtrnType, &aedomType, name, aeExtension()) -{ - if ((registrantID && registrantIDType == NULL) - || (registrantIDType == NULL && registrantIDType) - || (eligibilityName && (eligibilityID == NULL || eligibilityIDType == NULL)) - || (eligibilityName == NULL && (eligibilityID || eligibilityIDType))) - { - // If provided, a registrantID must have a type. - // If provided, an eligibilityName must have both an eligibilityID and type. - throw IllegalArgException( - ErrorPkg::getMessage("se.domain.registrantTransfer.ae.missing_arg")); - } - - DOMElement *element; - - std::string curExpDateStr = EPPDateFormatter::toXSDate(curExpDate); - XMLHelper::setTextContent( - xmlWriter->appendChild(objElement, "curExpDate"), curExpDateStr); - - if (period) - period->appendPeriod(xmlWriter, objElement); - - DOMElement *aeProperties = xmlWriter->appendChild(objElement, "aeProperties"); - - XMLHelper::setTextContent( - xmlWriter->appendChild(aeProperties, "registrantName"), registrantName); - - if (registrantID) - { - element = xmlWriter->appendChild(aeProperties, "registrantID"); - XMLHelper::setTextContent(element, *registrantID); - XMLHelper::setAttribute(element, "type", *registrantIDType); - } - XMLHelper::setTextContent - (xmlWriter->appendChild(aeProperties, "eligibilityType"), eligibilityType); - - if (eligibilityName) - { - XMLHelper::setTextContent( - xmlWriter->appendChild(aeProperties, "eligibilityName"), *eligibilityName); - - element = xmlWriter->appendChild(aeProperties, "eligibilityID"); - XMLHelper::setTextContent(element, *eligibilityID); - XMLHelper::setAttribute(element, "type", *eligibilityIDType); - } - - XMLHelper::setTextContent( - xmlWriter->appendChild(aeProperties, "policyReason"), - policyReason); - - XMLHelper::setTextContent( - xmlWriter->appendChild(objElement, "explanation"), - explanation); -} - diff --git a/ACTK1_0/se/AeDomainTransferRegistrantCommand.hpp b/ACTK1_0/se/AeDomainTransferRegistrantCommand.hpp deleted file mode 100644 index c85a161..0000000 --- a/ACTK1_0/se/AeDomainTransferRegistrantCommand.hpp +++ /dev/null @@ -1,88 +0,0 @@ -#ifndef __AE_DOMAIN_TRANSFER_REGISTRANT_COMMAND_HPP -#define __AE_DOMAIN_TRANSFER_REGISTRANT_COMMAND_HPP - -#include "common/Deprecated.hpp" -#include "se/ProtocolExtensionCommand.hpp" -class XMLGregorianCalendar; -class Period; - -/** - * In cases where the legal registrant of a .ae domain name has changed, this - * class should be used to request a transfer of registrant. This is a - * different action to correcting extension data which was originally specified - * incorrectly, and should only be used in the situation described. This - * command will result in the validity period of the domain name being updated - * and the requesting client being charged the usual create fee upon success of - * this operation. - * Use this class to generate a standards-compliant XML document, given simple - * input parameters. The toXML method in Command serialises this object to - * XML. - - * @deprecated AE eligibility extensions should now be managed through the - * @c extension defined in the - * urn:X-ar:params:xml:ns:kv-1.0 namespace. The Registrant - * Transfer command that utilises this extension is defined in the - * urn:X-ar:params:xml:ns:registrant-1.0 namespace. This can - * be done through the toolkit by using a - * @c DomainRegistrantTransferCommand and specifying - * @c "ae" as the kvListName. - * - * See - * {@link DomainRegistrantTransferCommand} - * and - * {@link DomainRegistrantTransferCommand.addItem(std::string, std::string)} - */ -class AeDomainTransferRegistrantCommand : public ProtocolExtensionCommand -{ -public: - - /** - * Request that the named .ae domain name be transferred to the legal - * entity specified by the given ae extension data. - * - * @param name The domain name to transfer. - * - * @param curExpDate The current expiry of the identified domain name. - * This is required in order to prevent repeated transfer of the name due - * to protocol transmission failures. - * - * @param eligibilityType - * - * @param policyReason - * - * @param registrantName - * - * @param explanation An explanation of how the transfer was effected. - * - * @param registrantID - * - * @param registrantIDType - * - * @param eligibilityName - * - * @param eligibilityID - * - * @param eligibilityIDType - * - * @param period The desired new validity period, starting from the time - * the transfer completes successfully. - * - * @param explanation An explanation of how the transfer was effected. - */ - DEPRECATED( - AeDomainTransferRegistrantCommand (const std::string& name, - const XMLGregorianCalendar& curExpDate, - const std::string& eligibilityType, - int policyReason, - const std::string& registrantName, - const std::string& explanation, - const std::string* registrantID = NULL, - const std::string* registrantIDType = NULL, - const std::string* eligibilityName = NULL, - const std::string* eligibilityID = NULL, - const std::string* eligibilityIDType = NULL, - const Period* period = NULL)); -}; - -#endif // __AE_DOMAIN_TRANSFER_REGISTRANT_COMMAND_HPP - diff --git a/ACTK1_0/se/AeDomainTransferRegistrantResponse.cpp b/ACTK1_0/se/AeDomainTransferRegistrantResponse.cpp deleted file mode 100644 index 937a20d..0000000 --- a/ACTK1_0/se/AeDomainTransferRegistrantResponse.cpp +++ /dev/null @@ -1,37 +0,0 @@ -#include "se/AeDomainTransferRegistrantResponse.hpp" -#include "se/AeDomainObjectType.hpp" -#include "se/RegistrantTransferCommandType.hpp" -#include "se/EPPDateFormatter.hpp" - -namespace { - const RegistrantTransferCommandType rtrnType; - AeDomainObjectType aedomType; -} // anonymous namespace - -using namespace std; - -const string AeDomainTransferRegistrantResponse::AEDOM_NAME_EXPR = - "/e:epp/e:response/e:resData/aedom:rtrnData/aedom:name/text()"; - -const string AeDomainTransferRegistrantResponse::AEDOM_EX_DATE_EXPR = - "/e:epp/e:response/e:resData/aedom:rtrnData/aedom:exDate/text()"; - -AeDomainTransferRegistrantResponse::AeDomainTransferRegistrantResponse() - : DataResponse(&rtrnType, &aedomType) -{ -} - -void AeDomainTransferRegistrantResponse::fromXML(XMLDocument* xmlDoc) throw (ParsingException) -{ - DataResponse::fromXML(xmlDoc); - - if (!(resultArray[0].succeeded())) { - return; - } - - name = xmlDoc->getNodeValue(AEDOM_NAME_EXPR); - std::string exDateStr = xmlDoc->getNodeValue(AEDOM_EX_DATE_EXPR); - exDate = std::auto_ptr( - EPPDateFormatter::fromXSDateTime(exDateStr)); -} - diff --git a/ACTK1_0/se/AeDomainTransferRegistrantResponse.hpp b/ACTK1_0/se/AeDomainTransferRegistrantResponse.hpp deleted file mode 100644 index 3dd97cc..0000000 --- a/ACTK1_0/se/AeDomainTransferRegistrantResponse.hpp +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef __AE_DOMAIN_TRANSFER_REGISTRANT_RESPONSE -#define __AE_DOMAIN_TRANSFER_REGISTRANT_RESPONSE - -#include "common/Deprecated.hpp" -#include "se/DataResponse.hpp" -#include "se/XMLGregorianCalendar.hpp" - -/** - * Use this to access create data for a domain as provided in an EPP domain - * create response compliant with RFCs 3730 and 3731. Such a service element - * is sent by a compliant EPP server in response to a valid domain create - * command, implemented by the DomainCreateCommand. - * - * @see DomainCreateCommand - - * @deprecated Performing a registrant transfer with AE eligibility extensions - * should now be managed through the use of the - * @c DomainRegistrantTransferCommand and - * @c DomainRegistrantTransferResponse - * - * See - * {@link DomainRegistrantTransferCommand} - * and - * {@link DomainRegistrantTransferResponse}. - */ -class AeDomainTransferRegistrantResponse : public DataResponse -{ -public: - DEPRECATED(AeDomainTransferRegistrantResponse()); - - const std::string& getName() { return name; } - const XMLGregorianCalendar* getExpiryDate() { return exDate.get(); } - void fromXML(XMLDocument* xmlDoc) throw (ParsingException); - -private: - static const std::string AEDOM_NAME_EXPR; - static const std::string AEDOM_EX_DATE_EXPR; - - std::string name; - std::auto_ptr exDate; -}; - -#endif // __AE_DOMAIN_TRANSFER_REGISTRANT_RESPONSE - diff --git a/ACTK1_0/se/AeExtension.cpp b/ACTK1_0/se/AeExtension.cpp deleted file mode 100644 index ceb46bf..0000000 --- a/ACTK1_0/se/AeExtension.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "se/AeExtension.hpp" - -std::string& AeExtension::getURI() const -{ - static std::string uri = "urn:X-ae:params:xml:ns:aeext-1.0"; - return uri; -} - -std::string& AeExtension::getSchemaLocation() const -{ - static std::string loc = "urn:X-ae:params:xml:ns:aeext-1.0 aeext-1.0.xsd"; - return loc; -} - diff --git a/ACTK1_0/se/AeExtension.hpp b/ACTK1_0/se/AeExtension.hpp deleted file mode 100644 index 6c8b529..0000000 --- a/ACTK1_0/se/AeExtension.hpp +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef __AEEXTENSION_HPP -#define __AEEXTENSION_HPP - -#include "se/Extension.hpp" - -/** - * A bundled set of constants representing the .ae EPP extension - * schema. The namespace URI uniquely identifies the extension. - */ -class AeExtension : public Extension -{ -public: - - virtual ~AeExtension(void) { } - - /** - * Get the globally unique namespace URI which identifies this extension. - */ - virtual std::string& getURI() const; - - /** - * Get the location hint for the XML schema used to validate EPP service - * element instances using this extension. - */ - virtual std::string& getSchemaLocation() const; -}; - -#endif // __AEEXTENSION_HPP - diff --git a/ACTK1_0/se/ContactCheckCommandTest.cpp b/ACTK1_0/se/ContactCheckCommandTest.cpp index 864ff12..4a75736 100644 --- a/ACTK1_0/se/ContactCheckCommandTest.cpp +++ b/ACTK1_0/se/ContactCheckCommandTest.cpp @@ -8,7 +8,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { Timer::setTime("20070101.010101"); CLTRID::setClID("JTKUTEST"); diff --git a/ACTK1_0/se/ContactCheckResponseTest.cpp b/ACTK1_0/se/ContactCheckResponseTest.cpp index 07b407b..4eb3ff7 100644 --- a/ACTK1_0/se/ContactCheckResponseTest.cpp +++ b/ACTK1_0/se/ContactCheckResponseTest.cpp @@ -8,7 +8,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); const string xml = "Command completed successfullysh8013sah8013In use8013sahABC-1234554322-XYZ"; diff --git a/ACTK1_0/se/ContactDeleteCommandTest.cpp b/ACTK1_0/se/ContactDeleteCommandTest.cpp index 3d51810..1005386 100644 --- a/ACTK1_0/se/ContactDeleteCommandTest.cpp +++ b/ACTK1_0/se/ContactDeleteCommandTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { CLTRID::setClID("JTKUTEST"); Timer::setTime("20070101.010101"); diff --git a/ACTK1_0/se/ContactInfoCommandTest.cpp b/ACTK1_0/se/ContactInfoCommandTest.cpp index 8f6dcff..9b45ba3 100644 --- a/ACTK1_0/se/ContactInfoCommandTest.cpp +++ b/ACTK1_0/se/ContactInfoCommandTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { CLTRID::setClID("JTKUTEST"); Timer::setTime("20070101.010101"); diff --git a/ACTK1_0/se/ContactInfoResponseTest.cpp b/ACTK1_0/se/ContactInfoResponseTest.cpp index 495616f..36801b7 100644 --- a/ACTK1_0/se/ContactInfoResponseTest.cpp +++ b/ACTK1_0/se/ContactInfoResponseTest.cpp @@ -13,7 +13,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); const string xml( "Command completed successfullysh8013SH8013-REPJohn DoeExample Inc.123 Example Dr.Suite 100DullesVA20166-6503US+1.7035555555+1.7035555556jdoe@example.comClientYClientX1999-04-03T22:00:00.0ZClientX1999-12-03T09:00:00.0Z2000-04-08T09:00:00.0Z2fooBARABC-1234554322-XYZ"); diff --git a/ACTK1_0/se/ContactTransferRequestCommandTest.cpp b/ACTK1_0/se/ContactTransferRequestCommandTest.cpp index 7417746..8efbddc 100644 --- a/ACTK1_0/se/ContactTransferRequestCommandTest.cpp +++ b/ACTK1_0/se/ContactTransferRequestCommandTest.cpp @@ -12,7 +12,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { Timer::setTime("20070101.010101"); CLTRID::setClID("JTKUTEST"); diff --git a/ACTK1_0/se/DomainCheckCommandTest.cpp b/ACTK1_0/se/DomainCheckCommandTest.cpp index c7725f1..0dadfd2 100644 --- a/ACTK1_0/se/DomainCheckCommandTest.cpp +++ b/ACTK1_0/se/DomainCheckCommandTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { CLTRID::setClID("JTKUTEST"); Timer::setTime("20070101.010101"); diff --git a/ACTK1_0/se/DomainCheckResponseTest.cpp b/ACTK1_0/se/DomainCheckResponseTest.cpp index 5bc2763..48b2bf3 100644 --- a/ACTK1_0/se/DomainCheckResponseTest.cpp +++ b/ACTK1_0/se/DomainCheckResponseTest.cpp @@ -12,7 +12,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); const string xml = "Command completed successfullyexample.comexample.netIn useexample.orgABC-1234554322-XYZ"; diff --git a/ACTK1_0/se/DomainDeleteCommandTest.cpp b/ACTK1_0/se/DomainDeleteCommandTest.cpp index ec10d7f..311d2d7 100644 --- a/ACTK1_0/se/DomainDeleteCommandTest.cpp +++ b/ACTK1_0/se/DomainDeleteCommandTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { CLTRID::setClID("JTKUTEST"); Timer::setTime("20070101.010101"); diff --git a/ACTK1_0/se/DomainInfoCommandTest.cpp b/ACTK1_0/se/DomainInfoCommandTest.cpp index 0412215..1e6c5b9 100644 --- a/ACTK1_0/se/DomainInfoCommandTest.cpp +++ b/ACTK1_0/se/DomainInfoCommandTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { CLTRID::setClID("JTKUTEST"); Timer::setTime("20070101.010101"); diff --git a/ACTK1_0/se/DomainInfoKVResponseExtensionTest.cpp b/ACTK1_0/se/DomainInfoKVResponseExtensionTest.cpp index 7bc351b..3928749 100644 --- a/ACTK1_0/se/DomainInfoKVResponseExtensionTest.cpp +++ b/ACTK1_0/se/DomainInfoKVResponseExtensionTest.cpp @@ -113,7 +113,7 @@ void checkKeyValueList(const DomainInfoKVResponseExtension &kvExtension, const s int main(int argc, char* argv[]) { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); TEST_run(testNonExistentListName); TEST_run(testNonExistentItem); TEST_run(testNotInitialisedWhenNoKVExtensionPresent); diff --git a/ACTK1_0/se/DomainKVCommandExtensionTest.cpp b/ACTK1_0/se/DomainKVCommandExtensionTest.cpp index b812b4b..f18523f 100644 --- a/ACTK1_0/se/DomainKVCommandExtensionTest.cpp +++ b/ACTK1_0/se/DomainKVCommandExtensionTest.cpp @@ -82,7 +82,7 @@ void addSampleItemsToExtension(DomainKVCommandExtension &extension, const string int main(int argc, char* argv[]) { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); TEST_run(testUpdateSingleKVList); TEST_run(testCreateSingleKVList); TEST_run(testMultipleKVList); diff --git a/ACTK1_0/se/DomainRegistrantTransferCommand.hpp b/ACTK1_0/se/DomainRegistrantTransferCommand.hpp index bfaf4e3..2a34f5c 100644 --- a/ACTK1_0/se/DomainRegistrantTransferCommand.hpp +++ b/ACTK1_0/se/DomainRegistrantTransferCommand.hpp @@ -2,7 +2,7 @@ #define DOMAIN_REGISTRANT_TRANSFER_COMMAND_HPP_ #include - +#include #include "se/Command.hpp" #include "se/KVDefs.hpp" diff --git a/ACTK1_0/se/DomainRegistrantTransferCommandTest.cpp b/ACTK1_0/se/DomainRegistrantTransferCommandTest.cpp index 39b8b7e..3ff3343 100644 --- a/ACTK1_0/se/DomainRegistrantTransferCommandTest.cpp +++ b/ACTK1_0/se/DomainRegistrantTransferCommandTest.cpp @@ -16,7 +16,7 @@ const static std::string policyReason = "1"; const static std::string eligibilityName = "Blah"; const static std::string eligibilityIDValue = "1231239523"; const static std::string eligibilityIDType = "Trademark"; -const auto_ptr curExpDate(EPPDateFormatter::fromXSDateTime("2007-01-01T01:01:01.0Z")); +const auto_ptr curExpDate(EPPDateFormatter::fromXSDateTime("2014-01-01T01:01:01.0Z")); const static std::string kvListName = "ae"; void addSampleKVItems(DomainRegistrantTransferCommand *command); @@ -66,7 +66,7 @@ void addSampleKVItems(DomainRegistrantTransferCommand *command) int main(int argc, char* argv[]) { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); TEST_run(testWithoutPeriod); // TEST_run(testWithPeriod); return TEST_errorCount(); diff --git a/ACTK1_0/se/DomainRegistrantTransferResponseTest.cpp b/ACTK1_0/se/DomainRegistrantTransferResponseTest.cpp index ead79a5..6422216 100644 --- a/ACTK1_0/se/DomainRegistrantTransferResponseTest.cpp +++ b/ACTK1_0/se/DomainRegistrantTransferResponseTest.cpp @@ -9,7 +9,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); const string xml = "Command completed successfullyexample.com2009-04-03T22:00:00.0ZABC-1234554321-XYZ"; diff --git a/ACTK1_0/se/DomainTransferQueryCommandTest.cpp b/ACTK1_0/se/DomainTransferQueryCommandTest.cpp index d48621c..4b9464b 100644 --- a/ACTK1_0/se/DomainTransferQueryCommandTest.cpp +++ b/ACTK1_0/se/DomainTransferQueryCommandTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { CLTRID::setClID("JTKUTEST"); Timer::setTime("20070101.010101"); diff --git a/ACTK1_0/se/DomainUpdateCommandTest.cpp b/ACTK1_0/se/DomainUpdateCommandTest.cpp index 22fdae6..9d0f117 100644 --- a/ACTK1_0/se/DomainUpdateCommandTest.cpp +++ b/ACTK1_0/se/DomainUpdateCommandTest.cpp @@ -113,7 +113,7 @@ void testSyncExpiryDateExtensionWithNullDate(void) int main(int argc, char* argv[]) { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); TEST_run(testSimpleUpdate); TEST_run(testFullUpdate); TEST_run(testSyncExpiryDateExtension); diff --git a/ACTK1_0/se/EnumDomainInfoResponseTest.cpp b/ACTK1_0/se/EnumDomainInfoResponseTest.cpp index 623bed5..11fc29d 100644 --- a/ACTK1_0/se/EnumDomainInfoResponseTest.cpp +++ b/ACTK1_0/se/EnumDomainInfoResponseTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); const string xml = "Command completed successfully3.8.0.0.6.9.2.3.6.1.4.4.e164.arpaEXAMPLE1-REPjd1234sh8013sh8013ns1.example.comns2.example.comns1.example.comns2.example.comClientXClientY1999-04-03T22:00:00.0ZClientX1999-12-03T09:00:00.0Z2005-04-03T22:00:00.0Z2000-04-08T09:00:00.0Z2fooBAR10100uE2U+sip\"!^.*$!sip:info@example.com!\"10102uE2U+msg\"!^.*$!mailto:info@example.com!\"ABC-1234554322-XYZ"; diff --git a/ACTK1_0/se/HelloTest.cpp b/ACTK1_0/se/HelloTest.cpp index 00e84f2..15966ef 100644 --- a/ACTK1_0/se/HelloTest.cpp +++ b/ACTK1_0/se/HelloTest.cpp @@ -9,7 +9,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); CLTRID::setClID("JTKUTEST"); Hello cmd; diff --git a/ACTK1_0/se/HostCheckCommandTest.cpp b/ACTK1_0/se/HostCheckCommandTest.cpp index 9081b0c..637a903 100644 --- a/ACTK1_0/se/HostCheckCommandTest.cpp +++ b/ACTK1_0/se/HostCheckCommandTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { CLTRID::setClID("JTKUTEST"); Timer::setTime("20070101.010101"); diff --git a/ACTK1_0/se/HostCreateCommandTest.cpp b/ACTK1_0/se/HostCreateCommandTest.cpp index 9824aa8..26196c3 100644 --- a/ACTK1_0/se/HostCreateCommandTest.cpp +++ b/ACTK1_0/se/HostCreateCommandTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { CLTRID::setClID("JTKUTEST"); Timer::setTime("20070101.010101"); diff --git a/ACTK1_0/se/HostDeleteCommandTest.cpp b/ACTK1_0/se/HostDeleteCommandTest.cpp index af8a35b..88ac3f9 100644 --- a/ACTK1_0/se/HostDeleteCommandTest.cpp +++ b/ACTK1_0/se/HostDeleteCommandTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { CLTRID::setClID("JTKUTEST"); Timer::setTime("20070101.010101"); diff --git a/ACTK1_0/se/HostInfoCommandTest.cpp b/ACTK1_0/se/HostInfoCommandTest.cpp index 512ad96..72661bb 100644 --- a/ACTK1_0/se/HostInfoCommandTest.cpp +++ b/ACTK1_0/se/HostInfoCommandTest.cpp @@ -8,7 +8,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); Timer::setTime("20070101.010101"); CLTRID::setClID("JTKUTEST"); diff --git a/ACTK1_0/se/HostInfoResponseTest.cpp b/ACTK1_0/se/HostInfoResponseTest.cpp index 531cc08..5babb22 100644 --- a/ACTK1_0/se/HostInfoResponseTest.cpp +++ b/ACTK1_0/se/HostInfoResponseTest.cpp @@ -12,7 +12,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); const string xml( "Command completed successfullyns1.example.comNS1_EXAMPLE1-REP192.0.2.2192.0.2.291080:0:0:0:8:800:200C:417AClientYClientX1999-04-03T22:00:00.0ZClientX1999-12-03T09:00:00.0Z2000-04-08T09:00:00.0ZABC-1234554322-XYZ"); diff --git a/ACTK1_0/se/IPVersionTest.cpp b/ACTK1_0/se/IPVersionTest.cpp index b89fe5b..7be8494 100644 --- a/ACTK1_0/se/IPVersionTest.cpp +++ b/ACTK1_0/se/IPVersionTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { ASSERT_EQ(IPVersion::IPv4()->toString(), "v4"); ASSERT_EQ(IPVersion::IPv6()->toString(), "v6"); diff --git a/ACTK1_0/se/LoginCommandTest.cpp b/ACTK1_0/se/LoginCommandTest.cpp index 4c86e13..7472bc2 100644 --- a/ACTK1_0/se/LoginCommandTest.cpp +++ b/ACTK1_0/se/LoginCommandTest.cpp @@ -19,7 +19,7 @@ void doWork() const vector extURIs(1, "urn:au:params:xml:ns:auext-1.0"); - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { Timer::setTime("20070101.010101"); CLTRID::setClID("JTKUTEST"); diff --git a/ACTK1_0/se/LogoutCommandTest.cpp b/ACTK1_0/se/LogoutCommandTest.cpp index 599fc47..f57c185 100644 --- a/ACTK1_0/se/LogoutCommandTest.cpp +++ b/ACTK1_0/se/LogoutCommandTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { CLTRID::setClID("JTKUTEST"); Timer::setTime("20070101.010101"); diff --git a/ACTK1_0/se/PollAckCommandTest.cpp b/ACTK1_0/se/PollAckCommandTest.cpp index 588fe80..11fe25c 100644 --- a/ACTK1_0/se/PollAckCommandTest.cpp +++ b/ACTK1_0/se/PollAckCommandTest.cpp @@ -8,7 +8,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); Timer::setTime("20070101.010101"); CLTRID::setClID("JTKUTEST"); diff --git a/ACTK1_0/se/PollResponseTest.cpp b/ACTK1_0/se/PollResponseTest.cpp index d411703..df50907 100644 --- a/ACTK1_0/se/PollResponseTest.cpp +++ b/ACTK1_0/se/PollResponseTest.cpp @@ -16,7 +16,7 @@ PollResponse& getPollResponse(const string xml); void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); testContactTransferApprovePoll(); testDomainTransferApprovePoll(); diff --git a/ACTK1_0/se/RegistrantTransferCommandType.hpp b/ACTK1_0/se/RegistrantTransferCommandType.hpp index dd4bf96..405f911 100644 --- a/ACTK1_0/se/RegistrantTransferCommandType.hpp +++ b/ACTK1_0/se/RegistrantTransferCommandType.hpp @@ -1,6 +1,7 @@ #ifndef REGISTRANT_TRANSFER_COMMAND_TYPE #define REGISTRANT_TRANSFER_COMMAND_TYPE +#include #include "se/CommandType.hpp" #include diff --git a/ACTK1_0/se/XMLGregorianCalendar.cpp b/ACTK1_0/se/XMLGregorianCalendar.cpp index 5b1fbe2..669ce93 100644 --- a/ACTK1_0/se/XMLGregorianCalendar.cpp +++ b/ACTK1_0/se/XMLGregorianCalendar.cpp @@ -1,7 +1,7 @@ + #include "se/XMLGregorianCalendar.hpp" #include "common/StringUtils.hpp" #include "common/EPPException.hpp" - #include #include #include // isdigit() diff --git a/ACTK1_0/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp b/ACTK1_0/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp index ac6202a..4d3673e 100644 --- a/ACTK1_0/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp +++ b/ACTK1_0/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp @@ -147,7 +147,7 @@ void testSecDNSJustKeyData() int main(int argc, char* argv[]) { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); TEST_run(testSecDNSAllFields); TEST_run(testSecDNSMultipleDSDataWithoutMaxSigLife); TEST_run(testSecDNSAllFieldsMin); diff --git a/ACTK1_0/se/secDNS/DomainSecDNSInfoResponseExtensionTest.cpp b/ACTK1_0/se/secDNS/DomainSecDNSInfoResponseExtensionTest.cpp index 312f314..603e736 100644 --- a/ACTK1_0/se/secDNS/DomainSecDNSInfoResponseExtensionTest.cpp +++ b/ACTK1_0/se/secDNS/DomainSecDNSInfoResponseExtensionTest.cpp @@ -239,7 +239,7 @@ void buildXmlResponseBeforeExtension(const string& domainName, int main(int argc, char* argv[]) { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); TEST_run(testSecDNSInfoExtensionAllFields); TEST_run(testSecDNSInfoExtensionOnlyKeyData); TEST_run(testSecDNSInfoExtensionMultipleDsRecords); diff --git a/ACTK1_0/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp b/ACTK1_0/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp index e5c7859..8873439 100644 --- a/ACTK1_0/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp +++ b/ACTK1_0/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp @@ -191,7 +191,7 @@ void testSecDNSRemoveAllAndAddKeyDataAndChangeMaxSigLife() int main(int argc, char* argv[]) { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); TEST_run(testSecDNSAddFieldsUrgent); TEST_run(testSecDNSRemoveFieldsNotUrgent); TEST_run(testSecDNSRemoveAll); diff --git a/ACTK1_0/session/CommandCounterTest.cpp b/ACTK1_0/session/CommandCounterTest.cpp index 9e65822..83dcbe1 100644 --- a/ACTK1_0/session/CommandCounterTest.cpp +++ b/ACTK1_0/session/CommandCounterTest.cpp @@ -88,7 +88,7 @@ void testPollCount() int main(int argc, char* argv[]) { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); TEST_run(testLoginCount); TEST_run(testMixedCommandsCount); diff --git a/ACTK1_0/session/SessionManagerTest.cpp b/ACTK1_0/session/SessionManagerTest.cpp index a0d7098..7b9bfe4 100644 --- a/ACTK1_0/session/SessionManagerTest.cpp +++ b/ACTK1_0/session/SessionManagerTest.cpp @@ -26,9 +26,9 @@ static TestEnvironment props; void doWork() { if (!tkScenario) - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); else - scenario(tkScenario); + scenario(tkScenario,"./etc/toolkit2.conf"); string op("shutdown"); { diff --git a/ACTK1_0/session/SessionTest.cpp b/ACTK1_0/session/SessionTest.cpp index 7be548c..3ea26c0 100644 --- a/ACTK1_0/session/SessionTest.cpp +++ b/ACTK1_0/session/SessionTest.cpp @@ -20,9 +20,9 @@ extern int tkScenario; void doWork() { if (!tkScenario) - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); else - scenario(tkScenario); + scenario(tkScenario,"./etc/toolkit2.conf"); { TestEnvironment props; auto_ptr sess(SessionFactory::newInstance(&props)); diff --git a/AusRegEPPTK/se/AeDomainCreateCommandTest.cpp b/AusRegEPPTK/se/AeDomainCreateCommandTest.cpp index dae539b..5cbf47a 100644 --- a/AusRegEPPTK/se/AeDomainCreateCommandTest.cpp +++ b/AusRegEPPTK/se/AeDomainCreateCommandTest.cpp @@ -9,7 +9,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); const string registrantName = "AusRegistry"; const string registrantID = "01241326211"; diff --git a/AusRegEPPTK/se/ArDomainPolicyDeleteCommandTest.cpp b/AusRegEPPTK/se/ArDomainPolicyDeleteCommandTest.cpp index 3e7a79a..b886c26 100644 --- a/AusRegEPPTK/se/ArDomainPolicyDeleteCommandTest.cpp +++ b/AusRegEPPTK/se/ArDomainPolicyDeleteCommandTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { Timer::setTime("20070101.010101"); CLTRID::setClID("JTKUTEST"); diff --git a/AusRegEPPTK/se/ArDomainPolicyUndeleteCommandTest.cpp b/AusRegEPPTK/se/ArDomainPolicyUndeleteCommandTest.cpp index 4b38689..f914738 100644 --- a/AusRegEPPTK/se/ArDomainPolicyUndeleteCommandTest.cpp +++ b/AusRegEPPTK/se/ArDomainPolicyUndeleteCommandTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { Timer::setTime("20070101.010101"); CLTRID::setClID("JTKUTEST"); diff --git a/AusRegEPPTK/se/ArDomainUndeleteCommandTest.cpp b/AusRegEPPTK/se/ArDomainUndeleteCommandTest.cpp index d1639c1..1979e03 100644 --- a/AusRegEPPTK/se/ArDomainUndeleteCommandTest.cpp +++ b/AusRegEPPTK/se/ArDomainUndeleteCommandTest.cpp @@ -11,7 +11,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); Timer::setTime("20070101.010101"); CLTRID::setClID("JTKUTEST"); diff --git a/AusRegEPPTK/se/ArDomainUnrenewCommandTest.cpp b/AusRegEPPTK/se/ArDomainUnrenewCommandTest.cpp index 719404e..5d2bc68 100644 --- a/AusRegEPPTK/se/ArDomainUnrenewCommandTest.cpp +++ b/AusRegEPPTK/se/ArDomainUnrenewCommandTest.cpp @@ -11,15 +11,15 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); Timer::setTime("20070101.010101"); CLTRID::setClID("JTKUTEST"); ArDomainUnrenewCommand cmd( - "jtkutest.com.au", *EPPDateFormatter::fromXSDateTime("2007-01-01T00:00:00.0Z")); + "jtkutest.com.au", *EPPDateFormatter::fromXSDateTime("2014-01-01T00:00:00.0Z")); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.com.au2007-01-01JTKUTEST.20070101.010101.0"); + ASSERT_EQ(xml, "jtkutest.com.au2014-01-01JTKUTEST.20070101.010101.0"); } int main(int argc, char* argv[]) diff --git a/AusRegEPPTK/se/ArDomainUnrenewResponseTest.cpp b/AusRegEPPTK/se/ArDomainUnrenewResponseTest.cpp index c928f46..49c3f23 100644 --- a/AusRegEPPTK/se/ArDomainUnrenewResponseTest.cpp +++ b/AusRegEPPTK/se/ArDomainUnrenewResponseTest.cpp @@ -9,7 +9,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); const string xml1 = "Command completed successfullyexample.com2009-04-03T22:00:00.0ZABC-1234554321-XYZ"; const string xml2 = diff --git a/AusRegEPPTK/se/AuDomainCreateCommandTest.cpp b/AusRegEPPTK/se/AuDomainCreateCommandTest.cpp index 31d0068..9f77061 100644 --- a/AusRegEPPTK/se/AuDomainCreateCommandTest.cpp +++ b/AusRegEPPTK/se/AuDomainCreateCommandTest.cpp @@ -9,7 +9,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); const string registrantName = "AusRegistry"; const string registrantID = "01241326211"; diff --git a/AusRegEPPTK/se/AuDomainInfoResponseTest.cpp b/AusRegEPPTK/se/AuDomainInfoResponseTest.cpp index d59d6c8..7a4e7bb 100644 --- a/AusRegEPPTK/se/AuDomainInfoResponseTest.cpp +++ b/AusRegEPPTK/se/AuDomainInfoResponseTest.cpp @@ -8,7 +8,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); const string xml = "Command completed successfullyexample.com.auD0000003-AREXAMPLEEXAMPLEns1.example.com.auns2.example.com.auns1.example.com.auns2.exmaple.com.auRegistrarRegistrar2006-02-09T15:44:58.0Z2008-02-10T00:00:00.0Z0192pqowRegistrantName Pty. Ltd.123456789OtherRegistrant Eligi9876543212ABC-12345805"; AuDomainInfoResponse response; diff --git a/AusRegEPPTK/se/AuDomainInfoResponsev1Test.cpp b/AusRegEPPTK/se/AuDomainInfoResponsev1Test.cpp index 4d5986b..5d3e045 100644 --- a/AusRegEPPTK/se/AuDomainInfoResponsev1Test.cpp +++ b/AusRegEPPTK/se/AuDomainInfoResponsev1Test.cpp @@ -13,7 +13,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); const string xml = "Command completed successfullyexample.com.auD0000003-AREXAMPLEEXAMPLEns1.example.com.auns2.example.com.auns1.example.com.auns2.exmaple.com.auRegistrarRegistrar2006-02-09T15:44:58.0Z2008-02-10T00:00:00.0Z0192pqowRegistrantName Pty. Ltd.123456789OtherRegistrant Eligi9876543212ABC-12345805"; diff --git a/AusRegEPPTK/se/AuDomainModifyRegistrantCommandTest.cpp b/AusRegEPPTK/se/AuDomainModifyRegistrantCommandTest.cpp index ebf238e..27616b2 100644 --- a/AusRegEPPTK/se/AuDomainModifyRegistrantCommandTest.cpp +++ b/AusRegEPPTK/se/AuDomainModifyRegistrantCommandTest.cpp @@ -9,7 +9,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); const string registrantName = "AusRegistry"; const string registrantID = "01241326211"; diff --git a/AusRegEPPTK/se/AuDomainTransferRegistrantCommandTest.cpp b/AusRegEPPTK/se/AuDomainTransferRegistrantCommandTest.cpp index e5531dd..fe9ccf5 100644 --- a/AusRegEPPTK/se/AuDomainTransferRegistrantCommandTest.cpp +++ b/AusRegEPPTK/se/AuDomainTransferRegistrantCommandTest.cpp @@ -12,7 +12,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); const int policyReason = 1; const string registrantName = "AusRegistry"; @@ -22,7 +22,7 @@ void doWork() const string eligibilityName = "Blah"; const string eligibilityID = "1231239523"; const string eligibilityIDType = "OTHER"; - auto_ptr curExpDate(EPPDateFormatter::fromXSDateTime("2007-01-01T01:01:01.0Z")); + auto_ptr curExpDate(EPPDateFormatter::fromXSDateTime("2014-01-01T01:01:01.0Z")); { Timer::setTime("20070101.010101"); @@ -36,7 +36,7 @@ void doWork() registrantName, "testing"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.com.au2007-01-01AusRegistryOther1testingJTKUTEST.20070101.010101.0"); + ASSERT_EQ(xml, "jtkutest.com.au2014-01-01AusRegistryOther1testingJTKUTEST.20070101.010101.0"); } { @@ -58,7 +58,7 @@ void doWork() &eligibilityIDType, &p); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.com.au2007-01-012AusRegistry01241326211CompanyBlah12312395231testingJTKUTEST.20070101.010101.0"); + ASSERT_EQ(xml, "jtkutest.com.au2014-01-012AusRegistry01241326211CompanyBlah12312395231testingJTKUTEST.20070101.010101.0"); } } diff --git a/AusRegEPPTK/se/AuDomainTransferRegistrantResponseTest.cpp b/AusRegEPPTK/se/AuDomainTransferRegistrantResponseTest.cpp index 456d70d..33dd381 100644 --- a/AusRegEPPTK/se/AuDomainTransferRegistrantResponseTest.cpp +++ b/AusRegEPPTK/se/AuDomainTransferRegistrantResponseTest.cpp @@ -9,7 +9,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); const string xml = "Command completed successfullyexample.com2009-04-03T22:00:00.0ZABC-1234554321-XYZ"; diff --git a/AusRegEPPTK/se/ContactCheckCommandTest.cpp b/AusRegEPPTK/se/ContactCheckCommandTest.cpp index 864ff12..4a75736 100644 --- a/AusRegEPPTK/se/ContactCheckCommandTest.cpp +++ b/AusRegEPPTK/se/ContactCheckCommandTest.cpp @@ -8,7 +8,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { Timer::setTime("20070101.010101"); CLTRID::setClID("JTKUTEST"); diff --git a/AusRegEPPTK/se/ContactCheckResponseTest.cpp b/AusRegEPPTK/se/ContactCheckResponseTest.cpp index 07b407b..4eb3ff7 100644 --- a/AusRegEPPTK/se/ContactCheckResponseTest.cpp +++ b/AusRegEPPTK/se/ContactCheckResponseTest.cpp @@ -8,7 +8,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); const string xml = "Command completed successfullysh8013sah8013In use8013sahABC-1234554322-XYZ"; diff --git a/AusRegEPPTK/se/ContactDeleteCommandTest.cpp b/AusRegEPPTK/se/ContactDeleteCommandTest.cpp index 3d51810..1005386 100644 --- a/AusRegEPPTK/se/ContactDeleteCommandTest.cpp +++ b/AusRegEPPTK/se/ContactDeleteCommandTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { CLTRID::setClID("JTKUTEST"); Timer::setTime("20070101.010101"); diff --git a/AusRegEPPTK/se/ContactInfoCommandTest.cpp b/AusRegEPPTK/se/ContactInfoCommandTest.cpp index 8f6dcff..9b45ba3 100644 --- a/AusRegEPPTK/se/ContactInfoCommandTest.cpp +++ b/AusRegEPPTK/se/ContactInfoCommandTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { CLTRID::setClID("JTKUTEST"); Timer::setTime("20070101.010101"); diff --git a/AusRegEPPTK/se/ContactInfoResponseTest.cpp b/AusRegEPPTK/se/ContactInfoResponseTest.cpp index 495616f..36801b7 100644 --- a/AusRegEPPTK/se/ContactInfoResponseTest.cpp +++ b/AusRegEPPTK/se/ContactInfoResponseTest.cpp @@ -13,7 +13,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); const string xml( "Command completed successfullysh8013SH8013-REPJohn DoeExample Inc.123 Example Dr.Suite 100DullesVA20166-6503US+1.7035555555+1.7035555556jdoe@example.comClientYClientX1999-04-03T22:00:00.0ZClientX1999-12-03T09:00:00.0Z2000-04-08T09:00:00.0Z2fooBARABC-1234554322-XYZ"); diff --git a/AusRegEPPTK/se/ContactTransferRequestCommandTest.cpp b/AusRegEPPTK/se/ContactTransferRequestCommandTest.cpp index 7417746..8efbddc 100644 --- a/AusRegEPPTK/se/ContactTransferRequestCommandTest.cpp +++ b/AusRegEPPTK/se/ContactTransferRequestCommandTest.cpp @@ -12,7 +12,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { Timer::setTime("20070101.010101"); CLTRID::setClID("JTKUTEST"); diff --git a/AusRegEPPTK/se/DomainCheckCommandTest.cpp b/AusRegEPPTK/se/DomainCheckCommandTest.cpp index c7725f1..0dadfd2 100644 --- a/AusRegEPPTK/se/DomainCheckCommandTest.cpp +++ b/AusRegEPPTK/se/DomainCheckCommandTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { CLTRID::setClID("JTKUTEST"); Timer::setTime("20070101.010101"); diff --git a/AusRegEPPTK/se/DomainCheckResponseTest.cpp b/AusRegEPPTK/se/DomainCheckResponseTest.cpp index 5bc2763..48b2bf3 100644 --- a/AusRegEPPTK/se/DomainCheckResponseTest.cpp +++ b/AusRegEPPTK/se/DomainCheckResponseTest.cpp @@ -12,7 +12,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); const string xml = "Command completed successfullyexample.comexample.netIn useexample.orgABC-1234554322-XYZ"; diff --git a/AusRegEPPTK/se/DomainDeleteCommandTest.cpp b/AusRegEPPTK/se/DomainDeleteCommandTest.cpp index ec10d7f..311d2d7 100644 --- a/AusRegEPPTK/se/DomainDeleteCommandTest.cpp +++ b/AusRegEPPTK/se/DomainDeleteCommandTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { CLTRID::setClID("JTKUTEST"); Timer::setTime("20070101.010101"); diff --git a/AusRegEPPTK/se/DomainInfoCommandTest.cpp b/AusRegEPPTK/se/DomainInfoCommandTest.cpp index 0412215..1e6c5b9 100644 --- a/AusRegEPPTK/se/DomainInfoCommandTest.cpp +++ b/AusRegEPPTK/se/DomainInfoCommandTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { CLTRID::setClID("JTKUTEST"); Timer::setTime("20070101.010101"); diff --git a/AusRegEPPTK/se/DomainInfoKVResponseExtensionTest.cpp b/AusRegEPPTK/se/DomainInfoKVResponseExtensionTest.cpp index 7bc351b..3928749 100644 --- a/AusRegEPPTK/se/DomainInfoKVResponseExtensionTest.cpp +++ b/AusRegEPPTK/se/DomainInfoKVResponseExtensionTest.cpp @@ -113,7 +113,7 @@ void checkKeyValueList(const DomainInfoKVResponseExtension &kvExtension, const s int main(int argc, char* argv[]) { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); TEST_run(testNonExistentListName); TEST_run(testNonExistentItem); TEST_run(testNotInitialisedWhenNoKVExtensionPresent); diff --git a/AusRegEPPTK/se/DomainKVCommandExtensionTest.cpp b/AusRegEPPTK/se/DomainKVCommandExtensionTest.cpp index b812b4b..f18523f 100644 --- a/AusRegEPPTK/se/DomainKVCommandExtensionTest.cpp +++ b/AusRegEPPTK/se/DomainKVCommandExtensionTest.cpp @@ -82,7 +82,7 @@ void addSampleItemsToExtension(DomainKVCommandExtension &extension, const string int main(int argc, char* argv[]) { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); TEST_run(testUpdateSingleKVList); TEST_run(testCreateSingleKVList); TEST_run(testMultipleKVList); diff --git a/AusRegEPPTK/se/DomainRegistrantTransferCommandTest.cpp b/AusRegEPPTK/se/DomainRegistrantTransferCommandTest.cpp index 39b8b7e..3ff3343 100644 --- a/AusRegEPPTK/se/DomainRegistrantTransferCommandTest.cpp +++ b/AusRegEPPTK/se/DomainRegistrantTransferCommandTest.cpp @@ -16,7 +16,7 @@ const static std::string policyReason = "1"; const static std::string eligibilityName = "Blah"; const static std::string eligibilityIDValue = "1231239523"; const static std::string eligibilityIDType = "Trademark"; -const auto_ptr curExpDate(EPPDateFormatter::fromXSDateTime("2007-01-01T01:01:01.0Z")); +const auto_ptr curExpDate(EPPDateFormatter::fromXSDateTime("2014-01-01T01:01:01.0Z")); const static std::string kvListName = "ae"; void addSampleKVItems(DomainRegistrantTransferCommand *command); @@ -66,7 +66,7 @@ void addSampleKVItems(DomainRegistrantTransferCommand *command) int main(int argc, char* argv[]) { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); TEST_run(testWithoutPeriod); // TEST_run(testWithPeriod); return TEST_errorCount(); diff --git a/AusRegEPPTK/se/DomainRegistrantTransferResponseTest.cpp b/AusRegEPPTK/se/DomainRegistrantTransferResponseTest.cpp index ead79a5..6422216 100644 --- a/AusRegEPPTK/se/DomainRegistrantTransferResponseTest.cpp +++ b/AusRegEPPTK/se/DomainRegistrantTransferResponseTest.cpp @@ -9,7 +9,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); const string xml = "Command completed successfullyexample.com2009-04-03T22:00:00.0ZABC-1234554321-XYZ"; diff --git a/AusRegEPPTK/se/DomainTransferQueryCommandTest.cpp b/AusRegEPPTK/se/DomainTransferQueryCommandTest.cpp index d48621c..4b9464b 100644 --- a/AusRegEPPTK/se/DomainTransferQueryCommandTest.cpp +++ b/AusRegEPPTK/se/DomainTransferQueryCommandTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { CLTRID::setClID("JTKUTEST"); Timer::setTime("20070101.010101"); diff --git a/AusRegEPPTK/se/DomainUpdateCommandTest.cpp b/AusRegEPPTK/se/DomainUpdateCommandTest.cpp index 22fdae6..9d0f117 100644 --- a/AusRegEPPTK/se/DomainUpdateCommandTest.cpp +++ b/AusRegEPPTK/se/DomainUpdateCommandTest.cpp @@ -113,7 +113,7 @@ void testSyncExpiryDateExtensionWithNullDate(void) int main(int argc, char* argv[]) { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); TEST_run(testSimpleUpdate); TEST_run(testFullUpdate); TEST_run(testSyncExpiryDateExtension); diff --git a/AusRegEPPTK/se/EnumDomainInfoResponseTest.cpp b/AusRegEPPTK/se/EnumDomainInfoResponseTest.cpp index 623bed5..11fc29d 100644 --- a/AusRegEPPTK/se/EnumDomainInfoResponseTest.cpp +++ b/AusRegEPPTK/se/EnumDomainInfoResponseTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); const string xml = "Command completed successfully3.8.0.0.6.9.2.3.6.1.4.4.e164.arpaEXAMPLE1-REPjd1234sh8013sh8013ns1.example.comns2.example.comns1.example.comns2.example.comClientXClientY1999-04-03T22:00:00.0ZClientX1999-12-03T09:00:00.0Z2005-04-03T22:00:00.0Z2000-04-08T09:00:00.0Z2fooBAR10100uE2U+sip\"!^.*$!sip:info@example.com!\"10102uE2U+msg\"!^.*$!mailto:info@example.com!\"ABC-1234554322-XYZ"; diff --git a/AusRegEPPTK/se/HelloTest.cpp b/AusRegEPPTK/se/HelloTest.cpp index 00e84f2..15966ef 100644 --- a/AusRegEPPTK/se/HelloTest.cpp +++ b/AusRegEPPTK/se/HelloTest.cpp @@ -9,7 +9,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); CLTRID::setClID("JTKUTEST"); Hello cmd; diff --git a/AusRegEPPTK/se/HostCheckCommandTest.cpp b/AusRegEPPTK/se/HostCheckCommandTest.cpp index 9081b0c..637a903 100644 --- a/AusRegEPPTK/se/HostCheckCommandTest.cpp +++ b/AusRegEPPTK/se/HostCheckCommandTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { CLTRID::setClID("JTKUTEST"); Timer::setTime("20070101.010101"); diff --git a/AusRegEPPTK/se/HostCreateCommandTest.cpp b/AusRegEPPTK/se/HostCreateCommandTest.cpp index 9824aa8..26196c3 100644 --- a/AusRegEPPTK/se/HostCreateCommandTest.cpp +++ b/AusRegEPPTK/se/HostCreateCommandTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { CLTRID::setClID("JTKUTEST"); Timer::setTime("20070101.010101"); diff --git a/AusRegEPPTK/se/HostDeleteCommandTest.cpp b/AusRegEPPTK/se/HostDeleteCommandTest.cpp index af8a35b..88ac3f9 100644 --- a/AusRegEPPTK/se/HostDeleteCommandTest.cpp +++ b/AusRegEPPTK/se/HostDeleteCommandTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { CLTRID::setClID("JTKUTEST"); Timer::setTime("20070101.010101"); diff --git a/AusRegEPPTK/se/HostInfoCommandTest.cpp b/AusRegEPPTK/se/HostInfoCommandTest.cpp index 512ad96..72661bb 100644 --- a/AusRegEPPTK/se/HostInfoCommandTest.cpp +++ b/AusRegEPPTK/se/HostInfoCommandTest.cpp @@ -8,7 +8,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); Timer::setTime("20070101.010101"); CLTRID::setClID("JTKUTEST"); diff --git a/AusRegEPPTK/se/HostInfoResponseTest.cpp b/AusRegEPPTK/se/HostInfoResponseTest.cpp index 531cc08..5babb22 100644 --- a/AusRegEPPTK/se/HostInfoResponseTest.cpp +++ b/AusRegEPPTK/se/HostInfoResponseTest.cpp @@ -12,7 +12,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); const string xml( "Command completed successfullyns1.example.comNS1_EXAMPLE1-REP192.0.2.2192.0.2.291080:0:0:0:8:800:200C:417AClientYClientX1999-04-03T22:00:00.0ZClientX1999-12-03T09:00:00.0Z2000-04-08T09:00:00.0ZABC-1234554322-XYZ"); diff --git a/AusRegEPPTK/se/IPVersionTest.cpp b/AusRegEPPTK/se/IPVersionTest.cpp index b89fe5b..7be8494 100644 --- a/AusRegEPPTK/se/IPVersionTest.cpp +++ b/AusRegEPPTK/se/IPVersionTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { ASSERT_EQ(IPVersion::IPv4()->toString(), "v4"); ASSERT_EQ(IPVersion::IPv6()->toString(), "v6"); diff --git a/AusRegEPPTK/se/LoginCommandTest.cpp b/AusRegEPPTK/se/LoginCommandTest.cpp index 4c86e13..7472bc2 100644 --- a/AusRegEPPTK/se/LoginCommandTest.cpp +++ b/AusRegEPPTK/se/LoginCommandTest.cpp @@ -19,7 +19,7 @@ void doWork() const vector extURIs(1, "urn:au:params:xml:ns:auext-1.0"); - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { Timer::setTime("20070101.010101"); CLTRID::setClID("JTKUTEST"); diff --git a/AusRegEPPTK/se/LogoutCommandTest.cpp b/AusRegEPPTK/se/LogoutCommandTest.cpp index 599fc47..f57c185 100644 --- a/AusRegEPPTK/se/LogoutCommandTest.cpp +++ b/AusRegEPPTK/se/LogoutCommandTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { CLTRID::setClID("JTKUTEST"); Timer::setTime("20070101.010101"); diff --git a/AusRegEPPTK/se/PollAckCommandTest.cpp b/AusRegEPPTK/se/PollAckCommandTest.cpp index 588fe80..11fe25c 100644 --- a/AusRegEPPTK/se/PollAckCommandTest.cpp +++ b/AusRegEPPTK/se/PollAckCommandTest.cpp @@ -8,7 +8,7 @@ using namespace std; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); Timer::setTime("20070101.010101"); CLTRID::setClID("JTKUTEST"); diff --git a/AusRegEPPTK/se/PollResponseTest.cpp b/AusRegEPPTK/se/PollResponseTest.cpp index d411703..df50907 100644 --- a/AusRegEPPTK/se/PollResponseTest.cpp +++ b/AusRegEPPTK/se/PollResponseTest.cpp @@ -16,7 +16,7 @@ PollResponse& getPollResponse(const string xml); void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); testContactTransferApprovePoll(); testDomainTransferApprovePoll(); diff --git a/AusRegEPPTK/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp b/AusRegEPPTK/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp index ac6202a..4d3673e 100644 --- a/AusRegEPPTK/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp +++ b/AusRegEPPTK/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp @@ -147,7 +147,7 @@ void testSecDNSJustKeyData() int main(int argc, char* argv[]) { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); TEST_run(testSecDNSAllFields); TEST_run(testSecDNSMultipleDSDataWithoutMaxSigLife); TEST_run(testSecDNSAllFieldsMin); diff --git a/AusRegEPPTK/se/secDNS/DomainSecDNSInfoResponseExtensionTest.cpp b/AusRegEPPTK/se/secDNS/DomainSecDNSInfoResponseExtensionTest.cpp index 312f314..603e736 100644 --- a/AusRegEPPTK/se/secDNS/DomainSecDNSInfoResponseExtensionTest.cpp +++ b/AusRegEPPTK/se/secDNS/DomainSecDNSInfoResponseExtensionTest.cpp @@ -239,7 +239,7 @@ void buildXmlResponseBeforeExtension(const string& domainName, int main(int argc, char* argv[]) { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); TEST_run(testSecDNSInfoExtensionAllFields); TEST_run(testSecDNSInfoExtensionOnlyKeyData); TEST_run(testSecDNSInfoExtensionMultipleDsRecords); diff --git a/AusRegEPPTK/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp b/AusRegEPPTK/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp index e5c7859..8873439 100644 --- a/AusRegEPPTK/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp +++ b/AusRegEPPTK/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp @@ -191,7 +191,7 @@ void testSecDNSRemoveAllAndAddKeyDataAndChangeMaxSigLife() int main(int argc, char* argv[]) { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); TEST_run(testSecDNSAddFieldsUrgent); TEST_run(testSecDNSRemoveFieldsNotUrgent); TEST_run(testSecDNSRemoveAll); diff --git a/AusRegEPPTK/session/CommandCounterTest.cpp b/AusRegEPPTK/session/CommandCounterTest.cpp index 9e65822..83dcbe1 100644 --- a/AusRegEPPTK/session/CommandCounterTest.cpp +++ b/AusRegEPPTK/session/CommandCounterTest.cpp @@ -88,7 +88,7 @@ void testPollCount() int main(int argc, char* argv[]) { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); TEST_run(testLoginCount); TEST_run(testMixedCommandsCount); diff --git a/AusRegEPPTK/session/SessionManagerTest.cpp b/AusRegEPPTK/session/SessionManagerTest.cpp index efd559c..cdadc6d 100644 --- a/AusRegEPPTK/session/SessionManagerTest.cpp +++ b/AusRegEPPTK/session/SessionManagerTest.cpp @@ -23,7 +23,7 @@ static TestEnvironment props; void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); string op("shutdown"); { diff --git a/AusRegEPPTK/session/SessionTest.cpp b/AusRegEPPTK/session/SessionTest.cpp index 2de1390..4c7cccb 100644 --- a/AusRegEPPTK/session/SessionTest.cpp +++ b/AusRegEPPTK/session/SessionTest.cpp @@ -18,7 +18,7 @@ static std::string TEST_SE = void doWork() { - init("/home/drde/etc/toolkit2.conf"); + init("./etc/toolkit2.conf"); { TestEnvironment props; auto_ptr sess(SessionFactory::newInstance(&props));