diff --git a/ACTK1_0/Makefile b/ACTK1_0/Makefile index 5c2d769..30c621a 100644 --- a/ACTK1_0/Makefile +++ b/ACTK1_0/Makefile @@ -116,7 +116,7 @@ $(BUILD_OBJ_DIR)/%: $(BUILD_OBJ_DIR)/%.o # 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/RegistrantObjectType.o \ +build/RegistrantObjectType.o build/mdLogger.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 \ diff --git a/ACTK1_0/OTE/LPECheckCommand.hpp b/ACTK1_0/OTE/LPECheckCommand.hpp index 570e447..dc571d8 100644 --- a/ACTK1_0/OTE/LPECheckCommand.hpp +++ b/ACTK1_0/OTE/LPECheckCommand.hpp @@ -1,20 +1,20 @@ -#ifndef __LPE_CHECK_COMMAND_HPP -#define __LPE_CHECK_COMMAND_HPP +#ifndef __LPEDOMAIN_CHECK_COMMAND_HPP +#define __LPEDOMAIN_CHECK_COMMAND_HPP -#include "se/CheckCommand.hpp" +#include "se/DomainCheckCommand.hpp" #include "se/StandardObjectType.hpp" #include #include /** - * A LPECheckCommand is used to check the availability of domain objects + * A DomainCheckCommand is used to check the availability of domain objects * in a Registry. Instances of this class generate RFC3730 and RFC3731 * compliant domain check EPP command service elements via the toXML method. * - * @see LPECheckResponse + * @see DomainCheckResponse */ -class LPECheckCommand : public CheckCommand +class LPECheckCommand : public DomainCheckCommand { public: /** @@ -23,7 +23,7 @@ public: * @param name The name of the domain to check the availability of. */ LPECheckCommand (const std::string &name) - : CheckCommand (StandardObjectType::DOMAIN(), name) {}; + : DomainCheckCommand ( name) {}; /** * Check the availability of at least one domain. @@ -31,7 +31,7 @@ public: * @param names The names of the domains to check the availability of. */ LPECheckCommand (std::vector &names) - : CheckCommand (StandardObjectType::DOMAIN(), names) {}; + : DomainCheckCommand ( names) {}; }; -#endif // __DOMAIN_CHECK_COMMAND_HPP +#endif // __LPEDOMAIN_CHECK_COMMAND_HPP diff --git a/ACTK1_0/OTE/LPECheckCommandTest.cpp b/ACTK1_0/OTE/LPECheckCommandTest.cpp index 95c106c..d744674 100644 --- a/ACTK1_0/OTE/LPECheckCommandTest.cpp +++ b/ACTK1_0/OTE/LPECheckCommandTest.cpp @@ -12,7 +12,7 @@ void doWork() { init("./etc/toolkit2.conf"); { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); LPECheckCommand cmd("test-andvalidate.claimsgafour"); @@ -20,12 +20,12 @@ void doWork() ASSERT_EQ(cmd.getCommandType()->getCommandName(), "check"); ASSERT_EQ(cmd.getObjectType()->getName(), "domain"); - ASSERT_EQ(xml, "test-andvalidate.claimsgafourJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "test-andvalidate.claimsgafourACTKUTST.20140101.010101.0"); } } int main(int argc, char* argv[]) -{ +{ int i=0; TEST_run(doWork); return TEST_errorCount(); } diff --git a/ACTK1_0/OTE/LPECreateCommand.cpp b/ACTK1_0/OTE/LPECreateCommand.cpp index 314175f..2a6efa6 100644 --- a/ACTK1_0/OTE/LPECreateCommand.cpp +++ b/ACTK1_0/OTE/LPECreateCommand.cpp @@ -1,54 +1,15 @@ #include "se/StandardObjectType.hpp" #include "xml/XMLHelper.hpp" +#include "OTE/OteExtension.hpp" #include "OTE/LPECreateCommand.hpp" +#include "se/CommandExtension.hpp" - -LPECreateCommand::LPECreateCommand (const std::string& name, - const std::string& pw, - const std::string* registrantID, - const std::vector* techContacts, - const std::vector* nameservers, - const std::vector* adminContacts, - const std::vector* billingContacts, - const Period* period) - : CreateCommand(StandardObjectType::DOMAIN(), name) + void LPECreateCommand::addToCommand(const Command &command) const { - std::vector::const_iterator p; + XMLWriter* xmlWriter = command.getXmlWriter(); + DOMElement* extensionElement = command.getExtensionElement(); + DOMElement* createElement = xmlWriter->appendChild(extensionElement, + "create", OteExtension().getURI()); - if (period) - period->appendPeriod (xmlWriter, objElement); - - if (nameservers) - { - DOMElement *ns = xmlWriter->appendChild (objElement, "ns"); - for (p = nameservers->begin(); p != nameservers->end(); p++) - XMLHelper::setTextContent - (xmlWriter->appendChild (ns, "hostObj"), *p); - } - - if (registrantID) - { - XMLHelper::setTextContent - (xmlWriter->appendChild(objElement, "registrant"), *registrantID); - } - - if (adminContacts) - for (p = adminContacts->begin(); p != adminContacts->end(); p++) - xmlWriter->appendChild(objElement, "contact", *p, "type", "admin"); - - if (techContacts) - for (p = techContacts->begin(); p != techContacts->end(); p++) - xmlWriter->appendChild(objElement, "contact", *p, "type", "tech"); - - if (billingContacts) - for (p = billingContacts->begin(); p != billingContacts->end(); p++) - xmlWriter->appendChild(objElement, "contact", *p, "type", "billing"); - - XMLHelper::setTextContent - (xmlWriter->appendChild - (xmlWriter->appendChild - (objElement, - "authInfo"), - "pw"), - pw); + int a = 0; } diff --git a/ACTK1_0/OTE/LPECreateCommand.hpp b/ACTK1_0/OTE/LPECreateCommand.hpp index cbca8f1..5e170b1 100644 --- a/ACTK1_0/OTE/LPECreateCommand.hpp +++ b/ACTK1_0/OTE/LPECreateCommand.hpp @@ -1,9 +1,10 @@ #ifndef __LPECREATECOMMAND_HPP #define __LPECREATECOMMAND_HPP +#define OTEADT void -#include "se/CreateCommand.hpp" -#include "se/Period.hpp" - +#include "se/DomainCreateCommand.hpp" +#include "se/CommandExtension.hpp" +class LPECreateCommand; /** * Mapping of EPP urn:ietf:params:xml:ns:domain-1.0 create command specified in * RFC3731. Command-response extensions to the domain:create command are @@ -12,7 +13,7 @@ * input parameters. The toXML method in Command serialises this object to * XML. */ -class LPECreateCommand : public CreateCommand +class LPECreateCommand : public DomainCreateCommand, public CommandExtension { public: /** @@ -26,7 +27,12 @@ public: const std::vector* nameservers = NULL, const std::vector* adminContacts = NULL, const std::vector* billingContacts = NULL, - const Period* period = NULL); + const Period* period = NULL) : + DomainCreateCommand(name, pw, registrantID, techContacts, nameservers, + adminContacts, billingContacts, period), CommandExtension(){} + + virtual void addToCommand(const Command &command) const; + void setCreateData(OTEADT* createData); }; #endif // __LPECREATECOMMAND_HPP diff --git a/ACTK1_0/OTE/OteLPECreateCommandTest.cpp b/ACTK1_0/OTE/OteLPECreateCommandTest.cpp index 4da575c..b34422f 100644 --- a/ACTK1_0/OTE/OteLPECreateCommandTest.cpp +++ b/ACTK1_0/OTE/OteLPECreateCommandTest.cpp @@ -27,16 +27,16 @@ void doWork() */ { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); vector techIds; techIds.push_back("JTKCON2"); string registrant("JTKCON"); - OteLPECreateCommand cmd("jtkutest.co.ae", "jtkUT3st", ®istrant, &techIds, + OteLPECreateCommand cmd("ACTKUTST.co.ae", "jtkUT3st", ®istrant, &techIds, eligibilityType, policyReason, registrantName); const string xml(cmd.toXML()); ASSERT_EQ(xml, - "jtkutest.co.aeJTKCONJTKCON2jtkUT3stAusRegistryTrade License (IT)1JTKUTEST.20140101.010101.0"); + "ACTKUTST.co.aeJTKCONJTKCON2jtkUT3stAusRegistryTrade License (IT)1ACTKUTST.20140101.010101.0"); } /** @@ -47,7 +47,7 @@ void doWork() */ { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); vector techIds; techIds.push_back("JTKCON2"); @@ -65,7 +65,7 @@ void doWork() Period period(48, PeriodUnit::MONTHS()); OteLPECreateCommand cmd( - "jtkutest.co.ae", "jtkUT3st", ®istrant, + "ACTKUTST.co.ae", "jtkUT3st", ®istrant, &techIds, &adminContacts, NULL, &nameServers, &period, eligibilityType, policyReason, @@ -73,7 +73,7 @@ void doWork() ®istrantIDType, &eligibilityName, &eligibilityID, &eligibilityIDType); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.co.ae48ns1.ausregistry.netns2.ausregistry.netJTKCONJTKCONJTKCON2JTKCON2jtkUT3stAusRegistry01241326211Trade License (IT)Blah12312395231JTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.co.ae48ns1.ausregistry.netns2.ausregistry.netJTKCONJTKCONJTKCON2JTKCON2jtkUT3stAusRegistry01241326211Trade License (IT)Blah12312395231ACTKUTST.20140101.010101.0"); } } diff --git a/ACTK1_0/common/ErrorPkg.cpp b/ACTK1_0/common/ErrorPkg.cpp index 22dadb1..880b405 100644 --- a/ACTK1_0/common/ErrorPkg.cpp +++ b/ACTK1_0/common/ErrorPkg.cpp @@ -16,7 +16,7 @@ static std::string pname; void ErrorPkg::init() throw (PropertyConfigException) { - pname = "com.ausregistry.cpptoolkit"; + pname = "biz.meansofproduction.dnseppus"; try { string msgsFile = SystemProperties::getProperty("epp.client.messages.file"); diff --git a/ACTK1_0/common/SystemProperties.cpp b/ACTK1_0/common/SystemProperties.cpp index 29e29dd..5cdbf44 100644 --- a/ACTK1_0/common/SystemProperties.cpp +++ b/ACTK1_0/common/SystemProperties.cpp @@ -9,7 +9,7 @@ namespace { void SystemProperties::init(const string& file) { - //static string name = "com.ausregistry.cpptoolkit"; + //static string name = "biz.meansofproduction.dnseppus"; properties.load(file); } diff --git a/ACTK1_0/common/init.cpp b/ACTK1_0/common/init.cpp index ca8e93c..937b04a 100644 --- a/ACTK1_0/common/init.cpp +++ b/ACTK1_0/common/init.cpp @@ -15,7 +15,7 @@ #include "xml/XMLInit.hpp" #include #include - +#include "common/init.hpp" #include #include #define MDLOG_USER diff --git a/ACTK1_0/resources/aedomain-1.0.xsd b/ACTK1_0/resources/aedomain-1.0.xsd deleted file mode 100644 index 9ac7443..0000000 --- a/ACTK1_0/resources/aedomain-1.0.xsd +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - .ae Domain Extensions to the Extensible - Provisioning Protocol v1.0. schema. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ACTK1_0/resources/aeext-1.0.xsd b/ACTK1_0/resources/aeext-1.0.xsd deleted file mode 100644 index f435ca1..0000000 --- a/ACTK1_0/resources/aeext-1.0.xsd +++ /dev/null @@ -1,196 +0,0 @@ - - - - - - - - - - .ae Extensions to the - Extensible Provisioning Protocol v1.0 schema. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ACTK1_0/resources/ardomain-1.0.xsd b/ACTK1_0/resources/ardomain-1.0.xsd deleted file mode 100644 index c0b63af..0000000 --- a/ACTK1_0/resources/ardomain-1.0.xsd +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - AusRegistry Domain Extensions to the Extensible - Provisioning Protocol v1.0. schema. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ACTK1_0/resources/arext-1.0.xsd b/ACTK1_0/resources/arext-1.0.xsd deleted file mode 100644 index 66f977c..0000000 --- a/ACTK1_0/resources/arext-1.0.xsd +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/ACTK1_0/resources/audomain-1.0.xsd b/ACTK1_0/resources/audomain-1.0.xsd deleted file mode 100644 index 11f6c36..0000000 --- a/ACTK1_0/resources/audomain-1.0.xsd +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - .au Domain Extensions to the Extensible - Provisioning Protocol v1.0. schema. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ACTK1_0/resources/auext-1.0.xsd b/ACTK1_0/resources/auext-1.0.xsd deleted file mode 100644 index 1bfd8fb..0000000 --- a/ACTK1_0/resources/auext-1.0.xsd +++ /dev/null @@ -1,176 +0,0 @@ - - - - - - - - - .au Extensions to the Extensible Provisioning Protocol v1.0. - schema. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ACTK1_0/resources/auext-1.1.xsd b/ACTK1_0/resources/auext-1.1.xsd deleted file mode 100644 index 57fe615..0000000 --- a/ACTK1_0/resources/auext-1.1.xsd +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - - - - .au Extensions to the - Extensible Provisioning - Protocol v1.1 schema. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ACTK1_0/resources/eppcom-1.0.xsd b/ACTK1_0/resources/eppcom-1.0.xsd index 3ca2655..60fe035 100644 --- a/ACTK1_0/resources/eppcom-1.0.xsd +++ b/ACTK1_0/resources/eppcom-1.0.xsd @@ -1,103 +1,90 @@ - - - - + + + + Extensible Provisioning Protocol v1.0 shared structures schema. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/ACTK1_0/resources/idnadomain-1.0.xsd b/ACTK1_0/resources/idnadomain-1.0.xsd deleted file mode 100644 index 3cd1c68..0000000 --- a/ACTK1_0/resources/idnadomain-1.0.xsd +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - Internationalised Domain Name Extensions to the Extensible - Provisioning Protocol v1.1 schema. Domain-specific types and - attributes. - - - - - - - User and DNS presentation forms of a domain - - - - - - - This should be of type internationalisedLabelType - - - - - - - - - - - - - - - - - - - - - - - - Registration of language with IANA requires the definition - of a Script or Language Designator - (http://www.iana.org/procedures/idn-repository.html). - - The linked document above notes that Language Designators - are defined in BCP 47 - (http://www.rfc-editor.org/rfc/bcp/bcp47.txt), which - satisfies the requirements of the language datatype and - RFC3066 (BCP 47, Section 2.2.8). - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Should this be moved directly into the resDataType? - assumes - that userForm of namePair is of type internationalisedLabelType - - - - - - - - - - - - - - diff --git a/ACTK1_0/resources/idnahost-1.0.xsd b/ACTK1_0/resources/idnahost-1.0.xsd deleted file mode 100644 index f0590a4..0000000 --- a/ACTK1_0/resources/idnahost-1.0.xsd +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - Internationalised Domain Name Extensions to the Extensible - Provisioning Protocol v1.1 schema. Host-specific types and - attributes. - - - - - - Label and optional U-label - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ACTK1_0/resources/otedomain-1.0.xsd b/ACTK1_0/resources/otedomain-1.0.xsd deleted file mode 100644 index a2c76e3..0000000 --- a/ACTK1_0/resources/otedomain-1.0.xsd +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - .ote Domain Extensions to the Extensible - Provisioning Protocol v1.0. schema. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ACTK1_0/resources/oteext-1.0.asd b/ACTK1_0/resources/oteext-1.0.asd deleted file mode 100644 index 982fa83..0000000 --- a/ACTK1_0/resources/oteext-1.0.asd +++ /dev/null @@ -1,196 +0,0 @@ - - - - - - - - - - .ote Extensions to the - Extensible Provisioning Protocol v1.0 schema. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ACTK1_0/se/ContactCheckCommandTest.cpp b/ACTK1_0/se/ContactCheckCommandTest.cpp index f11e1a5..0043e82 100644 --- a/ACTK1_0/se/ContactCheckCommandTest.cpp +++ b/ACTK1_0/se/ContactCheckCommandTest.cpp @@ -11,24 +11,24 @@ void doWork() init("./etc/toolkit2.conf"); { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); auto_ptr cmd(new ContactCheckCommand("JTKCON")); const string xml(cmd->toXML()); ASSERT_EQ(xml, - "JTKCONJTKUTEST.20140101.010101.0"); + "JTKCONACTKUTST.20140101.010101.0"); } { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); vector ids; ids.push_back("JTKCON1"); ids.push_back("JTKCON2"); auto_ptr cmd(new ContactCheckCommand(ids)); const string xml(cmd->toXML()); ASSERT_EQ(xml, - "JTKCON1JTKCON2JTKUTEST.20140101.010101.0"); + "JTKCON1JTKCON2ACTKUTST.20140101.010101.0"); } } diff --git a/ACTK1_0/se/ContactDeleteCommandTest.cpp b/ACTK1_0/se/ContactDeleteCommandTest.cpp index ade206b..0b03815 100644 --- a/ACTK1_0/se/ContactDeleteCommandTest.cpp +++ b/ACTK1_0/se/ContactDeleteCommandTest.cpp @@ -12,12 +12,12 @@ void doWork() { init("./etc/toolkit2.conf"); { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); ContactDeleteCommand cmd("JTKCON"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "JTKCONJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "JTKCONACTKUTST.20140101.010101.0"); } } diff --git a/ACTK1_0/se/ContactInfoCommandTest.cpp b/ACTK1_0/se/ContactInfoCommandTest.cpp index 298d876..c19064e 100644 --- a/ACTK1_0/se/ContactInfoCommandTest.cpp +++ b/ACTK1_0/se/ContactInfoCommandTest.cpp @@ -12,20 +12,20 @@ void doWork() { init("./etc/toolkit2.conf"); { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); ContactInfoCommand cmd("C100000-AR"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "C100000-ARJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "C100000-ARACTKUTST.20140101.010101.0"); } { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); ContactInfoCommand cmd("C100000-AR", "jtkUT3st"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "C100000-ARjtkUT3stJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "C100000-ARjtkUT3stACTKUTST.20140101.010101.0"); } } diff --git a/ACTK1_0/se/ContactTransferRequestCommandTest.cpp b/ACTK1_0/se/ContactTransferRequestCommandTest.cpp index ba45c5d..361173e 100644 --- a/ACTK1_0/se/ContactTransferRequestCommandTest.cpp +++ b/ACTK1_0/se/ContactTransferRequestCommandTest.cpp @@ -15,10 +15,10 @@ void doWork() init("./etc/toolkit2.conf"); { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); ContactTransferRequestCommand cmd("JTKCON1", "jtkcon1pw"); - const string expected("JTKCON1jtkcon1pwJTKUTEST.20140101.010101.0"); + const string expected("JTKCON1jtkcon1pwACTKUTST.20140101.010101.0"); const string xml(cmd.toXML()); ASSERT_EQ(expected, xml); } diff --git a/ACTK1_0/se/DomainCheckCommandTest.cpp b/ACTK1_0/se/DomainCheckCommandTest.cpp index 15b613e..41f1527 100644 --- a/ACTK1_0/se/DomainCheckCommandTest.cpp +++ b/ACTK1_0/se/DomainCheckCommandTest.cpp @@ -12,7 +12,7 @@ void doWork() { init("./etc/toolkit2.conf"); { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); DomainCheckCommand cmd("test.com.au"); @@ -20,7 +20,7 @@ void doWork() ASSERT_EQ(cmd.getCommandType()->getCommandName(), "check"); ASSERT_EQ(cmd.getObjectType()->getName(), "domain"); - ASSERT_EQ(xml, "test.com.auJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "test.com.auACTKUTST.20140101.010101.0"); } } diff --git a/ACTK1_0/se/DomainDeleteCommandTest.cpp b/ACTK1_0/se/DomainDeleteCommandTest.cpp index a846d6a..b802c78 100644 --- a/ACTK1_0/se/DomainDeleteCommandTest.cpp +++ b/ACTK1_0/se/DomainDeleteCommandTest.cpp @@ -12,12 +12,12 @@ void doWork() { init("./etc/toolkit2.conf"); { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); - DomainDeleteCommand cmd("jtkutest.com.au"); + DomainDeleteCommand cmd("ACTKUTST.com.au"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.com.auACTKUTST.20140101.010101.0"); } } diff --git a/ACTK1_0/se/DomainInfoCommandTest.cpp b/ACTK1_0/se/DomainInfoCommandTest.cpp index 04ce325..cee5b47 100644 --- a/ACTK1_0/se/DomainInfoCommandTest.cpp +++ b/ACTK1_0/se/DomainInfoCommandTest.cpp @@ -12,12 +12,12 @@ void doWork() { init("./etc/toolkit2.conf"); { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); - DomainInfoCommand cmd("jtkutest.com.au"); + DomainInfoCommand cmd("ACTKUTST.com.au"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.com.auACTKUTST.20140101.010101.0"); } } diff --git a/ACTK1_0/se/DomainKVCommandExtensionTest.cpp b/ACTK1_0/se/DomainKVCommandExtensionTest.cpp index ba37d55..52da157 100644 --- a/ACTK1_0/se/DomainKVCommandExtensionTest.cpp +++ b/ACTK1_0/se/DomainKVCommandExtensionTest.cpp @@ -19,57 +19,57 @@ const static string policyReason = "1"; void testUpdateSingleKVList() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); DomainKVCommandExtension extension(StandardCommandType::UPDATE()); addSampleItemsToExtension(extension, "ae"); - DomainUpdateCommand updateCommand("jtkutest.com.ae"); + DomainUpdateCommand updateCommand("ACTKUTST.com.ae"); updateCommand.appendExtension(extension); const string xml = updateCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.aeTrademark1AusRegistryJTKUTEST.20140101.010101.0" + "ACTKUTST.com.aeTrademark1AusRegistryACTKUTST.20140101.010101.0" ); } void testCreateSingleKVList() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); DomainKVCommandExtension extension(StandardCommandType::CREATE()); addSampleItemsToExtension(extension, "ae"); string registrant("JTKCON"); - DomainCreateCommand createCommand("jtkutest.com.ae", "jtkUT3st", ®istrant); + DomainCreateCommand createCommand("ACTKUTST.com.ae", "jtkUT3st", ®istrant); createCommand.appendExtension(extension); const string xml = createCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.aeJTKCONjtkUT3stTrademark1AusRegistryJTKUTEST.20140101.010101.0" + "ACTKUTST.com.aeJTKCONjtkUT3stTrademark1AusRegistryACTKUTST.20140101.010101.0" ); } void testMultipleKVList() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); DomainKVCommandExtension extension(StandardCommandType::CREATE()); addSampleItemsToExtension(extension, "ae"); addSampleItemsToExtension(extension, "au"); string registrant("JTKCON"); - DomainCreateCommand createCommand("jtkutest.com.ae", "jtkUT3st", ®istrant); + DomainCreateCommand createCommand("ACTKUTST.com.ae", "jtkUT3st", ®istrant); createCommand.appendExtension(extension); const string xml = createCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.aeJTKCONjtkUT3stTrademark1AusRegistryTrademark1AusRegistryJTKUTEST.20140101.010101.0" + "ACTKUTST.com.aeJTKCONjtkUT3stTrademark1AusRegistryTrademark1AusRegistryACTKUTST.20140101.010101.0" ); } diff --git a/ACTK1_0/se/DomainRegistrantTransferCommandTest.cpp b/ACTK1_0/se/DomainRegistrantTransferCommandTest.cpp index 7aa2b98..16f838b 100644 --- a/ACTK1_0/se/DomainRegistrantTransferCommandTest.cpp +++ b/ACTK1_0/se/DomainRegistrantTransferCommandTest.cpp @@ -23,17 +23,17 @@ void addSampleKVItems(DomainRegistrantTransferCommand *command); void testWithoutPeriod() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); auto_ptr command( - new DomainRegistrantTransferCommand("jtkutest.com.ae", *curExpDate, kvListName, "testing")); + new DomainRegistrantTransferCommand("ACTKUTST.com.ae", *curExpDate, kvListName, "testing")); addSampleKVItems(command.get()); const std::string xml = command->toXML(); ASSERT_EQ(xml, - "jtkutest.com.ae" + "ACTKUTST.com.ae" + EPPDateFormatter::toXSDate(*curExpDate) - + "Trademark1231239523BlahTrademark1Trade License01241326211AusRegistrytestingJTKUTEST.20140101.010101.0" + + "Trademark1231239523BlahTrademark1Trade License01241326211AusRegistrytestingACTKUTST.20140101.010101.0" ); } @@ -41,14 +41,14 @@ void testWithPeriod() { Period period(2, PeriodUnit::YEARS()); auto_ptr command( - new DomainRegistrantTransferCommand("jtkutest.com.ae", *curExpDate, kvListName, "testing", &period)); + new DomainRegistrantTransferCommand("ACTKUTST.com.ae", *curExpDate, kvListName, "testing", &period)); addSampleKVItems(command.get()); const std::string xml = command->toXML(); ASSERT_EQ(xml, - "jtkutest.com.ae" + "ACTKUTST.com.ae" + EPPDateFormatter::toXSDate(*curExpDate) - + "2Trademark1231239523BlahTrademark1Trade License01241326211AusRegistrytestingJTKUTEST.20140101.010101.0" + + "2Trademark1231239523BlahTrademark1Trade License01241326211AusRegistrytestingACTKUTST.20140101.010101.0" ); } diff --git a/ACTK1_0/se/DomainTransferQueryCommandTest.cpp b/ACTK1_0/se/DomainTransferQueryCommandTest.cpp index 732d73d..0a5f2f2 100644 --- a/ACTK1_0/se/DomainTransferQueryCommandTest.cpp +++ b/ACTK1_0/se/DomainTransferQueryCommandTest.cpp @@ -12,33 +12,33 @@ void doWork() { init("./etc/toolkit2.conf"); { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); - DomainTransferQueryCommand cmd("jtkutest.com.au"); + DomainTransferQueryCommand cmd("ACTKUTST.com.au"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.com.auACTKUTST.20140101.010101.0"); } { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); - DomainTransferQueryCommand cmd("jtkutest.com.au", "jtkUt3st"); + DomainTransferQueryCommand cmd("ACTKUTST.com.au", "jtkUt3st"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.com.aujtkUt3stJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.com.aujtkUt3stACTKUTST.20140101.010101.0"); } { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); - DomainTransferQueryCommand cmd("jtkutest.com.au", "C100000-AR", "jtkUt3st"); + DomainTransferQueryCommand cmd("ACTKUTST.com.au", "C100000-AR", "jtkUt3st"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.com.aujtkUt3stJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.com.aujtkUt3stACTKUTST.20140101.010101.0"); } } diff --git a/ACTK1_0/se/DomainUpdateCommandTest.cpp b/ACTK1_0/se/DomainUpdateCommandTest.cpp index 1a21e42..f674f8c 100644 --- a/ACTK1_0/se/DomainUpdateCommandTest.cpp +++ b/ACTK1_0/se/DomainUpdateCommandTest.cpp @@ -19,20 +19,20 @@ using namespace std; void testSimpleUpdate() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); - DomainUpdateCommand cmd("jtkutest.com.au"); + DomainUpdateCommand cmd("ACTKUTST.com.au"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.com.auACTKUTST.20140101.010101.0"); } void testFullUpdate() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); - const char* addNsText[] = { "ns1.jtkutest.com.au", "ns2.jtkutest.com.au" }; + const char* addNsText[] = { "ns1.ACTKUTST.com.au", "ns2.ACTKUTST.com.au" }; const vector addNs(addNsText, addNsText + 2); const vector addTechContacts(1, "JTKCON"); @@ -54,7 +54,7 @@ void testFullUpdate() &addStatus); - const char* remNsText[] = { "ns3.jtkutest.com.au", "ns4.jtkutest.com.au" }; + const char* remNsText[] = { "ns3.ACTKUTST.com.au", "ns4.ACTKUTST.com.au" }; const vector remNs(remNsText, remNsText + 2); const vector remTechContacts(1, "JTKCON2"); @@ -70,22 +70,22 @@ void testFullUpdate() NULL, &remStatus); - const string name("jtkutest.com.au"); + const string name("ACTKUTST.com.au"); const string pw("jtkUT3st"); const string registrantID("JTKCON"); - DomainUpdateCommand cmd("jtkutest.com.au", &pw, &add, &rem, ®istrantID); + DomainUpdateCommand cmd("ACTKUTST.com.au", &pw, &add, &rem, ®istrantID); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.com.auns1.jtkutest.com.auns2.jtkutest.com.auJTKCONJTKCON2JTKCON3non-paymentns3.jtkutest.com.auns4.jtkutest.com.auJTKCON2JTKCONJTKCONjtkUT3stJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.com.auns1.ACTKUTST.com.auns2.ACTKUTST.com.auJTKCONJTKCON2JTKCON3non-paymentns3.ACTKUTST.com.auns4.ACTKUTST.com.auJTKCON2JTKCONJTKCONjtkUT3stACTKUTST.20140101.010101.0"); } void testSyncExpiryDateExtension(void) { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); - DomainUpdateCommand cmd("jtkutest.com.au"); + DomainUpdateCommand cmd("ACTKUTST.com.au"); XMLGregorianCalendar *newExpiryDate = EPPDateFormatter::fromXSDateTime("2005-04-03T22:00:00.0Z"); DomainUpdateSyncCommandExtension extension(newExpiryDate); @@ -94,7 +94,7 @@ void testSyncExpiryDateExtension(void) delete newExpiryDate; ASSERT_EQ(xml, - "jtkutest.com.au2005-04-03T22:00:00.0ZJTKUTEST.20140101.010101.0"); + "ACTKUTST.com.au2005-04-03T22:00:00.0ZACTKUTST.20140101.010101.0"); } void testSyncExpiryDateExtensionWithNullDate(void) diff --git a/ACTK1_0/se/EPPDateFormatterTest.cpp b/ACTK1_0/se/EPPDateFormatterTest.cpp index e5e1619..293053c 100644 --- a/ACTK1_0/se/EPPDateFormatterTest.cpp +++ b/ACTK1_0/se/EPPDateFormatterTest.cpp @@ -3,7 +3,7 @@ #include #include #include - +#include "common/init.hpp" #include "common/Test.hpp" void doWork() diff --git a/ACTK1_0/se/HelloTest.cpp b/ACTK1_0/se/HelloTest.cpp index 15966ef..c3cd951 100644 --- a/ACTK1_0/se/HelloTest.cpp +++ b/ACTK1_0/se/HelloTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { init("./etc/toolkit2.conf"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Hello cmd; const string xml(cmd.toXML()); diff --git a/ACTK1_0/se/HostCheckCommandTest.cpp b/ACTK1_0/se/HostCheckCommandTest.cpp index 735d1af..7854adc 100644 --- a/ACTK1_0/se/HostCheckCommandTest.cpp +++ b/ACTK1_0/se/HostCheckCommandTest.cpp @@ -12,23 +12,23 @@ void doWork() { init("./etc/toolkit2.conf"); { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); - HostCheckCommand hcc("ns1.jtkutest.com.au"); + HostCheckCommand hcc("ns1.ACTKUTST.com.au"); const string xml(hcc.toXML()); - ASSERT_EQ(xml, "ns1.jtkutest.com.auJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ns1.ACTKUTST.com.auACTKUTST.20140101.010101.0"); } { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); std::vector names; - names.push_back("ns1.jtkutest.com.au"); - names.push_back("ns2.jtkutest.com.au"); + names.push_back("ns1.ACTKUTST.com.au"); + names.push_back("ns2.ACTKUTST.com.au"); HostCheckCommand hcc(names); const string xml(hcc.toXML()); - ASSERT_EQ(xml, "ns1.jtkutest.com.auns2.jtkutest.com.auJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ns1.ACTKUTST.com.auns2.ACTKUTST.com.auACTKUTST.20140101.010101.0"); } } diff --git a/ACTK1_0/se/HostCreateCommandTest.cpp b/ACTK1_0/se/HostCreateCommandTest.cpp index ad1dfec..4f10054 100644 --- a/ACTK1_0/se/HostCreateCommandTest.cpp +++ b/ACTK1_0/se/HostCreateCommandTest.cpp @@ -12,25 +12,25 @@ void doWork() { init("./etc/toolkit2.conf"); { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); - HostCreateCommand hcc("ns1.jtkutest.com.au"); + HostCreateCommand hcc("ns1.ACTKUTST.com.au"); const string xml(hcc.toXML()); - ASSERT_EQ(xml, "ns1.jtkutest.com.auJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ns1.ACTKUTST.com.auACTKUTST.20140101.010101.0"); } { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); vector addrs; addrs.push_back(InetAddress("192.168.0.1", IPVersion::IPv4())); addrs.push_back(InetAddress("::1", IPVersion::IPv6())); - HostCreateCommand hcc("ns1.jtkutest.com.au", &addrs); + HostCreateCommand hcc("ns1.ACTKUTST.com.au", &addrs); const string xml(hcc.toXML()); - ASSERT_EQ(xml, "ns1.jtkutest.com.au192.168.0.1::1JTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ns1.ACTKUTST.com.au192.168.0.1::1ACTKUTST.20140101.010101.0"); } } diff --git a/ACTK1_0/se/HostDeleteCommandTest.cpp b/ACTK1_0/se/HostDeleteCommandTest.cpp index e72e53c..4eeb1fc 100644 --- a/ACTK1_0/se/HostDeleteCommandTest.cpp +++ b/ACTK1_0/se/HostDeleteCommandTest.cpp @@ -12,11 +12,11 @@ void doWork() { init("./etc/toolkit2.conf"); { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); - HostDeleteCommand hcc("ns1.jtkutest.com.au"); + HostDeleteCommand hcc("ns1.ACTKUTST.com.au"); const string xml(hcc.toXML()); - ASSERT_EQ(xml, "ns1.jtkutest.com.auJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ns1.ACTKUTST.com.auACTKUTST.20140101.010101.0"); } } diff --git a/ACTK1_0/se/HostInfoCommandTest.cpp b/ACTK1_0/se/HostInfoCommandTest.cpp index 763cda9..e4ad4d6 100644 --- a/ACTK1_0/se/HostInfoCommandTest.cpp +++ b/ACTK1_0/se/HostInfoCommandTest.cpp @@ -10,11 +10,11 @@ void doWork() { init("./etc/toolkit2.conf"); Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); - HostInfoCommand cmd("ns1.jtkutest.com.au"); + HostInfoCommand cmd("ns1.ACTKUTST.com.au"); const string xml = cmd.toXML(); - ASSERT_EQ("ns1.jtkutest.com.auJTKUTEST.20140101.010101.0", xml); + ASSERT_EQ("ns1.ACTKUTST.com.auACTKUTST.20140101.010101.0", xml); } int main(int argc, char* argv[]) diff --git a/ACTK1_0/se/LoginCommandTest.cpp b/ACTK1_0/se/LoginCommandTest.cpp index f8311f4..4dc8ed2 100644 --- a/ACTK1_0/se/LoginCommandTest.cpp +++ b/ACTK1_0/se/LoginCommandTest.cpp @@ -22,38 +22,38 @@ void doWork() init("./etc/toolkit2.conf"); { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); - LoginCommand cmd("JTKUTEST", "1234abcd!@#$JTK"); + LoginCommand cmd("ACTKUTST", "1234abcd!@#$JTK"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "JTKUTEST1234abcd!@#$JTK1.0enurn:ietf:params:xml:ns:domain-1.0urn:ietf:params:xml:ns:host-1.0urn:ietf:params:xml:ns:contact-1.0JTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST1234abcd!@#$JTK1.0enurn:ietf:params:xml:ns:domain-1.0urn:ietf:params:xml:ns:host-1.0urn:ietf:params:xml:ns:contact-1.0ACTKUTST.20140101.010101.0"); } { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); - LoginCommand cmd("JTKUTEST", "1234abcd!@#$JTK", objURIs, extURIs); + LoginCommand cmd("ACTKUTST", "1234abcd!@#$JTK", objURIs, extURIs); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "JTKUTEST1234abcd!@#$JTK1.0enurn:ietf:params:xml:ns:domain-1.0urn:ietf:params:xml:ns:host-1.0urn:ietf:params:xml:ns:contact-1.0urn:au:params:xml:ns:auext-1.0JTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST1234abcd!@#$JTK1.0enurn:ietf:params:xml:ns:domain-1.0urn:ietf:params:xml:ns:host-1.0urn:ietf:params:xml:ns:contact-1.0urn:au:params:xml:ns:auext-1.0ACTKUTST.20140101.010101.0"); } { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); - LoginCommand cmd("JTKUTEST", "1234abcd!@#$JTK", "1.0", "fr", objURIs, extURIs); + CLTRID::setClID("ACTKUTST"); + LoginCommand cmd("ACTKUTST", "1234abcd!@#$JTK", "1.0", "fr", objURIs, extURIs); const string xml(cmd.toXML()); - ASSERT_EQ("JTKUTEST1234abcd!@#$JTK1.0frurn:ietf:params:xml:ns:domain-1.0urn:ietf:params:xml:ns:host-1.0urn:ietf:params:xml:ns:contact-1.0urn:au:params:xml:ns:auext-1.0JTKUTEST.20140101.010101.0", xml); + ASSERT_EQ("ACTKUTST1234abcd!@#$JTK1.0frurn:ietf:params:xml:ns:domain-1.0urn:ietf:params:xml:ns:host-1.0urn:ietf:params:xml:ns:contact-1.0urn:au:params:xml:ns:auext-1.0ACTKUTST.20140101.010101.0", xml); } { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); const string newPw("n(-w18PW*"); - LoginCommand cmd("JTKUTEST", "1234abcd!@#$JTK", &newPw, "1.0", "fr", objURIs, extURIs); + LoginCommand cmd("ACTKUTST", "1234abcd!@#$JTK", &newPw, "1.0", "fr", objURIs, extURIs); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "JTKUTEST1234abcd!@#$JTKn(-w18PW*1.0frurn:ietf:params:xml:ns:domain-1.0urn:ietf:params:xml:ns:host-1.0urn:ietf:params:xml:ns:contact-1.0urn:au:params:xml:ns:auext-1.0JTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST1234abcd!@#$JTKn(-w18PW*1.0frurn:ietf:params:xml:ns:domain-1.0urn:ietf:params:xml:ns:host-1.0urn:ietf:params:xml:ns:contact-1.0urn:au:params:xml:ns:auext-1.0ACTKUTST.20140101.010101.0"); } } diff --git a/ACTK1_0/se/LogoutCommandTest.cpp b/ACTK1_0/se/LogoutCommandTest.cpp index b545b7a..d3d3f68 100644 --- a/ACTK1_0/se/LogoutCommandTest.cpp +++ b/ACTK1_0/se/LogoutCommandTest.cpp @@ -12,13 +12,13 @@ void doWork() { init("./etc/toolkit2.conf"); { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); LogoutCommand cmd; const string xml(cmd.toXML()); - ASSERT_EQ(xml, "JTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.20140101.010101.0"); } } diff --git a/ACTK1_0/se/PollAckCommandTest.cpp b/ACTK1_0/se/PollAckCommandTest.cpp index 647e4b6..df9aad5 100644 --- a/ACTK1_0/se/PollAckCommandTest.cpp +++ b/ACTK1_0/se/PollAckCommandTest.cpp @@ -10,11 +10,11 @@ void doWork() { init("./etc/toolkit2.conf"); Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); PollAckCommand cmd(123); const string xml = cmd.toXML(); - ASSERT_EQ("JTKUTEST.20140101.010101.0", xml); + ASSERT_EQ("ACTKUTST.20140101.010101.0", xml); } int main(int argc, char* argv[]) diff --git a/ACTK1_0/se/PollResponseTest.cpp b/ACTK1_0/se/PollResponseTest.cpp index df50907..70c1b31 100644 --- a/ACTK1_0/se/PollResponseTest.cpp +++ b/ACTK1_0/se/PollResponseTest.cpp @@ -1,9 +1,9 @@ #include "se/PollResponse.hpp" #include "se/CLTRID.hpp" +#include "common/init.hpp" #include "se/EPPDateFormatter.hpp" #include "xml/XMLParser.hpp" #include "session/Timer.hpp" -#include "common/init.hpp" #include "common/Test.hpp" #include @@ -25,13 +25,13 @@ void doWork() void testContactTransferApprovePoll() { const string xml = - "Command completed successfully; ack to dequeue2000-06-08T22:00:00.0ZTransfer requested.JTKUTESTpendingClientX2000-06-08T22:00:00.0ZClientY2000-06-13T22:00:00.0ZABC-1234554321-XYZ"; + "Command completed successfully; ack to dequeue2000-06-08T22:00:00.0ZTransfer requested.ACTKUTSTpendingClientX2000-06-08T22:00:00.0ZClientY2000-06-13T22:00:00.0ZABC-1234554321-XYZ"; PollResponse& response(getPollResponse(xml)); const ContactTransferResponse* ctr = response.getContactTransferResponse(); ASSERT(ctr != NULL); - ASSERT_EQ("JTKUTEST", ctr->getID()); + ASSERT_EQ("ACTKUTST", ctr->getID()); ASSERT_EQ("pending", ctr->getTransferStatus()); ASSERT_EQ("ClientX", ctr->getRequestingClID()); ASSERT_EQ("ClientY", ctr->getActioningClID()); diff --git a/ACTK1_0/se/PostalInfo.hpp b/ACTK1_0/se/PostalInfo.hpp index 24d0da3..d853db8 100644 --- a/ACTK1_0/se/PostalInfo.hpp +++ b/ACTK1_0/se/PostalInfo.hpp @@ -20,6 +20,7 @@ class XMLWriter; */ class PostalInfo : public Appendable { + friend class ausRegEPPTK; public: virtual ~PostalInfo(){}; diff --git a/ACTK1_0/se/ReceiveSE.cpp b/ACTK1_0/se/ReceiveSE.cpp index 1600e89..98b32f1 100644 --- a/ACTK1_0/se/ReceiveSE.cpp +++ b/ACTK1_0/se/ReceiveSE.cpp @@ -9,7 +9,7 @@ Logger* ReceiveSE::debugLogger; void ReceiveSE::init() { - std::string pname = "com.ausregistry.cpptoolkit.se"; + std::string pname = "biz.meansofproduction.dnseppus.se"; maintLogger = Logger::getLogger(pname + ".maint"); supportLogger = Logger::getLogger(pname + ".support"); userLogger = Logger::getLogger(pname + ".user"); diff --git a/ACTK1_0/se/secDNS/DomainSecDNSCreateCommandExtension.hpp b/ACTK1_0/se/secDNS/DomainSecDNSCreateCommandExtension.hpp index 3dae40d..48975e2 100644 --- a/ACTK1_0/se/secDNS/DomainSecDNSCreateCommandExtension.hpp +++ b/ACTK1_0/se/secDNS/DomainSecDNSCreateCommandExtension.hpp @@ -16,7 +16,7 @@ class DomainSecDNSCreateCommandExtension : public CommandExtension /** * Set the Create Data. - * The memory of createData pointer will be handled DomainSecDNSCreateCommandExtension, + * The memory of createData pointer will be handled DomainSecDNSCreateCommandExtension, * memory will be auto freed when this extension instance is out of scope * * @param createData diff --git a/ACTK1_0/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp b/ACTK1_0/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp index df1defb..269432d 100644 --- a/ACTK1_0/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp +++ b/ACTK1_0/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp @@ -14,9 +14,9 @@ using namespace std; void testSecDNSAllFields() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); - DomainCreateCommand createCommand("jtkutest.com.au", "jtkUT3st", NULL); + DomainCreateCommand createCommand("ACTKUTST.com.au", "jtkUT3st", NULL); auto_ptr dsData(new SecDNSDSData(12345, 3, 1, "49FD46E6C4B45C55D4AC")); auto_ptr keyData(new SecDNSKeyData(256, 3, 1, "AQPJ////4Q==")); @@ -34,16 +34,16 @@ void testSecDNSAllFields() const string xml = createCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.aujtkUT3st604800123453149FD46E6C4B45C55D4AC25631AQPJ////4Q==JTKUTEST.20140101.010101.0" + "ACTKUTST.com.aujtkUT3st604800123453149FD46E6C4B45C55D4AC25631AQPJ////4Q==ACTKUTST.20140101.010101.0" ); } void testSecDNSMultipleDSDataWithoutMaxSigLife() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); - DomainCreateCommand createCommand("jtkutest.com.au", "jtkUT3st", NULL); + DomainCreateCommand createCommand("ACTKUTST.com.au", "jtkUT3st", NULL); auto_ptr dsData(new SecDNSDSData(12345, 3, 1, "38FD46E6C4B45C55D4AC")); auto_ptr keyData(new SecDNSKeyData(256, 3, 1, "AQPJ////4Q==")); @@ -62,16 +62,16 @@ void testSecDNSMultipleDSDataWithoutMaxSigLife() const string xml = createCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.aujtkUT3st123453138FD46E6C4B45C55D4AC25631AQPJ////4Q==67892249FD46E6C4B45C55D4ACJTKUTEST.20140101.010101.0" + "ACTKUTST.com.aujtkUT3st123453138FD46E6C4B45C55D4AC25631AQPJ////4Q==67892249FD46E6C4B45C55D4ACACTKUTST.20140101.010101.0" ); } void testSecDNSAllFieldsMin() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); - DomainCreateCommand createCommand("jtkutest.com.au", "jtkUT3st", NULL); + DomainCreateCommand createCommand("ACTKUTST.com.au", "jtkUT3st", NULL); auto_ptr dsData(new SecDNSDSData(0, 0, 0, "49FD46E6C4B45C55D4AC")); auto_ptr keyData(new SecDNSKeyData(0, 0, 0, "AQPJ////4Q==")); @@ -89,16 +89,16 @@ void testSecDNSAllFieldsMin() const string xml = createCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.aujtkUT3st100049FD46E6C4B45C55D4AC000AQPJ////4Q==JTKUTEST.20140101.010101.0" + "ACTKUTST.com.aujtkUT3st100049FD46E6C4B45C55D4AC000AQPJ////4Q==ACTKUTST.20140101.010101.0" ); } void testSecDNSAllFieldsMax() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); - DomainCreateCommand createCommand("jtkutest.com.au", "jtkUT3st", NULL); + DomainCreateCommand createCommand("ACTKUTST.com.au", "jtkUT3st", NULL); auto_ptr dsData(new SecDNSDSData(65535, 255, 255, "49FD46E6C4B45C55D4AC")); auto_ptr keyData(new SecDNSKeyData(65535, 255, 255, "AQPJ////4Q==")); @@ -116,16 +116,16 @@ void testSecDNSAllFieldsMax() const string xml = createCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.aujtkUT3st21474836476553525525549FD46E6C4B45C55D4AC65535255255AQPJ////4Q==JTKUTEST.20140101.010101.0" + "ACTKUTST.com.aujtkUT3st21474836476553525525549FD46E6C4B45C55D4AC65535255255AQPJ////4Q==ACTKUTST.20140101.010101.0" ); } void testSecDNSJustKeyData() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); - DomainCreateCommand createCommand("jtkutest.com.au", "jtkUT3st", NULL); + DomainCreateCommand createCommand("ACTKUTST.com.au", "jtkUT3st", NULL); auto_ptr keyData(new SecDNSKeyData(65535, 255, 255, "AQPJ////4Q==")); @@ -141,7 +141,7 @@ void testSecDNSJustKeyData() const string xml = createCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.aujtkUT3st6553565535255255AQPJ////4Q==JTKUTEST.20140101.010101.0" + "ACTKUTST.com.aujtkUT3st6553565535255255AQPJ////4Q==ACTKUTST.20140101.010101.0" ); } diff --git a/ACTK1_0/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp b/ACTK1_0/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp index d372a7c..03dd85e 100644 --- a/ACTK1_0/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp +++ b/ACTK1_0/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp @@ -14,11 +14,11 @@ using namespace std; void testSecDNSAddFieldsUrgent() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); string passwd = "jtkUT3st"; string registrantID = "JTKCON"; - DomainUpdateCommand updateCommand("jtkutest.com.au", &passwd, NULL, NULL, ®istrantID); + DomainUpdateCommand updateCommand("ACTKUTST.com.au", &passwd, NULL, NULL, ®istrantID); auto_ptr dsData(new SecDNSDSData(12345, 3, 1, "49FD46E6C4B45C55D4AC")); auto_ptr keyData(new SecDNSKeyData(256, 3, 1, "AQPJ////4Q==")); @@ -37,18 +37,18 @@ void testSecDNSAddFieldsUrgent() const string xml = updateCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.auJTKCONjtkUT3st604800123453149FD46E6C4B45C55D4AC25631AQPJ////4Q==JTKUTEST.20140101.010101.0" + "ACTKUTST.com.auJTKCONjtkUT3st604800123453149FD46E6C4B45C55D4AC25631AQPJ////4Q==ACTKUTST.20140101.010101.0" ); } void testSecDNSRemoveFieldsNotUrgent() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); string passwd = "jtkUT3st"; string registrantID = "JTKCON"; - DomainUpdateCommand updateCommand("jtkutest.com.au", &passwd, NULL, NULL, ®istrantID); + DomainUpdateCommand updateCommand("ACTKUTST.com.au", &passwd, NULL, NULL, ®istrantID); auto_ptr dsData(new SecDNSDSData(65535, 255, 255, "49FD46E6C4B45C55D4AC")); auto_ptr keyData(new SecDNSKeyData(65535, 255, 255, "AQPJ////4Q==")); @@ -65,18 +65,18 @@ void testSecDNSRemoveFieldsNotUrgent() const string xml = updateCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.auJTKCONjtkUT3st6553525525549FD46E6C4B45C55D4AC65535255255AQPJ////4Q==JTKUTEST.20140101.010101.0" + "ACTKUTST.com.auJTKCONjtkUT3st6553525525549FD46E6C4B45C55D4AC65535255255AQPJ////4Q==ACTKUTST.20140101.010101.0" ); } void testSecDNSRemoveAll() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); string passwd = "jtkUT3st"; string registrantID = "JTKCON"; - DomainUpdateCommand updateCommand("jtkutest.com.au", &passwd, NULL, NULL, ®istrantID); + DomainUpdateCommand updateCommand("ACTKUTST.com.au", &passwd, NULL, NULL, ®istrantID); auto_ptr remData(new SecDNSRemType()); @@ -90,18 +90,18 @@ void testSecDNSRemoveAll() const string xml = updateCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.auJTKCONjtkUT3sttrueJTKUTEST.20140101.010101.0" + "ACTKUTST.com.auJTKCONjtkUT3sttrueACTKUTST.20140101.010101.0" ); } void testSecDNSRemoveAllAndAddDsData() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); string passwd = "jtkUT3st"; string registrantID = "JTKCON"; - DomainUpdateCommand updateCommand("jtkutest.com.au", &passwd, NULL, NULL, ®istrantID); + DomainUpdateCommand updateCommand("ACTKUTST.com.au", &passwd, NULL, NULL, ®istrantID); auto_ptr remData(new SecDNSRemType()); @@ -120,18 +120,18 @@ void testSecDNSRemoveAllAndAddDsData() const string xml = updateCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.auJTKCONjtkUT3sttrue6553525525549FD46E6C4B45C55D4ACJTKUTEST.20140101.010101.0" + "ACTKUTST.com.auJTKCONjtkUT3sttrue6553525525549FD46E6C4B45C55D4ACACTKUTST.20140101.010101.0" ); } void testSecDNSRemoveAllAndAddKeyData() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); string passwd = "jtkUT3st"; string registrantID = "JTKCON"; - DomainUpdateCommand updateCommand("jtkutest.com.au", &passwd, NULL, NULL, ®istrantID); + DomainUpdateCommand updateCommand("ACTKUTST.com.au", &passwd, NULL, NULL, ®istrantID); auto_ptr remData(new SecDNSRemType()); @@ -150,18 +150,18 @@ void testSecDNSRemoveAllAndAddKeyData() const string xml = updateCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.auJTKCONjtkUT3sttrue65535255255AQPJ////4Q==JTKUTEST.20140101.010101.0" + "ACTKUTST.com.auJTKCONjtkUT3sttrue65535255255AQPJ////4Q==ACTKUTST.20140101.010101.0" ); } void testSecDNSRemoveAllAndAddKeyDataAndChangeMaxSigLife() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); string passwd = "jtkUT3st"; string registrantID = "JTKCON"; - DomainUpdateCommand updateCommand("jtkutest.com.au", &passwd, NULL, NULL, ®istrantID); + DomainUpdateCommand updateCommand("ACTKUTST.com.au", &passwd, NULL, NULL, ®istrantID); auto_ptr remData(new SecDNSRemType()); @@ -185,7 +185,7 @@ void testSecDNSRemoveAllAndAddKeyDataAndChangeMaxSigLife() const string xml = updateCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.auJTKCONjtkUT3sttrue65535255255AQPJ////4Q==604800JTKUTEST.20140101.010101.0" + "ACTKUTST.com.auJTKCONjtkUT3sttrue65535255255AQPJ////4Q==604800ACTKUTST.20140101.010101.0" ); } diff --git a/ACTK1_0/session/SessionManagerImpl.cpp b/ACTK1_0/session/SessionManagerImpl.cpp index e2ae50a..2c72dcf 100644 --- a/ACTK1_0/session/SessionManagerImpl.cpp +++ b/ACTK1_0/session/SessionManagerImpl.cpp @@ -23,7 +23,7 @@ using namespace std; -//string SessionManagerImpl::pname("com.ausregistry.cpptoolkit.session"); +//string SessionManagerImpl::pname("biz.meansofproduction.dnseppus.session"); string SessionManagerImpl::pname("biz.meansofproduction.dnseppus.session"); SessionManagerImpl::SessionManagerImpl(SessionManagerProperties* props) diff --git a/ACTK1_0/session/SessionPoolImpl.cpp b/ACTK1_0/session/SessionPoolImpl.cpp index 7dfcf69..732b908 100644 --- a/ACTK1_0/session/SessionPoolImpl.cpp +++ b/ACTK1_0/session/SessionPoolImpl.cpp @@ -23,7 +23,7 @@ using namespace std; const float SessionPoolImpl::PI_STO_FRACT = 0.4; -const string SessionPoolImpl::pname("com.ausregistry.cpptoolkit.session"); +const string SessionPoolImpl::pname("biz.meansofproduction.dnseppus.session"); SessionPoolImpl::SessionPoolImpl(SessionPoolProperties* props) diff --git a/ACTK1_0/session/TLSSession.cpp b/ACTK1_0/session/TLSSession.cpp index 5ea2216..c1fd967 100644 --- a/ACTK1_0/session/TLSSession.cpp +++ b/ACTK1_0/session/TLSSession.cpp @@ -51,7 +51,7 @@ TLSSession::TLSSession(SessionProperties* props) pthread_cond_init(&cond, NULL); configure(props); - const string pname("com.ausregistry.cpptoolkit.session"); + const string pname("biz.meansofproduction.dnseppus.session"); debugLogger = Logger::getLogger(pname + ".debug"); supportLogger = Logger::getLogger(pname + ".support"); userLogger = Logger::getLogger(pname + ".user"); diff --git a/ACTK1_0/xml/XMLParser.cpp b/ACTK1_0/xml/XMLParser.cpp index ef108d3..6a4f385 100644 --- a/ACTK1_0/xml/XMLParser.cpp +++ b/ACTK1_0/xml/XMLParser.cpp @@ -31,7 +31,7 @@ namespace { public: ErrorHandlerImpl() { - userLogger = Logger::getLogger("com.ausregistry.cpptoolkit.xml.user"); + userLogger = Logger::getLogger("biz.meansofproduction.dnseppus.xml.user"); } void warning(const SAXParseException& e) diff --git a/ACTK1_0/xml/XMLWriter.cpp b/ACTK1_0/xml/XMLWriter.cpp index 57c84f1..4113686 100644 --- a/ACTK1_0/xml/XMLWriter.cpp +++ b/ACTK1_0/xml/XMLWriter.cpp @@ -28,7 +28,7 @@ string xmlProlog(const string& version, const string& enc) void XMLWriter::init() { - const string pname("com.ausregistry.cpptoolkit.xml"); + const string pname("biz.meansofproduction.dnseppus.xml"); debugLogger = Logger::getLogger(pname + ".debug"); userLogger = Logger::getLogger(pname + ".user"); } diff --git a/AusRegCliever/Makefile b/AusRegCliever/Makefile index 5d7d2d4..cdad37b 100644 --- a/AusRegCliever/Makefile +++ b/AusRegCliever/Makefile @@ -122,7 +122,7 @@ build/masterDaemon.o: server/masterDaemon.cpp include/*.h $(CC) $(CFLAGS) server/masterDaemon.cpp -c -o build/masterDaemon.o $(SINCL) $(ARTKINCL) build/mdAusReg.o: server/mdAusReg.cpp include/*.h - $(CC) $(CFLAGS) server/mdAusReg.cpp -c -o build/mdAusReg.o $(SINCL) $(ARTKINCL) + $(CC) $(CFLAGS) server/mdAusReg.cpp -c -o build/mdAusReg.o $(SINCL) $(ARTKINCL) $(ARTKLIB) -l libACTK1_0.so build/ausreg-md: $(MDOBJS) $(CC) $(CFLAGS) -o build/ausreg-md $(SINCL) $(LIBS) $(MDOBJS) $(DLIBS) diff --git a/AusRegCliever/server/mdAusReg.cpp b/AusRegCliever/server/mdAusReg.cpp index fc27623..4a03e4b 100644 --- a/AusRegCliever/server/mdAusReg.cpp +++ b/AusRegCliever/server/mdAusReg.cpp @@ -11,7 +11,7 @@ #include "OTE/LPECheckCommand.hpp" #include "OTE/LPECheckResponse.hpp" #include "se/TransferOp.hpp" -#include "se/PostalInfo.hpp" +#include "se/IntPostalInfo.hpp" #include "se/ContactCreateCommand.hpp" #include "se/ContactCreateResponse.hpp" #include "se/DomainCreateCommand.hpp" @@ -23,13 +23,19 @@ using namespace std; -class RRJPI : public PostalInfo { - public: - RRJPI(const PostalInfoType *type,const string& name, const string& org, - const std::vector& street, const string& city, - const string& state,const string& pc, const string& guo) - : PostalInfo (type, name, org, street, city, state, pc, guo) { }; -}; +//class RRJPI : public PostalInfo { +// public: +// RRJPI(const PostalInfoType *type,const string& name, const string& org, +// const std::vector& street, const string& city, +// const string& state,const string& pc, const string& guo) +// : PostalInfo (type, name, org, street, city, state, pc, guo) { }; +//}; + +char *name1 = "bestever.camera"; +char *name2 = "yoda.guru"; +char *name3 = "pricey.holdings"; +char *name4 = "unicycles.bike"; +char *name5 = "greedy.ventures"; static TestEnvironment props; @@ -96,8 +102,11 @@ void ausRegEPPTK::doOTEA() } } void ausRegEPPTK::doOTEB() - { bool debug=true; - int cmd=0,thisAccount=0; + { + bool addDomains = false, debug=true, contactCreated = true, doTransfers = false; + int cmd=0; + char *thatAccount="secura2-ote", *thisAccount="secura1-ote"; + string op("newInstance"); Transaction thisTest; @@ -121,7 +130,7 @@ void ausRegEPPTK::doOTEB() theseLogs->logN(1,"OTE Basic Access Setup (%d).",cmd++); - const PostalInfoType *pits=new PostalInfoType(string("int")); +// const PostalInfoType *pits=new PostalInfoType(string("int")); const std::string rrj("renjuan"); const std::string rrjPW("Ab9dW@rd"); @@ -135,26 +144,30 @@ void ausRegEPPTK::doOTEB() const std::string rrjGuo("US"); const std::string rrjOrg("American Kybernetik"); - const RRJPI rrjPO(pits,rrjName,rrjOrg, + const IntPostalInfo rrjPO(rrjName,rrjOrg, rrjCrib,rrjCity,rrjProv,rrjPC,rrjGuo); ContactCreateCommand baCommand_0(rrj,rrjPW,&rrjPO,rrjEmail); ContactCreateResponse baResponse_0; - try { + if (!contactCreated) try { thisTest = Transaction(&baCommand_0, &baResponse_0); manager->execute(thisTest); } + catch(const std::exception e) + { + theseLogs->logN(1,"Case %d: %s.",cmd++,e.what()); + } catch(...) { theseLogs->logN(1,"Case %d Failed, harness catch.",cmd++); } - theseLogs->logN(1,"Begin Basic Access OTE Transactions."); + theseLogs->logN(1,"Continue Basic Access OTE Transactions."); sleep(2); theseLogs->logN(1,"(%d) Conventional check of yoda.guru",cmd++); - DomainCheckCommand baCommand_1("yoda.guru"); + DomainCheckCommand baCommand_1(name2); DomainCheckResponse baResponse_1; try { @@ -166,9 +179,9 @@ void ausRegEPPTK::doOTEB() theseLogs->logN(0,"Case %d Failed, harness catch.",cmd++); } - theseLogs->logN(1,"(%d) LPE Check of pricey.holdings",cmd++); + theseLogs->logN(1,"(%d) LPE Check of unicycles.bike",cmd++); - LPECheckCommand baCommand_2("pricey.holdings"); + LPECheckCommand baCommand_2("unicycles.bike"); LPECheckResponse baResponse_2; thisTest = Transaction(&baCommand_2, &baResponse_2); @@ -186,25 +199,50 @@ void ausRegEPPTK::doOTEB() // billing.push_back(std::string("Billing")); // ns.push_back(std::string("ns1.google.com")); - try { theseLogs->logN(2,"(%d) Try creating bestever.camera using OTE %d.",cmd++, - thisAccount++); + try { theseLogs->logN(2,"skip: (%d) LPE create more using OTE %s.",cmd++, + thisAccount); - DomainCreateCommand baCommand_3("bestever.camera",pw,&RID, - &tech, &ns, &admin, &billing); + if (addDomains) { + + /* DomainCreateCommand + baCommand_3(name3,pw,&RID, &tech, &ns, &admin, &billing); DomainCreateResponse baResponse_3; thisTest = Transaction(&baCommand_3, &baResponse_3); manager->execute(thisTest); + DomainCreateCommand + baCommand_3a(name2,pw,&RID, &tech, &ns, &admin, &billing); + DomainCreateResponse baResponse_3a; + + thisTest = Transaction(&baCommand_3a, &baResponse_3a); + manager->execute(thisTest); + */ + DomainCreateCommand + baCommand_3b(name5,pw,&RID, &tech, &ns, &admin, &billing); + DomainCreateResponse baResponse_3b; + + thisTest = Transaction(&baCommand_3b, &baResponse_3b); + manager->execute(thisTest); + + DomainCreateCommand + baCommand_3c(name4,pw,&RID, &tech, &ns, &admin, &billing); + DomainCreateResponse baResponse_3c; + + thisTest = Transaction(&baCommand_3c, &baResponse_3c); + manager->execute(thisTest); + + } } catch(...) { theseLogs->logN(0,"Case %d Failed, harness catch.",cmd++); } + theseLogs->logN(2,"skip (%d) yoda.guru, bestever.camera -> %s.",cmd++, + thatAccount); - theseLogs->logN(2,"(%d) Transfer bestever.camera to OTE Account %d.",cmd++, - thisAccount++); + if (doTransfers) { const TransferOp *thisTransfer = new TransferOp("request"); @@ -223,7 +261,9 @@ void ausRegEPPTK::doOTEB() theseLogs->logN(0,"Case %d Failed, harness catch.",cmd++); } - theseLogs->logN(1,"(%d) Sunrise create bestever.camera with ICANN SMD test files.",cmd++); + } + + theseLogs->logN(1,"(%d) Sunrise create bestever.camera with ICANN SMD test files.",cmd++); LPECreateCommand baCommand_5("bestever.camera",pw,&RID); LPECreateResponse baResponse_5; diff --git a/AusRegEPPTK/common/ErrorPkg.cpp b/AusRegEPPTK/common/ErrorPkg.cpp index 22dadb1..880b405 100644 --- a/AusRegEPPTK/common/ErrorPkg.cpp +++ b/AusRegEPPTK/common/ErrorPkg.cpp @@ -16,7 +16,7 @@ static std::string pname; void ErrorPkg::init() throw (PropertyConfigException) { - pname = "com.ausregistry.cpptoolkit"; + pname = "biz.meansofproduction.dnseppus"; try { string msgsFile = SystemProperties::getProperty("epp.client.messages.file"); diff --git a/AusRegEPPTK/common/SystemProperties.cpp b/AusRegEPPTK/common/SystemProperties.cpp index 29e29dd..5cdbf44 100644 --- a/AusRegEPPTK/common/SystemProperties.cpp +++ b/AusRegEPPTK/common/SystemProperties.cpp @@ -9,7 +9,7 @@ namespace { void SystemProperties::init(const string& file) { - //static string name = "com.ausregistry.cpptoolkit"; + //static string name = "biz.meansofproduction.dnseppus"; properties.load(file); } diff --git a/AusRegEPPTK/se/AeDomainCreateCommandTest.cpp b/AusRegEPPTK/se/AeDomainCreateCommandTest.cpp index 39a0fd2..5b0feb5 100644 --- a/AusRegEPPTK/se/AeDomainCreateCommandTest.cpp +++ b/AusRegEPPTK/se/AeDomainCreateCommandTest.cpp @@ -27,16 +27,16 @@ void doWork() */ { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); vector techIds; techIds.push_back("JTKCON2"); string registrant("JTKCON"); - AeDomainCreateCommand cmd("jtkutest.co.ae", "jtkUT3st", ®istrant, &techIds, + AeDomainCreateCommand cmd("ACTKUTST.co.ae", "jtkUT3st", ®istrant, &techIds, eligibilityType, policyReason, registrantName); const string xml(cmd.toXML()); ASSERT_EQ(xml, - "jtkutest.co.aeJTKCONJTKCON2jtkUT3stAusRegistryTrade License (IT)1JTKUTEST.20140101.010101.0"); + "ACTKUTST.co.aeJTKCONJTKCON2jtkUT3stAusRegistryTrade License (IT)1ACTKUTST.20140101.010101.0"); } /** @@ -47,7 +47,7 @@ void doWork() */ { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); vector techIds; techIds.push_back("JTKCON2"); @@ -65,7 +65,7 @@ void doWork() Period period(48, PeriodUnit::MONTHS()); AeDomainCreateCommand cmd( - "jtkutest.co.ae", "jtkUT3st", ®istrant, + "ACTKUTST.co.ae", "jtkUT3st", ®istrant, &techIds, &adminContacts, NULL, &nameServers, &period, eligibilityType, policyReason, @@ -73,7 +73,7 @@ void doWork() ®istrantIDType, &eligibilityName, &eligibilityID, &eligibilityIDType); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.co.ae48ns1.ausregistry.netns2.ausregistry.netJTKCONJTKCONJTKCON2JTKCON2jtkUT3stAusRegistry01241326211Trade License (IT)Blah12312395231JTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.co.ae48ns1.ausregistry.netns2.ausregistry.netJTKCONJTKCONJTKCON2JTKCON2jtkUT3stAusRegistry01241326211Trade License (IT)Blah12312395231ACTKUTST.20140101.010101.0"); } } diff --git a/AusRegEPPTK/se/ArDomainPolicyDeleteCommandTest.cpp b/AusRegEPPTK/se/ArDomainPolicyDeleteCommandTest.cpp index da85479..f27ee89 100644 --- a/AusRegEPPTK/se/ArDomainPolicyDeleteCommandTest.cpp +++ b/AusRegEPPTK/se/ArDomainPolicyDeleteCommandTest.cpp @@ -13,11 +13,11 @@ void doWork() init("./etc/toolkit2.conf"); { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); - ArDomainPolicyDeleteCommand cmd("jtkutest.com.au", "jtkutest"); + ArDomainPolicyDeleteCommand cmd("ACTKUTST.com.au", "ACTKUTST"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.com.aujtkutestJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.com.auACTKUTSTACTKUTST.20140101.010101.0"); } } diff --git a/AusRegEPPTK/se/ArDomainPolicyUndeleteCommandTest.cpp b/AusRegEPPTK/se/ArDomainPolicyUndeleteCommandTest.cpp index b2b36c2..c2a445a 100644 --- a/AusRegEPPTK/se/ArDomainPolicyUndeleteCommandTest.cpp +++ b/AusRegEPPTK/se/ArDomainPolicyUndeleteCommandTest.cpp @@ -13,11 +13,11 @@ void doWork() init("./etc/toolkit2.conf"); { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); - ArDomainPolicyUndeleteCommand cmd("jtkutest.com.au"); + ArDomainPolicyUndeleteCommand cmd("ACTKUTST.com.au"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.com.auACTKUTST.20140101.010101.0"); } } diff --git a/AusRegEPPTK/se/ArDomainUndeleteCommandTest.cpp b/AusRegEPPTK/se/ArDomainUndeleteCommandTest.cpp index 137fd41..cf16283 100644 --- a/AusRegEPPTK/se/ArDomainUndeleteCommandTest.cpp +++ b/AusRegEPPTK/se/ArDomainUndeleteCommandTest.cpp @@ -14,10 +14,10 @@ void doWork() init("./etc/toolkit2.conf"); Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); - ArDomainUndeleteCommand cmd("jtkutest.com.au"); + CLTRID::setClID("ACTKUTST"); + ArDomainUndeleteCommand cmd("ACTKUTST.com.au"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.com.auACTKUTST.20140101.010101.0"); } int main(int argc, char* argv[]) diff --git a/AusRegEPPTK/se/ArDomainUnrenewCommandTest.cpp b/AusRegEPPTK/se/ArDomainUnrenewCommandTest.cpp index 846af3b..afed99c 100644 --- a/AusRegEPPTK/se/ArDomainUnrenewCommandTest.cpp +++ b/AusRegEPPTK/se/ArDomainUnrenewCommandTest.cpp @@ -14,12 +14,12 @@ void doWork() init("./etc/toolkit2.conf"); Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); ArDomainUnrenewCommand cmd( - "jtkutest.com.au", *EPPDateFormatter::fromXSDateTime("2014-01-01T00:00:00.0Z")); + "ACTKUTST.com.au", *EPPDateFormatter::fromXSDateTime("2014-01-01T00:00:00.0Z")); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.com.au2014-01-01JTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.com.au2014-01-01ACTKUTST.20140101.010101.0"); } int main(int argc, char* argv[]) diff --git a/AusRegEPPTK/se/AuDomainCreateCommandTest.cpp b/AusRegEPPTK/se/AuDomainCreateCommandTest.cpp index 5fe0b4e..4adc31e 100644 --- a/AusRegEPPTK/se/AuDomainCreateCommandTest.cpp +++ b/AusRegEPPTK/se/AuDomainCreateCommandTest.cpp @@ -27,16 +27,16 @@ void doWork() */ { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); vector techIds; techIds.push_back("JTKCON2"); string registrant("JTKCON"); - AuDomainCreateCommand cmd("jtkutest.com.au", "jtkUT3st", ®istrant, &techIds, + AuDomainCreateCommand cmd("ACTKUTST.com.au", "jtkUT3st", ®istrant, &techIds, eligibilityType, policyReason, registrantName); const string xml(cmd.toXML()); ASSERT_EQ(xml, - "jtkutest.com.auJTKCONJTKCON2jtkUT3stAusRegistryCompany1JTKUTEST.20140101.010101.0"); + "ACTKUTST.com.auJTKCONJTKCON2jtkUT3stAusRegistryCompany1ACTKUTST.20140101.010101.0"); } /** @@ -47,7 +47,7 @@ void doWork() */ { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); vector techIds; techIds.push_back("JTKCON2"); @@ -63,7 +63,7 @@ void doWork() nameServers.push_back("ns2.ausregistry.net"); AuDomainCreateCommand cmd( - "jtkutest.com.au", "jtkUT3st", ®istrant, + "ACTKUTST.com.au", "jtkUT3st", ®istrant, &techIds, &adminContacts, NULL, &nameServers, eligibilityType, policyReason, @@ -71,7 +71,7 @@ void doWork() ®istrantIDType, &eligibilityName, &eligibilityID, &eligibilityIDType); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.com.auns1.ausregistry.netns2.ausregistry.netJTKCONJTKCONJTKCON2JTKCON2jtkUT3stAusRegistry01241326211CompanyBlah12312395231JTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.com.auns1.ausregistry.netns2.ausregistry.netJTKCONJTKCONJTKCON2JTKCON2jtkUT3stAusRegistry01241326211CompanyBlah12312395231ACTKUTST.20140101.010101.0"); } } diff --git a/AusRegEPPTK/se/AuDomainModifyRegistrantCommandTest.cpp b/AusRegEPPTK/se/AuDomainModifyRegistrantCommandTest.cpp index e1638d6..3d80bb0 100644 --- a/AusRegEPPTK/se/AuDomainModifyRegistrantCommandTest.cpp +++ b/AusRegEPPTK/se/AuDomainModifyRegistrantCommandTest.cpp @@ -22,10 +22,10 @@ void doWork() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); AuDomainModifyRegistrantCommand cmd( - "jtkutest.com.au", + "ACTKUTST.com.au", registrantName, "testing", &eligibilityType, @@ -36,7 +36,7 @@ void doWork() &eligibilityID, &eligibilityIDType); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.com.auAusRegistry01241326211CompanyBlah12312395231testingJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.com.auAusRegistry01241326211CompanyBlah12312395231testingACTKUTST.20140101.010101.0"); } } diff --git a/AusRegEPPTK/se/AuDomainTransferRegistrantCommandTest.cpp b/AusRegEPPTK/se/AuDomainTransferRegistrantCommandTest.cpp index 662d277..b733647 100644 --- a/AusRegEPPTK/se/AuDomainTransferRegistrantCommandTest.cpp +++ b/AusRegEPPTK/se/AuDomainTransferRegistrantCommandTest.cpp @@ -26,26 +26,26 @@ void doWork() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); AuDomainTransferRegistrantCommand cmd( - "jtkutest.com.au", // domain name + "ACTKUTST.com.au", // domain name *curExpDate, // current expire date "Other", policyReason, registrantName, "testing"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.com.au2014-01-01AusRegistryOther1testingJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.com.au2014-01-01AusRegistryOther1testingACTKUTST.20140101.010101.0"); } { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Period p(2, PeriodUnit::YEARS()); AuDomainTransferRegistrantCommand cmd( - "jtkutest.com.au", // name + "ACTKUTST.com.au", // name *curExpDate, // curExpDate eligibilityType, policyReason, @@ -58,7 +58,7 @@ void doWork() &eligibilityIDType, &p); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.com.au2014-01-012AusRegistry01241326211CompanyBlah12312395231testingJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.com.au2014-01-012AusRegistry01241326211CompanyBlah12312395231testingACTKUTST.20140101.010101.0"); } } diff --git a/AusRegEPPTK/se/ContactCheckCommandTest.cpp b/AusRegEPPTK/se/ContactCheckCommandTest.cpp index f11e1a5..0043e82 100644 --- a/AusRegEPPTK/se/ContactCheckCommandTest.cpp +++ b/AusRegEPPTK/se/ContactCheckCommandTest.cpp @@ -11,24 +11,24 @@ void doWork() init("./etc/toolkit2.conf"); { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); auto_ptr cmd(new ContactCheckCommand("JTKCON")); const string xml(cmd->toXML()); ASSERT_EQ(xml, - "JTKCONJTKUTEST.20140101.010101.0"); + "JTKCONACTKUTST.20140101.010101.0"); } { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); vector ids; ids.push_back("JTKCON1"); ids.push_back("JTKCON2"); auto_ptr cmd(new ContactCheckCommand(ids)); const string xml(cmd->toXML()); ASSERT_EQ(xml, - "JTKCON1JTKCON2JTKUTEST.20140101.010101.0"); + "JTKCON1JTKCON2ACTKUTST.20140101.010101.0"); } } diff --git a/AusRegEPPTK/se/ContactDeleteCommandTest.cpp b/AusRegEPPTK/se/ContactDeleteCommandTest.cpp index ade206b..0b03815 100644 --- a/AusRegEPPTK/se/ContactDeleteCommandTest.cpp +++ b/AusRegEPPTK/se/ContactDeleteCommandTest.cpp @@ -12,12 +12,12 @@ void doWork() { init("./etc/toolkit2.conf"); { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); ContactDeleteCommand cmd("JTKCON"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "JTKCONJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "JTKCONACTKUTST.20140101.010101.0"); } } diff --git a/AusRegEPPTK/se/ContactInfoCommandTest.cpp b/AusRegEPPTK/se/ContactInfoCommandTest.cpp index 298d876..c19064e 100644 --- a/AusRegEPPTK/se/ContactInfoCommandTest.cpp +++ b/AusRegEPPTK/se/ContactInfoCommandTest.cpp @@ -12,20 +12,20 @@ void doWork() { init("./etc/toolkit2.conf"); { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); ContactInfoCommand cmd("C100000-AR"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "C100000-ARJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "C100000-ARACTKUTST.20140101.010101.0"); } { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); ContactInfoCommand cmd("C100000-AR", "jtkUT3st"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "C100000-ARjtkUT3stJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "C100000-ARjtkUT3stACTKUTST.20140101.010101.0"); } } diff --git a/AusRegEPPTK/se/ContactTransferRequestCommandTest.cpp b/AusRegEPPTK/se/ContactTransferRequestCommandTest.cpp index ba45c5d..361173e 100644 --- a/AusRegEPPTK/se/ContactTransferRequestCommandTest.cpp +++ b/AusRegEPPTK/se/ContactTransferRequestCommandTest.cpp @@ -15,10 +15,10 @@ void doWork() init("./etc/toolkit2.conf"); { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); ContactTransferRequestCommand cmd("JTKCON1", "jtkcon1pw"); - const string expected("JTKCON1jtkcon1pwJTKUTEST.20140101.010101.0"); + const string expected("JTKCON1jtkcon1pwACTKUTST.20140101.010101.0"); const string xml(cmd.toXML()); ASSERT_EQ(expected, xml); } diff --git a/AusRegEPPTK/se/DomainCheckCommandTest.cpp b/AusRegEPPTK/se/DomainCheckCommandTest.cpp index 15b613e..41f1527 100644 --- a/AusRegEPPTK/se/DomainCheckCommandTest.cpp +++ b/AusRegEPPTK/se/DomainCheckCommandTest.cpp @@ -12,7 +12,7 @@ void doWork() { init("./etc/toolkit2.conf"); { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); DomainCheckCommand cmd("test.com.au"); @@ -20,7 +20,7 @@ void doWork() ASSERT_EQ(cmd.getCommandType()->getCommandName(), "check"); ASSERT_EQ(cmd.getObjectType()->getName(), "domain"); - ASSERT_EQ(xml, "test.com.auJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "test.com.auACTKUTST.20140101.010101.0"); } } diff --git a/AusRegEPPTK/se/DomainDeleteCommandTest.cpp b/AusRegEPPTK/se/DomainDeleteCommandTest.cpp index a846d6a..b802c78 100644 --- a/AusRegEPPTK/se/DomainDeleteCommandTest.cpp +++ b/AusRegEPPTK/se/DomainDeleteCommandTest.cpp @@ -12,12 +12,12 @@ void doWork() { init("./etc/toolkit2.conf"); { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); - DomainDeleteCommand cmd("jtkutest.com.au"); + DomainDeleteCommand cmd("ACTKUTST.com.au"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.com.auACTKUTST.20140101.010101.0"); } } diff --git a/AusRegEPPTK/se/DomainInfoCommandTest.cpp b/AusRegEPPTK/se/DomainInfoCommandTest.cpp index 04ce325..cee5b47 100644 --- a/AusRegEPPTK/se/DomainInfoCommandTest.cpp +++ b/AusRegEPPTK/se/DomainInfoCommandTest.cpp @@ -12,12 +12,12 @@ void doWork() { init("./etc/toolkit2.conf"); { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); - DomainInfoCommand cmd("jtkutest.com.au"); + DomainInfoCommand cmd("ACTKUTST.com.au"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.com.auACTKUTST.20140101.010101.0"); } } diff --git a/AusRegEPPTK/se/DomainKVCommandExtensionTest.cpp b/AusRegEPPTK/se/DomainKVCommandExtensionTest.cpp index ba37d55..52da157 100644 --- a/AusRegEPPTK/se/DomainKVCommandExtensionTest.cpp +++ b/AusRegEPPTK/se/DomainKVCommandExtensionTest.cpp @@ -19,57 +19,57 @@ const static string policyReason = "1"; void testUpdateSingleKVList() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); DomainKVCommandExtension extension(StandardCommandType::UPDATE()); addSampleItemsToExtension(extension, "ae"); - DomainUpdateCommand updateCommand("jtkutest.com.ae"); + DomainUpdateCommand updateCommand("ACTKUTST.com.ae"); updateCommand.appendExtension(extension); const string xml = updateCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.aeTrademark1AusRegistryJTKUTEST.20140101.010101.0" + "ACTKUTST.com.aeTrademark1AusRegistryACTKUTST.20140101.010101.0" ); } void testCreateSingleKVList() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); DomainKVCommandExtension extension(StandardCommandType::CREATE()); addSampleItemsToExtension(extension, "ae"); string registrant("JTKCON"); - DomainCreateCommand createCommand("jtkutest.com.ae", "jtkUT3st", ®istrant); + DomainCreateCommand createCommand("ACTKUTST.com.ae", "jtkUT3st", ®istrant); createCommand.appendExtension(extension); const string xml = createCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.aeJTKCONjtkUT3stTrademark1AusRegistryJTKUTEST.20140101.010101.0" + "ACTKUTST.com.aeJTKCONjtkUT3stTrademark1AusRegistryACTKUTST.20140101.010101.0" ); } void testMultipleKVList() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); DomainKVCommandExtension extension(StandardCommandType::CREATE()); addSampleItemsToExtension(extension, "ae"); addSampleItemsToExtension(extension, "au"); string registrant("JTKCON"); - DomainCreateCommand createCommand("jtkutest.com.ae", "jtkUT3st", ®istrant); + DomainCreateCommand createCommand("ACTKUTST.com.ae", "jtkUT3st", ®istrant); createCommand.appendExtension(extension); const string xml = createCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.aeJTKCONjtkUT3stTrademark1AusRegistryTrademark1AusRegistryJTKUTEST.20140101.010101.0" + "ACTKUTST.com.aeJTKCONjtkUT3stTrademark1AusRegistryTrademark1AusRegistryACTKUTST.20140101.010101.0" ); } diff --git a/AusRegEPPTK/se/DomainRegistrantTransferCommandTest.cpp b/AusRegEPPTK/se/DomainRegistrantTransferCommandTest.cpp index c6d26f8..8bc89ea 100644 --- a/AusRegEPPTK/se/DomainRegistrantTransferCommandTest.cpp +++ b/AusRegEPPTK/se/DomainRegistrantTransferCommandTest.cpp @@ -23,17 +23,17 @@ void addSampleKVItems(DomainRegistrantTransferCommand *command); void testWithoutPeriod() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); auto_ptr command( - new DomainRegistrantTransferCommand("jtkutest.com.ae", *curExpDate, kvListName, "testing")); + new DomainRegistrantTransferCommand("ACTKUTST.com.ae", *curExpDate, kvListName, "testing")); addSampleKVItems(command.get()); const std::string xml = command->toXML(); ASSERT_EQ(xml, - "jtkutest.com.ae" + "ACTKUTST.com.ae" + EPPDateFormatter::toXSDate(*curExpDate) - + "Trademark1231239523BlahTrademark1Trade License01241326211AusRegistrytestingJTKUTEST.20140101.010101.0" + + "Trademark1231239523BlahTrademark1Trade License01241326211AusRegistrytestingACTKUTST.20140101.010101.0" ); } @@ -41,14 +41,14 @@ void testWithPeriod() { Period period(2, PeriodUnit::YEARS()); auto_ptr command( - new DomainRegistrantTransferCommand("jtkutest.com.ae", *curExpDate, kvListName, "testing", &period)); + new DomainRegistrantTransferCommand("ACTKUTST.com.ae", *curExpDate, kvListName, "testing", &period)); addSampleKVItems(command.get()); const std::string xml = command->toXML(); ASSERT_EQ(xml, - "jtkutest.com.ae" + "ACTKUTST.com.ae" + EPPDateFormatter::toXSDate(*curExpDate) - + "2Trademark1231239523BlahTrademark1Trade License01241326211AusRegistrytestingJTKUTEST.20140101.010101.0" + + "2Trademark1231239523BlahTrademark1Trade License01241326211AusRegistrytestingACTKUTST.20140101.010101.0" ); } diff --git a/AusRegEPPTK/se/DomainTransferQueryCommandTest.cpp b/AusRegEPPTK/se/DomainTransferQueryCommandTest.cpp index 732d73d..0a5f2f2 100644 --- a/AusRegEPPTK/se/DomainTransferQueryCommandTest.cpp +++ b/AusRegEPPTK/se/DomainTransferQueryCommandTest.cpp @@ -12,33 +12,33 @@ void doWork() { init("./etc/toolkit2.conf"); { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); - DomainTransferQueryCommand cmd("jtkutest.com.au"); + DomainTransferQueryCommand cmd("ACTKUTST.com.au"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.com.auACTKUTST.20140101.010101.0"); } { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); - DomainTransferQueryCommand cmd("jtkutest.com.au", "jtkUt3st"); + DomainTransferQueryCommand cmd("ACTKUTST.com.au", "jtkUt3st"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.com.aujtkUt3stJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.com.aujtkUt3stACTKUTST.20140101.010101.0"); } { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); - DomainTransferQueryCommand cmd("jtkutest.com.au", "C100000-AR", "jtkUt3st"); + DomainTransferQueryCommand cmd("ACTKUTST.com.au", "C100000-AR", "jtkUt3st"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.com.aujtkUt3stJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.com.aujtkUt3stACTKUTST.20140101.010101.0"); } } diff --git a/AusRegEPPTK/se/DomainUpdateCommandTest.cpp b/AusRegEPPTK/se/DomainUpdateCommandTest.cpp index 045d153..3ae45dd 100644 --- a/AusRegEPPTK/se/DomainUpdateCommandTest.cpp +++ b/AusRegEPPTK/se/DomainUpdateCommandTest.cpp @@ -19,20 +19,20 @@ using namespace std; void testSimpleUpdate() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); - DomainUpdateCommand cmd("jtkutest.com.au"); + DomainUpdateCommand cmd("ACTKUTST.com.au"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.com.auACTKUTST.20140101.010101.0"); } void testFullUpdate() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); - const char* addNsText[] = { "ns1.jtkutest.com.au", "ns2.jtkutest.com.au" }; + const char* addNsText[] = { "ns1.ACTKUTST.com.au", "ns2.ACTKUTST.com.au" }; const vector addNs(addNsText, addNsText + 2); const vector addTechContacts(1, "JTKCON"); @@ -54,7 +54,7 @@ void testFullUpdate() &addStatus); - const char* remNsText[] = { "ns3.jtkutest.com.au", "ns4.jtkutest.com.au" }; + const char* remNsText[] = { "ns3.ACTKUTST.com.au", "ns4.ACTKUTST.com.au" }; const vector remNs(remNsText, remNsText + 2); const vector remTechContacts(1, "JTKCON2"); @@ -70,22 +70,22 @@ void testFullUpdate() NULL, &remStatus); - const string name("jtkutest.com.au"); + const string name("ACTKUTST.com.au"); const string pw("jtkUT3st"); const string registrantID("JTKCON"); - DomainUpdateCommand cmd("jtkutest.com.au", &pw, &add, &rem, ®istrantID); + DomainUpdateCommand cmd("ACTKUTST.com.au", &pw, &add, &rem, ®istrantID); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "jtkutest.com.auns1.jtkutest.com.auns2.jtkutest.com.auJTKCONJTKCON2JTKCON3non-paymentns3.jtkutest.com.auns4.jtkutest.com.auJTKCON2JTKCONJTKCONjtkUT3stJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.com.auns1.ACTKUTST.com.auns2.ACTKUTST.com.auJTKCONJTKCON2JTKCON3non-paymentns3.ACTKUTST.com.auns4.ACTKUTST.com.auJTKCON2JTKCONJTKCONjtkUT3stACTKUTST.20140101.010101.0"); } void testSyncExpiryDateExtension(void) { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); - DomainUpdateCommand cmd("jtkutest.com.au"); + DomainUpdateCommand cmd("ACTKUTST.com.au"); XMLGC::XMLGregorianCalendar *newExpiryDate = EPPDateFormatter::fromXSDateTime("2005-04-03T22:00:00.0Z"); DomainUpdateSyncCommandExtension extension(newExpiryDate); @@ -94,7 +94,7 @@ void testSyncExpiryDateExtension(void) delete newExpiryDate; ASSERT_EQ(xml, - "jtkutest.com.au2005-04-03T22:00:00.0ZJTKUTEST.20140101.010101.0"); + "ACTKUTST.com.au2005-04-03T22:00:00.0ZACTKUTST.20140101.010101.0"); } void testSyncExpiryDateExtensionWithNullDate(void) diff --git a/AusRegEPPTK/se/HelloTest.cpp b/AusRegEPPTK/se/HelloTest.cpp index 15966ef..c3cd951 100644 --- a/AusRegEPPTK/se/HelloTest.cpp +++ b/AusRegEPPTK/se/HelloTest.cpp @@ -10,7 +10,7 @@ using namespace std; void doWork() { init("./etc/toolkit2.conf"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Hello cmd; const string xml(cmd.toXML()); diff --git a/AusRegEPPTK/se/HostCheckCommandTest.cpp b/AusRegEPPTK/se/HostCheckCommandTest.cpp index 735d1af..7854adc 100644 --- a/AusRegEPPTK/se/HostCheckCommandTest.cpp +++ b/AusRegEPPTK/se/HostCheckCommandTest.cpp @@ -12,23 +12,23 @@ void doWork() { init("./etc/toolkit2.conf"); { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); - HostCheckCommand hcc("ns1.jtkutest.com.au"); + HostCheckCommand hcc("ns1.ACTKUTST.com.au"); const string xml(hcc.toXML()); - ASSERT_EQ(xml, "ns1.jtkutest.com.auJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ns1.ACTKUTST.com.auACTKUTST.20140101.010101.0"); } { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); std::vector names; - names.push_back("ns1.jtkutest.com.au"); - names.push_back("ns2.jtkutest.com.au"); + names.push_back("ns1.ACTKUTST.com.au"); + names.push_back("ns2.ACTKUTST.com.au"); HostCheckCommand hcc(names); const string xml(hcc.toXML()); - ASSERT_EQ(xml, "ns1.jtkutest.com.auns2.jtkutest.com.auJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ns1.ACTKUTST.com.auns2.ACTKUTST.com.auACTKUTST.20140101.010101.0"); } } diff --git a/AusRegEPPTK/se/HostCreateCommandTest.cpp b/AusRegEPPTK/se/HostCreateCommandTest.cpp index ad1dfec..4f10054 100644 --- a/AusRegEPPTK/se/HostCreateCommandTest.cpp +++ b/AusRegEPPTK/se/HostCreateCommandTest.cpp @@ -12,25 +12,25 @@ void doWork() { init("./etc/toolkit2.conf"); { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); - HostCreateCommand hcc("ns1.jtkutest.com.au"); + HostCreateCommand hcc("ns1.ACTKUTST.com.au"); const string xml(hcc.toXML()); - ASSERT_EQ(xml, "ns1.jtkutest.com.auJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ns1.ACTKUTST.com.auACTKUTST.20140101.010101.0"); } { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); vector addrs; addrs.push_back(InetAddress("192.168.0.1", IPVersion::IPv4())); addrs.push_back(InetAddress("::1", IPVersion::IPv6())); - HostCreateCommand hcc("ns1.jtkutest.com.au", &addrs); + HostCreateCommand hcc("ns1.ACTKUTST.com.au", &addrs); const string xml(hcc.toXML()); - ASSERT_EQ(xml, "ns1.jtkutest.com.au192.168.0.1::1JTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ns1.ACTKUTST.com.au192.168.0.1::1ACTKUTST.20140101.010101.0"); } } diff --git a/AusRegEPPTK/se/HostDeleteCommandTest.cpp b/AusRegEPPTK/se/HostDeleteCommandTest.cpp index e72e53c..4eeb1fc 100644 --- a/AusRegEPPTK/se/HostDeleteCommandTest.cpp +++ b/AusRegEPPTK/se/HostDeleteCommandTest.cpp @@ -12,11 +12,11 @@ void doWork() { init("./etc/toolkit2.conf"); { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); - HostDeleteCommand hcc("ns1.jtkutest.com.au"); + HostDeleteCommand hcc("ns1.ACTKUTST.com.au"); const string xml(hcc.toXML()); - ASSERT_EQ(xml, "ns1.jtkutest.com.auJTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ns1.ACTKUTST.com.auACTKUTST.20140101.010101.0"); } } diff --git a/AusRegEPPTK/se/HostInfoCommandTest.cpp b/AusRegEPPTK/se/HostInfoCommandTest.cpp index 763cda9..e4ad4d6 100644 --- a/AusRegEPPTK/se/HostInfoCommandTest.cpp +++ b/AusRegEPPTK/se/HostInfoCommandTest.cpp @@ -10,11 +10,11 @@ void doWork() { init("./etc/toolkit2.conf"); Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); - HostInfoCommand cmd("ns1.jtkutest.com.au"); + HostInfoCommand cmd("ns1.ACTKUTST.com.au"); const string xml = cmd.toXML(); - ASSERT_EQ("ns1.jtkutest.com.auJTKUTEST.20140101.010101.0", xml); + ASSERT_EQ("ns1.ACTKUTST.com.auACTKUTST.20140101.010101.0", xml); } int main(int argc, char* argv[]) diff --git a/AusRegEPPTK/se/LoginCommandTest.cpp b/AusRegEPPTK/se/LoginCommandTest.cpp index f8311f4..4dc8ed2 100644 --- a/AusRegEPPTK/se/LoginCommandTest.cpp +++ b/AusRegEPPTK/se/LoginCommandTest.cpp @@ -22,38 +22,38 @@ void doWork() init("./etc/toolkit2.conf"); { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); - LoginCommand cmd("JTKUTEST", "1234abcd!@#$JTK"); + LoginCommand cmd("ACTKUTST", "1234abcd!@#$JTK"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "JTKUTEST1234abcd!@#$JTK1.0enurn:ietf:params:xml:ns:domain-1.0urn:ietf:params:xml:ns:host-1.0urn:ietf:params:xml:ns:contact-1.0JTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST1234abcd!@#$JTK1.0enurn:ietf:params:xml:ns:domain-1.0urn:ietf:params:xml:ns:host-1.0urn:ietf:params:xml:ns:contact-1.0ACTKUTST.20140101.010101.0"); } { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); - LoginCommand cmd("JTKUTEST", "1234abcd!@#$JTK", objURIs, extURIs); + LoginCommand cmd("ACTKUTST", "1234abcd!@#$JTK", objURIs, extURIs); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "JTKUTEST1234abcd!@#$JTK1.0enurn:ietf:params:xml:ns:domain-1.0urn:ietf:params:xml:ns:host-1.0urn:ietf:params:xml:ns:contact-1.0urn:au:params:xml:ns:auext-1.0JTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST1234abcd!@#$JTK1.0enurn:ietf:params:xml:ns:domain-1.0urn:ietf:params:xml:ns:host-1.0urn:ietf:params:xml:ns:contact-1.0urn:au:params:xml:ns:auext-1.0ACTKUTST.20140101.010101.0"); } { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); - LoginCommand cmd("JTKUTEST", "1234abcd!@#$JTK", "1.0", "fr", objURIs, extURIs); + CLTRID::setClID("ACTKUTST"); + LoginCommand cmd("ACTKUTST", "1234abcd!@#$JTK", "1.0", "fr", objURIs, extURIs); const string xml(cmd.toXML()); - ASSERT_EQ("JTKUTEST1234abcd!@#$JTK1.0frurn:ietf:params:xml:ns:domain-1.0urn:ietf:params:xml:ns:host-1.0urn:ietf:params:xml:ns:contact-1.0urn:au:params:xml:ns:auext-1.0JTKUTEST.20140101.010101.0", xml); + ASSERT_EQ("ACTKUTST1234abcd!@#$JTK1.0frurn:ietf:params:xml:ns:domain-1.0urn:ietf:params:xml:ns:host-1.0urn:ietf:params:xml:ns:contact-1.0urn:au:params:xml:ns:auext-1.0ACTKUTST.20140101.010101.0", xml); } { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); const string newPw("n(-w18PW*"); - LoginCommand cmd("JTKUTEST", "1234abcd!@#$JTK", &newPw, "1.0", "fr", objURIs, extURIs); + LoginCommand cmd("ACTKUTST", "1234abcd!@#$JTK", &newPw, "1.0", "fr", objURIs, extURIs); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "JTKUTEST1234abcd!@#$JTKn(-w18PW*1.0frurn:ietf:params:xml:ns:domain-1.0urn:ietf:params:xml:ns:host-1.0urn:ietf:params:xml:ns:contact-1.0urn:au:params:xml:ns:auext-1.0JTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST1234abcd!@#$JTKn(-w18PW*1.0frurn:ietf:params:xml:ns:domain-1.0urn:ietf:params:xml:ns:host-1.0urn:ietf:params:xml:ns:contact-1.0urn:au:params:xml:ns:auext-1.0ACTKUTST.20140101.010101.0"); } } diff --git a/AusRegEPPTK/se/LogoutCommandTest.cpp b/AusRegEPPTK/se/LogoutCommandTest.cpp index b545b7a..d3d3f68 100644 --- a/AusRegEPPTK/se/LogoutCommandTest.cpp +++ b/AusRegEPPTK/se/LogoutCommandTest.cpp @@ -12,13 +12,13 @@ void doWork() { init("./etc/toolkit2.conf"); { - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); LogoutCommand cmd; const string xml(cmd.toXML()); - ASSERT_EQ(xml, "JTKUTEST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.20140101.010101.0"); } } diff --git a/AusRegEPPTK/se/PollAckCommandTest.cpp b/AusRegEPPTK/se/PollAckCommandTest.cpp index 647e4b6..df9aad5 100644 --- a/AusRegEPPTK/se/PollAckCommandTest.cpp +++ b/AusRegEPPTK/se/PollAckCommandTest.cpp @@ -10,11 +10,11 @@ void doWork() { init("./etc/toolkit2.conf"); Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); PollAckCommand cmd(123); const string xml = cmd.toXML(); - ASSERT_EQ("JTKUTEST.20140101.010101.0", xml); + ASSERT_EQ("ACTKUTST.20140101.010101.0", xml); } int main(int argc, char* argv[]) diff --git a/AusRegEPPTK/se/PollResponseTest.cpp b/AusRegEPPTK/se/PollResponseTest.cpp index 5f27e56..014dcd5 100644 --- a/AusRegEPPTK/se/PollResponseTest.cpp +++ b/AusRegEPPTK/se/PollResponseTest.cpp @@ -25,13 +25,13 @@ void doWork() void testContactTransferApprovePoll() { const string xml = - "Command completed successfully; ack to dequeue2000-06-08T22:00:00.0ZTransfer requested.JTKUTESTpendingClientX2000-06-08T22:00:00.0ZClientY2000-06-13T22:00:00.0ZABC-1234554321-XYZ"; + "Command completed successfully; ack to dequeue2000-06-08T22:00:00.0ZTransfer requested.ACTKUTSTpendingClientX2000-06-08T22:00:00.0ZClientY2000-06-13T22:00:00.0ZABC-1234554321-XYZ"; PollResponse& response(getPollResponse(xml)); const ContactTransferResponse* ctr = response.getContactTransferResponse(); ASSERT(ctr != NULL); - ASSERT_EQ("JTKUTEST", ctr->getID()); + ASSERT_EQ("ACTKUTST", ctr->getID()); ASSERT_EQ("pending", ctr->getTransferStatus()); ASSERT_EQ("ClientX", ctr->getRequestingClID()); ASSERT_EQ("ClientY", ctr->getActioningClID()); diff --git a/AusRegEPPTK/se/ReceiveSE.cpp b/AusRegEPPTK/se/ReceiveSE.cpp index 1600e89..98b32f1 100644 --- a/AusRegEPPTK/se/ReceiveSE.cpp +++ b/AusRegEPPTK/se/ReceiveSE.cpp @@ -9,7 +9,7 @@ Logger* ReceiveSE::debugLogger; void ReceiveSE::init() { - std::string pname = "com.ausregistry.cpptoolkit.se"; + std::string pname = "biz.meansofproduction.dnseppus.se"; maintLogger = Logger::getLogger(pname + ".maint"); supportLogger = Logger::getLogger(pname + ".support"); userLogger = Logger::getLogger(pname + ".user"); diff --git a/AusRegEPPTK/se/SendSE.cpp b/AusRegEPPTK/se/SendSE.cpp index adeafc4..e8817fc 100644 --- a/AusRegEPPTK/se/SendSE.cpp +++ b/AusRegEPPTK/se/SendSE.cpp @@ -49,5 +49,5 @@ SendSE::~SendSE() void SendSE::init () { - userLogger = Logger::getLogger("com.ausregistry.cpptoolkit.se.user"); + userLogger = Logger::getLogger("biz.meansofproduction.dnseppus.se.user"); } diff --git a/AusRegEPPTK/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp b/AusRegEPPTK/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp index df1defb..269432d 100644 --- a/AusRegEPPTK/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp +++ b/AusRegEPPTK/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp @@ -14,9 +14,9 @@ using namespace std; void testSecDNSAllFields() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); - DomainCreateCommand createCommand("jtkutest.com.au", "jtkUT3st", NULL); + DomainCreateCommand createCommand("ACTKUTST.com.au", "jtkUT3st", NULL); auto_ptr dsData(new SecDNSDSData(12345, 3, 1, "49FD46E6C4B45C55D4AC")); auto_ptr keyData(new SecDNSKeyData(256, 3, 1, "AQPJ////4Q==")); @@ -34,16 +34,16 @@ void testSecDNSAllFields() const string xml = createCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.aujtkUT3st604800123453149FD46E6C4B45C55D4AC25631AQPJ////4Q==JTKUTEST.20140101.010101.0" + "ACTKUTST.com.aujtkUT3st604800123453149FD46E6C4B45C55D4AC25631AQPJ////4Q==ACTKUTST.20140101.010101.0" ); } void testSecDNSMultipleDSDataWithoutMaxSigLife() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); - DomainCreateCommand createCommand("jtkutest.com.au", "jtkUT3st", NULL); + DomainCreateCommand createCommand("ACTKUTST.com.au", "jtkUT3st", NULL); auto_ptr dsData(new SecDNSDSData(12345, 3, 1, "38FD46E6C4B45C55D4AC")); auto_ptr keyData(new SecDNSKeyData(256, 3, 1, "AQPJ////4Q==")); @@ -62,16 +62,16 @@ void testSecDNSMultipleDSDataWithoutMaxSigLife() const string xml = createCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.aujtkUT3st123453138FD46E6C4B45C55D4AC25631AQPJ////4Q==67892249FD46E6C4B45C55D4ACJTKUTEST.20140101.010101.0" + "ACTKUTST.com.aujtkUT3st123453138FD46E6C4B45C55D4AC25631AQPJ////4Q==67892249FD46E6C4B45C55D4ACACTKUTST.20140101.010101.0" ); } void testSecDNSAllFieldsMin() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); - DomainCreateCommand createCommand("jtkutest.com.au", "jtkUT3st", NULL); + DomainCreateCommand createCommand("ACTKUTST.com.au", "jtkUT3st", NULL); auto_ptr dsData(new SecDNSDSData(0, 0, 0, "49FD46E6C4B45C55D4AC")); auto_ptr keyData(new SecDNSKeyData(0, 0, 0, "AQPJ////4Q==")); @@ -89,16 +89,16 @@ void testSecDNSAllFieldsMin() const string xml = createCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.aujtkUT3st100049FD46E6C4B45C55D4AC000AQPJ////4Q==JTKUTEST.20140101.010101.0" + "ACTKUTST.com.aujtkUT3st100049FD46E6C4B45C55D4AC000AQPJ////4Q==ACTKUTST.20140101.010101.0" ); } void testSecDNSAllFieldsMax() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); - DomainCreateCommand createCommand("jtkutest.com.au", "jtkUT3st", NULL); + DomainCreateCommand createCommand("ACTKUTST.com.au", "jtkUT3st", NULL); auto_ptr dsData(new SecDNSDSData(65535, 255, 255, "49FD46E6C4B45C55D4AC")); auto_ptr keyData(new SecDNSKeyData(65535, 255, 255, "AQPJ////4Q==")); @@ -116,16 +116,16 @@ void testSecDNSAllFieldsMax() const string xml = createCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.aujtkUT3st21474836476553525525549FD46E6C4B45C55D4AC65535255255AQPJ////4Q==JTKUTEST.20140101.010101.0" + "ACTKUTST.com.aujtkUT3st21474836476553525525549FD46E6C4B45C55D4AC65535255255AQPJ////4Q==ACTKUTST.20140101.010101.0" ); } void testSecDNSJustKeyData() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); - DomainCreateCommand createCommand("jtkutest.com.au", "jtkUT3st", NULL); + DomainCreateCommand createCommand("ACTKUTST.com.au", "jtkUT3st", NULL); auto_ptr keyData(new SecDNSKeyData(65535, 255, 255, "AQPJ////4Q==")); @@ -141,7 +141,7 @@ void testSecDNSJustKeyData() const string xml = createCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.aujtkUT3st6553565535255255AQPJ////4Q==JTKUTEST.20140101.010101.0" + "ACTKUTST.com.aujtkUT3st6553565535255255AQPJ////4Q==ACTKUTST.20140101.010101.0" ); } diff --git a/AusRegEPPTK/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp b/AusRegEPPTK/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp index d372a7c..03dd85e 100644 --- a/AusRegEPPTK/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp +++ b/AusRegEPPTK/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp @@ -14,11 +14,11 @@ using namespace std; void testSecDNSAddFieldsUrgent() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); string passwd = "jtkUT3st"; string registrantID = "JTKCON"; - DomainUpdateCommand updateCommand("jtkutest.com.au", &passwd, NULL, NULL, ®istrantID); + DomainUpdateCommand updateCommand("ACTKUTST.com.au", &passwd, NULL, NULL, ®istrantID); auto_ptr dsData(new SecDNSDSData(12345, 3, 1, "49FD46E6C4B45C55D4AC")); auto_ptr keyData(new SecDNSKeyData(256, 3, 1, "AQPJ////4Q==")); @@ -37,18 +37,18 @@ void testSecDNSAddFieldsUrgent() const string xml = updateCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.auJTKCONjtkUT3st604800123453149FD46E6C4B45C55D4AC25631AQPJ////4Q==JTKUTEST.20140101.010101.0" + "ACTKUTST.com.auJTKCONjtkUT3st604800123453149FD46E6C4B45C55D4AC25631AQPJ////4Q==ACTKUTST.20140101.010101.0" ); } void testSecDNSRemoveFieldsNotUrgent() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); string passwd = "jtkUT3st"; string registrantID = "JTKCON"; - DomainUpdateCommand updateCommand("jtkutest.com.au", &passwd, NULL, NULL, ®istrantID); + DomainUpdateCommand updateCommand("ACTKUTST.com.au", &passwd, NULL, NULL, ®istrantID); auto_ptr dsData(new SecDNSDSData(65535, 255, 255, "49FD46E6C4B45C55D4AC")); auto_ptr keyData(new SecDNSKeyData(65535, 255, 255, "AQPJ////4Q==")); @@ -65,18 +65,18 @@ void testSecDNSRemoveFieldsNotUrgent() const string xml = updateCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.auJTKCONjtkUT3st6553525525549FD46E6C4B45C55D4AC65535255255AQPJ////4Q==JTKUTEST.20140101.010101.0" + "ACTKUTST.com.auJTKCONjtkUT3st6553525525549FD46E6C4B45C55D4AC65535255255AQPJ////4Q==ACTKUTST.20140101.010101.0" ); } void testSecDNSRemoveAll() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); string passwd = "jtkUT3st"; string registrantID = "JTKCON"; - DomainUpdateCommand updateCommand("jtkutest.com.au", &passwd, NULL, NULL, ®istrantID); + DomainUpdateCommand updateCommand("ACTKUTST.com.au", &passwd, NULL, NULL, ®istrantID); auto_ptr remData(new SecDNSRemType()); @@ -90,18 +90,18 @@ void testSecDNSRemoveAll() const string xml = updateCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.auJTKCONjtkUT3sttrueJTKUTEST.20140101.010101.0" + "ACTKUTST.com.auJTKCONjtkUT3sttrueACTKUTST.20140101.010101.0" ); } void testSecDNSRemoveAllAndAddDsData() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); string passwd = "jtkUT3st"; string registrantID = "JTKCON"; - DomainUpdateCommand updateCommand("jtkutest.com.au", &passwd, NULL, NULL, ®istrantID); + DomainUpdateCommand updateCommand("ACTKUTST.com.au", &passwd, NULL, NULL, ®istrantID); auto_ptr remData(new SecDNSRemType()); @@ -120,18 +120,18 @@ void testSecDNSRemoveAllAndAddDsData() const string xml = updateCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.auJTKCONjtkUT3sttrue6553525525549FD46E6C4B45C55D4ACJTKUTEST.20140101.010101.0" + "ACTKUTST.com.auJTKCONjtkUT3sttrue6553525525549FD46E6C4B45C55D4ACACTKUTST.20140101.010101.0" ); } void testSecDNSRemoveAllAndAddKeyData() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); string passwd = "jtkUT3st"; string registrantID = "JTKCON"; - DomainUpdateCommand updateCommand("jtkutest.com.au", &passwd, NULL, NULL, ®istrantID); + DomainUpdateCommand updateCommand("ACTKUTST.com.au", &passwd, NULL, NULL, ®istrantID); auto_ptr remData(new SecDNSRemType()); @@ -150,18 +150,18 @@ void testSecDNSRemoveAllAndAddKeyData() const string xml = updateCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.auJTKCONjtkUT3sttrue65535255255AQPJ////4Q==JTKUTEST.20140101.010101.0" + "ACTKUTST.com.auJTKCONjtkUT3sttrue65535255255AQPJ////4Q==ACTKUTST.20140101.010101.0" ); } void testSecDNSRemoveAllAndAddKeyDataAndChangeMaxSigLife() { Timer::setTime("20140101.010101"); - CLTRID::setClID("JTKUTEST"); + CLTRID::setClID("ACTKUTST"); string passwd = "jtkUT3st"; string registrantID = "JTKCON"; - DomainUpdateCommand updateCommand("jtkutest.com.au", &passwd, NULL, NULL, ®istrantID); + DomainUpdateCommand updateCommand("ACTKUTST.com.au", &passwd, NULL, NULL, ®istrantID); auto_ptr remData(new SecDNSRemType()); @@ -185,7 +185,7 @@ void testSecDNSRemoveAllAndAddKeyDataAndChangeMaxSigLife() const string xml = updateCommand.toXML(); ASSERT_EQ(xml, - "jtkutest.com.auJTKCONjtkUT3sttrue65535255255AQPJ////4Q==604800JTKUTEST.20140101.010101.0" + "ACTKUTST.com.auJTKCONjtkUT3sttrue65535255255AQPJ////4Q==604800ACTKUTST.20140101.010101.0" ); } diff --git a/AusRegEPPTK/session/SessionManagerImpl.cpp b/AusRegEPPTK/session/SessionManagerImpl.cpp index 91dbda8..bb2d13c 100644 --- a/AusRegEPPTK/session/SessionManagerImpl.cpp +++ b/AusRegEPPTK/session/SessionManagerImpl.cpp @@ -23,7 +23,7 @@ using namespace std; -string SessionManagerImpl::pname("com.ausregistry.cpptoolkit.session"); +string SessionManagerImpl::pname("biz.meansofproduction.dnseppus.session"); SessionManagerImpl::SessionManagerImpl(SessionManagerProperties* props) throw (ConfigurationException) diff --git a/AusRegEPPTK/session/SessionPoolImpl.cpp b/AusRegEPPTK/session/SessionPoolImpl.cpp index 78a1119..4986f6c 100644 --- a/AusRegEPPTK/session/SessionPoolImpl.cpp +++ b/AusRegEPPTK/session/SessionPoolImpl.cpp @@ -23,7 +23,7 @@ using namespace std; const float SessionPoolImpl::PI_STO_FRACT = 0.4; -const string SessionPoolImpl::pname("com.ausregistry.cpptoolkit.session"); +const string SessionPoolImpl::pname("biz.meansofproduction.dnseppus.session"); SessionPoolImpl::SessionPoolImpl(SessionPoolProperties* props) diff --git a/AusRegEPPTK/session/TLSSession.cpp b/AusRegEPPTK/session/TLSSession.cpp index 5ea2216..c1fd967 100644 --- a/AusRegEPPTK/session/TLSSession.cpp +++ b/AusRegEPPTK/session/TLSSession.cpp @@ -51,7 +51,7 @@ TLSSession::TLSSession(SessionProperties* props) pthread_cond_init(&cond, NULL); configure(props); - const string pname("com.ausregistry.cpptoolkit.session"); + const string pname("biz.meansofproduction.dnseppus.session"); debugLogger = Logger::getLogger(pname + ".debug"); supportLogger = Logger::getLogger(pname + ".support"); userLogger = Logger::getLogger(pname + ".user"); diff --git a/AusRegEPPTK/xml/XMLParser.cpp b/AusRegEPPTK/xml/XMLParser.cpp index ef108d3..6a4f385 100644 --- a/AusRegEPPTK/xml/XMLParser.cpp +++ b/AusRegEPPTK/xml/XMLParser.cpp @@ -31,7 +31,7 @@ namespace { public: ErrorHandlerImpl() { - userLogger = Logger::getLogger("com.ausregistry.cpptoolkit.xml.user"); + userLogger = Logger::getLogger("biz.meansofproduction.dnseppus.xml.user"); } void warning(const SAXParseException& e) diff --git a/AusRegEPPTK/xml/XMLWriter.cpp b/AusRegEPPTK/xml/XMLWriter.cpp index 57c84f1..4113686 100644 --- a/AusRegEPPTK/xml/XMLWriter.cpp +++ b/AusRegEPPTK/xml/XMLWriter.cpp @@ -28,7 +28,7 @@ string xmlProlog(const string& version, const string& enc) void XMLWriter::init() { - const string pname("com.ausregistry.cpptoolkit.xml"); + const string pname("biz.meansofproduction.dnseppus.xml"); debugLogger = Logger::getLogger(pname + ".debug"); userLogger = Logger::getLogger(pname + ".user"); }