diff --git a/.cproject b/.cproject index 19a8888..d173782 100644 --- a/.cproject +++ b/.cproject @@ -102,7 +102,7 @@ make - build/LPCheck.o + build/LPChkExtension.o true true false diff --git a/ACTK1_0/Makefile b/ACTK1_0/Makefile index 43e20b8..43828ee 100644 --- a/ACTK1_0/Makefile +++ b/ACTK1_0/Makefile @@ -117,7 +117,7 @@ $(BUILD_OBJ_DIR)/%: $(BUILD_OBJ_DIR)/%.o # 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/LPExtension.o \ +build/RegistrantObjectType.o build/LPExtension.o build/LPChkCmdExtension.o \ build/AddRemType.o build/DomainCheckResponse.o build/EnumDomainUpdateCommand.o build/Properties.o build/SessionPoolImpl.o \ build/boolean.o build/DomainCreateCommand.o build/EnumType.o build/ProtocolExtensionCommand.o build/SSLException.o \ build/CertificateUserMismatchException.o build/DomainCreateResponse.o build/EPPDateFormatter.o build/ReceiveSE.o build/StandardCommandType.o \ @@ -126,9 +126,9 @@ build/CLTRID.o build/DomainInfoResponse.o build/CommandCounter.o build/DomainKVCommandExtension.o build/Greeting.o build/NotificationResponse.o build/ResponseExtension.o build/SyncExtension.o \ build/Command.o build/DomainNotificationResponse.o build/HostAddRem.o build/ObjectCommand.o build/Response.o build/SystemProperties.o \ build/config.o build/DomainRegistrantTransferCommand.o build/HostCheckResponse.o build/ResultCounter.o build/Timer.o \ -build/Constants.o build/DomainRegistrantTransferResponse.o build/HostCreateCommand.o build/LPCheck.o build/Result.o build/TLSContext.o \ -build/ContactCheckResponse.o build/DomainRenewCommand.o build/HostCreateResponse.o build/LPLaunch.o build/SecDNSChgType.o build/TLSSession.o \ -build/ContactCreateCommand.o build/DomainRenewResponse.o build/HostInfoResponse.o build/LPCreate.o build/SecDNSDSData.o build/TLSSocket.o \ +build/Constants.o build/DomainRegistrantTransferResponse.o build/HostCreateCommand.o build/Result.o build/TLSContext.o \ +build/ContactCheckResponse.o build/DomainRenewCommand.o build/HostCreateResponse.o build/SecDNSChgType.o build/TLSSession.o \ +build/ContactCreateCommand.o build/DomainRenewResponse.o build/HostInfoResponse.o build/SecDNSDSData.o build/TLSSocket.o \ build/ContactCreateResponse.o build/DomainSecDNSCreateCommandExtension.o build/HostUpdateCommand.o build/SecDNSDSOrKeyType.o build/TransferCommand.o \ build/ContactInfoResponse.o build/DomainSecDNSInfoResponseExtension.o build/InetAddress.o build/SecDNSExtension.o build/TransferOp.o \ build/ContactNotificationResponse.o build/DomainSecDNSUpdateCommandExtension.o build/InfoResponse.o build/SecDNSKeyData.o build/TransferResponse.o \ diff --git a/ACTK1_0/se/CheckResponse.hpp b/ACTK1_0/se/CheckResponse.hpp index 2694292..3175cfa 100644 --- a/ACTK1_0/se/CheckResponse.hpp +++ b/ACTK1_0/se/CheckResponse.hpp @@ -9,7 +9,7 @@ * Subclasses of this must specify the object to which the command is mapped. * Instances of this class provide an interface to access availability * information for each object identified in a {@link - * com.ausregistry.jtoolkit2.se.CheckCommand}. + * mop.bizsregistry.jtoolkit2.se.CheckCommand}. * This relies on the instance first being initialised by a suitable EPP check * response using the method fromXML. For flexibility, this implementation * extracts the data from the response using XPath queries, the expressions for diff --git a/ACTK1_0/se/DomainCheckCommandTest.cpp b/ACTK1_0/se/DomainCheckCommandTest.cpp index 41f1527..d886575 100644 --- a/ACTK1_0/se/DomainCheckCommandTest.cpp +++ b/ACTK1_0/se/DomainCheckCommandTest.cpp @@ -15,12 +15,12 @@ void doWork() CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); - DomainCheckCommand cmd("test.com.au"); + DomainCheckCommand cmd("test.mop.biz"); const string xml(cmd.toXML()); ASSERT_EQ(cmd.getCommandType()->getCommandName(), "check"); ASSERT_EQ(cmd.getObjectType()->getName(), "domain"); - ASSERT_EQ(xml, "test.com.auACTKUTST.20140101.010101.0"); + ASSERT_EQ(xml, "test.mop.bizACTKUTST.20140101.010101.0"); } } diff --git a/ACTK1_0/se/DomainDeleteCommandTest.cpp b/ACTK1_0/se/DomainDeleteCommandTest.cpp index b802c78..1b674c8 100644 --- a/ACTK1_0/se/DomainDeleteCommandTest.cpp +++ b/ACTK1_0/se/DomainDeleteCommandTest.cpp @@ -15,9 +15,9 @@ void doWork() CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); - DomainDeleteCommand cmd("ACTKUTST.com.au"); + DomainDeleteCommand cmd("ACTKUTST.mop.biz"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "ACTKUTST.com.auACTKUTST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.mop.bizACTKUTST.20140101.010101.0"); } } diff --git a/ACTK1_0/se/DomainInfoCommandTest.cpp b/ACTK1_0/se/DomainInfoCommandTest.cpp index cee5b47..35e8b56 100644 --- a/ACTK1_0/se/DomainInfoCommandTest.cpp +++ b/ACTK1_0/se/DomainInfoCommandTest.cpp @@ -15,9 +15,9 @@ void doWork() CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); - DomainInfoCommand cmd("ACTKUTST.com.au"); + DomainInfoCommand cmd("ACTKUTST.mop.biz"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "ACTKUTST.com.auACTKUTST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.mop.bizACTKUTST.20140101.010101.0"); } } diff --git a/ACTK1_0/se/DomainTransferQueryCommandTest.cpp b/ACTK1_0/se/DomainTransferQueryCommandTest.cpp index 0a5f2f2..fded894 100644 --- a/ACTK1_0/se/DomainTransferQueryCommandTest.cpp +++ b/ACTK1_0/se/DomainTransferQueryCommandTest.cpp @@ -15,30 +15,30 @@ void doWork() CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); - DomainTransferQueryCommand cmd("ACTKUTST.com.au"); + DomainTransferQueryCommand cmd("ACTKUTST.mop.biz"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "ACTKUTST.com.auACTKUTST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.mop.bizACTKUTST.20140101.010101.0"); } { CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); - DomainTransferQueryCommand cmd("ACTKUTST.com.au", "jtkUt3st"); + DomainTransferQueryCommand cmd("ACTKUTST.mop.biz", "jtkUt3st"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "ACTKUTST.com.aujtkUt3stACTKUTST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.mop.bizjtkUt3stACTKUTST.20140101.010101.0"); } { CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); - DomainTransferQueryCommand cmd("ACTKUTST.com.au", "C100000-AR", "jtkUt3st"); + DomainTransferQueryCommand cmd("ACTKUTST.mop.biz", "C100000-AR", "jtkUt3st"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "ACTKUTST.com.aujtkUt3stACTKUTST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.mop.bizjtkUt3stACTKUTST.20140101.010101.0"); } } diff --git a/ACTK1_0/se/DomainUpdateCommandTest.cpp b/ACTK1_0/se/DomainUpdateCommandTest.cpp index f674f8c..8499d47 100644 --- a/ACTK1_0/se/DomainUpdateCommandTest.cpp +++ b/ACTK1_0/se/DomainUpdateCommandTest.cpp @@ -21,9 +21,9 @@ void testSimpleUpdate() Timer::setTime("20140101.010101"); CLTRID::setClID("ACTKUTST"); - DomainUpdateCommand cmd("ACTKUTST.com.au"); + DomainUpdateCommand cmd("ACTKUTST.mop.biz"); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "ACTKUTST.com.auACTKUTST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.mop.bizACTKUTST.20140101.010101.0"); } @@ -32,7 +32,7 @@ void testFullUpdate() Timer::setTime("20140101.010101"); CLTRID::setClID("ACTKUTST"); - const char* addNsText[] = { "ns1.ACTKUTST.com.au", "ns2.ACTKUTST.com.au" }; + const char* addNsText[] = { "ns1.ACTKUTST.mop.biz", "ns2.ACTKUTST.mop.biz" }; const vector addNs(addNsText, addNsText + 2); const vector addTechContacts(1, "JTKCON"); @@ -54,7 +54,7 @@ void testFullUpdate() &addStatus); - const char* remNsText[] = { "ns3.ACTKUTST.com.au", "ns4.ACTKUTST.com.au" }; + const char* remNsText[] = { "ns3.ACTKUTST.mop.biz", "ns4.ACTKUTST.mop.biz" }; const vector remNs(remNsText, remNsText + 2); const vector remTechContacts(1, "JTKCON2"); @@ -70,14 +70,14 @@ void testFullUpdate() NULL, &remStatus); - const string name("ACTKUTST.com.au"); + const string name("ACTKUTST.mop.biz"); const string pw("jtkUT3st"); const string registrantID("JTKCON"); - DomainUpdateCommand cmd("ACTKUTST.com.au", &pw, &add, &rem, ®istrantID); + DomainUpdateCommand cmd("ACTKUTST.mop.biz", &pw, &add, &rem, ®istrantID); const string xml(cmd.toXML()); - ASSERT_EQ(xml, "ACTKUTST.com.auns1.ACTKUTST.com.auns2.ACTKUTST.com.auJTKCONJTKCON2JTKCON3non-paymentns3.ACTKUTST.com.auns4.ACTKUTST.com.auJTKCON2JTKCONJTKCONjtkUT3stACTKUTST.20140101.010101.0"); + ASSERT_EQ(xml, "ACTKUTST.mop.bizns1.ACTKUTST.mop.bizns2.ACTKUTST.mop.bizJTKCONJTKCON2JTKCON3non-paymentns3.ACTKUTST.mop.bizns4.ACTKUTST.mop.bizJTKCON2JTKCONJTKCONjtkUT3stACTKUTST.20140101.010101.0"); } void testSyncExpiryDateExtension(void) @@ -85,7 +85,7 @@ void testSyncExpiryDateExtension(void) Timer::setTime("20140101.010101"); CLTRID::setClID("ACTKUTST"); - DomainUpdateCommand cmd("ACTKUTST.com.au"); + DomainUpdateCommand cmd("ACTKUTST.mop.biz"); 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, - "ACTKUTST.com.au2005-04-03T22:00:00.0ZACTKUTST.20140101.010101.0"); + "ACTKUTST.mop.biz2005-04-03T22:00:00.0ZACTKUTST.20140101.010101.0"); } void testSyncExpiryDateExtensionWithNullDate(void) diff --git a/ACTK1_0/se/HostCheckCommandTest.cpp b/ACTK1_0/se/HostCheckCommandTest.cpp index 7854adc..e48faf3 100644 --- a/ACTK1_0/se/HostCheckCommandTest.cpp +++ b/ACTK1_0/se/HostCheckCommandTest.cpp @@ -14,21 +14,21 @@ void doWork() { CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); - HostCheckCommand hcc("ns1.ACTKUTST.com.au"); + HostCheckCommand hcc("ns1.ACTKUTST.mop.biz"); const string xml(hcc.toXML()); - ASSERT_EQ(xml, "ns1.ACTKUTST.com.auACTKUTST.20140101.010101.0"); + ASSERT_EQ(xml, "ns1.ACTKUTST.mop.bizACTKUTST.20140101.010101.0"); } { CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); std::vector names; - names.push_back("ns1.ACTKUTST.com.au"); - names.push_back("ns2.ACTKUTST.com.au"); + names.push_back("ns1.ACTKUTST.mop.biz"); + names.push_back("ns2.ACTKUTST.mop.biz"); HostCheckCommand hcc(names); const string xml(hcc.toXML()); - ASSERT_EQ(xml, "ns1.ACTKUTST.com.auns2.ACTKUTST.com.auACTKUTST.20140101.010101.0"); + ASSERT_EQ(xml, "ns1.ACTKUTST.mop.bizns2.ACTKUTST.mop.bizACTKUTST.20140101.010101.0"); } } diff --git a/ACTK1_0/se/HostCreateCommandTest.cpp b/ACTK1_0/se/HostCreateCommandTest.cpp index 4f10054..c9f2bd9 100644 --- a/ACTK1_0/se/HostCreateCommandTest.cpp +++ b/ACTK1_0/se/HostCreateCommandTest.cpp @@ -15,9 +15,9 @@ void doWork() CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); - HostCreateCommand hcc("ns1.ACTKUTST.com.au"); + HostCreateCommand hcc("ns1.ACTKUTST.mop.biz"); const string xml(hcc.toXML()); - ASSERT_EQ(xml, "ns1.ACTKUTST.com.auACTKUTST.20140101.010101.0"); + ASSERT_EQ(xml, "ns1.ACTKUTST.mop.bizACTKUTST.20140101.010101.0"); } { @@ -28,9 +28,9 @@ void doWork() addrs.push_back(InetAddress("192.168.0.1", IPVersion::IPv4())); addrs.push_back(InetAddress("::1", IPVersion::IPv6())); - HostCreateCommand hcc("ns1.ACTKUTST.com.au", &addrs); + HostCreateCommand hcc("ns1.ACTKUTST.mop.biz", &addrs); const string xml(hcc.toXML()); - ASSERT_EQ(xml, "ns1.ACTKUTST.com.au192.168.0.1::1ACTKUTST.20140101.010101.0"); + ASSERT_EQ(xml, "ns1.ACTKUTST.mop.biz192.168.0.1::1ACTKUTST.20140101.010101.0"); } } diff --git a/ACTK1_0/se/HostDeleteCommandTest.cpp b/ACTK1_0/se/HostDeleteCommandTest.cpp index 4eeb1fc..631b86c 100644 --- a/ACTK1_0/se/HostDeleteCommandTest.cpp +++ b/ACTK1_0/se/HostDeleteCommandTest.cpp @@ -14,9 +14,9 @@ void doWork() { CLTRID::setClID("ACTKUTST"); Timer::setTime("20140101.010101"); - HostDeleteCommand hcc("ns1.ACTKUTST.com.au"); + HostDeleteCommand hcc("ns1.ACTKUTST.mop.biz"); const string xml(hcc.toXML()); - ASSERT_EQ(xml, "ns1.ACTKUTST.com.auACTKUTST.20140101.010101.0"); + ASSERT_EQ(xml, "ns1.ACTKUTST.mop.bizACTKUTST.20140101.010101.0"); } } diff --git a/ACTK1_0/se/HostInfoCommandTest.cpp b/ACTK1_0/se/HostInfoCommandTest.cpp index e4ad4d6..e9db501 100644 --- a/ACTK1_0/se/HostInfoCommandTest.cpp +++ b/ACTK1_0/se/HostInfoCommandTest.cpp @@ -12,9 +12,9 @@ void doWork() Timer::setTime("20140101.010101"); CLTRID::setClID("ACTKUTST"); - HostInfoCommand cmd("ns1.ACTKUTST.com.au"); + HostInfoCommand cmd("ns1.ACTKUTST.mop.biz"); const string xml = cmd.toXML(); - ASSERT_EQ("ns1.ACTKUTST.com.auACTKUTST.20140101.010101.0", xml); + ASSERT_EQ("ns1.ACTKUTST.mop.bizACTKUTST.20140101.010101.0", xml); } int main(int argc, char* argv[]) diff --git a/ACTK1_0/se/LPE/LPCheck.cpp b/ACTK1_0/se/LPE/LPCheck.cpp deleted file mode 100644 index 0eaa32a..0000000 --- a/ACTK1_0/se/LPE/LPCheck.cpp +++ /dev/null @@ -1,31 +0,0 @@ -#include "LPCheck.hpp" -#include "xml/XMLHelper.hpp" - - - namespace { - Extension& launchPhaseExtension() { - static Extension* lpExtension = new LPExtension(); - return *lpExtension; - } - }; // anonymous namespace - -void LPCheck::setExtension () -{ - DOMElement *lpeCreate = - xmlWriter->appendChild( xmlWriter->appendChild( command, "extension"), - "launch:check", launchPhaseExtension().getURI()); - - -} -void LPCheck::addToCommand(const Command &command) const -{ - XMLWriter* xmlWriter = command.getXmlWriter(); - DOMElement* extensionElement = command.getExtensionElement(); - DOMElement* createElement = xmlWriter->appendChild(extensionElement, - "lauch:claims", launchPhaseExtension().getURI()); - - if (createData.get() != NULL) - { - createData->createXMLElement(xmlWriter, createElement); - } -} diff --git a/ACTK1_0/se/LPE/LPCheck.hpp b/ACTK1_0/se/LPE/LPCheck.hpp deleted file mode 100644 index 293fec7..0000000 --- a/ACTK1_0/se/LPE/LPCheck.hpp +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef _LPE_CHK_EXTENSION_HPP_ -#define _LPE_CHK_EXTENSION_HPP_ - -#include "se/DomainCheckCommand.hpp" -#include "LPLaunch.hpp" - - class LPCheck : public DomainCheckCommand -{ - private: - - LPLaunch *draft_tan_epp_launchphase_12; - void setExtension (); - - std::auto_ptr createData; - - public: - /** - * Check the availability of the single identified domain. - * - * @param name The name of the domain to check the availability of. - */ - LPCheck (const std::string &name ) - : DomainCheckCommand (name) { setExtension(); } - - /** - * Check the availability of at least one domain. - * - * @param names The names of the domains to check the availability of. - */ - LPCheck (std::vector &names ) - : DomainCheckCommand ( names ) { setExtension();} - - virtual void addToCommand(const Command &command) const; - - }; - -#endif /* _LPE_COMMAND_EXTENSION_HPP_ */ diff --git a/ACTK1_0/se/LPE/LPChkCmdExtension.cpp b/ACTK1_0/se/LPE/LPChkCmdExtension.cpp new file mode 100644 index 0000000..5f2cb59 --- /dev/null +++ b/ACTK1_0/se/LPE/LPChkCmdExtension.cpp @@ -0,0 +1,21 @@ +#include "se/LPE/LPChkCmdExtension.hpp" +#include "se/Command.hpp" +#include "se/LPE/LPExtension.hpp" +#include "xml/XMLHelper.hpp" + +namespace { + LPExtension& lpExtension() { + static LPExtension* lpExtension = new LPExtension(); + return *lpExtension; + } +}; // anonymous namespace + +void LPChkCmdExtension::addToCommand(const Command &command) const +{ + XMLWriter* xmlWriter = command.getXmlWriter(); + DOMElement* extensionElement = command.getExtensionElement(); + DOMElement* launchElement = xmlWriter->appendChild(extensionElement, + "launch:claims", lpExtension().getURI()); + DOMElement* exPhaseElement = xmlWriter->appendChild(launchElement, "launch:phase"); + XMLHelper::setTextContent(exPhaseElement, lpePhaseName); +} diff --git a/ACTK1_0/se/LPE/LPChkCmdExtension.d b/ACTK1_0/se/LPE/LPChkCmdExtension.d new file mode 100644 index 0000000..8b3f489 --- /dev/null +++ b/ACTK1_0/se/LPE/LPChkCmdExtension.d @@ -0,0 +1,8 @@ +build/LPChkCmdExtension.o se/LPE/LPChkCmdExtension.d: \ + se/LPE/LPChkCmdExtension.cpp se/LPE/LPChkCmdExtension.hpp \ + common/ErrorPkg.hpp common/Properties.hpp config/config.h \ + common/EPPException.hpp common/ConfigurationError.hpp common/Logger.hpp \ + se/Command.hpp se/SendSE.hpp xml/EPPWriter.hpp xml/XMLWriter.hpp \ + xml/ParsingException.hpp se/Extension.hpp se/CommandExtension.hpp \ + se/IllegalArgException.hpp se/LPE/LPExtension.hpp xml/XMLHelper.hpp \ + xml/XStr.hpp diff --git a/ACTK1_0/se/LPE/LPChkCmdExtension.hpp b/ACTK1_0/se/LPE/LPChkCmdExtension.hpp new file mode 100644 index 0000000..09319a9 --- /dev/null +++ b/ACTK1_0/se/LPE/LPChkCmdExtension.hpp @@ -0,0 +1,34 @@ +#ifndef __DOMAIN_CK_COMMAND_EXTENSION_HPP +#define __DOMAIN_CK_COMMAND_EXTENSION_HPP + +#include + +#include "common/ErrorPkg.hpp" +#include "se/Command.hpp" +#include "se/CommandExtension.hpp" +#include "se/IllegalArgException.hpp" + + +class LPChkCmdExtension : public CommandExtension +{ + public: + LPChkCmdExtension(const std::string *phaseName); + virtual void addToCommand(const Command &command) const; + private: + std::string lpePhaseName; + +}; + +inline LPChkCmdExtension::LPChkCmdExtension( + const std::string *phaseName) +{ + if (phaseName == NULL) + { + throw IllegalArgException( + ErrorPkg::getMessage("launch extension phase not set")); + } + + lpePhaseName = std::string(*phaseName); +} + +#endif // __DOMAIN_UPDATE_COMMAND_EXTENSION_HPP diff --git a/ACTK1_0/se/LPE/LPChkExtension.d b/ACTK1_0/se/LPE/LPChkExtension.d new file mode 100644 index 0000000..9f7635a --- /dev/null +++ b/ACTK1_0/se/LPE/LPChkExtension.d @@ -0,0 +1,7 @@ +build/LPChkExtension.o se/LPE/LPChkExtension.d: se/LPE/LPChkExtension.cpp \ + se/LPE/LPChkExtension.hpp common/ErrorPkg.hpp common/Properties.hpp \ + config/config.h common/EPPException.hpp common/ConfigurationError.hpp \ + common/Logger.hpp se/Command.hpp se/SendSE.hpp xml/EPPWriter.hpp \ + xml/XMLWriter.hpp xml/ParsingException.hpp se/Extension.hpp \ + se/CommandExtension.hpp se/IllegalArgException.hpp \ + se/LPE/LPExtension.hpp xml/XMLHelper.hpp xml/XStr.hpp diff --git a/ACTK1_0/se/LPE/LPCreate.cpp b/ACTK1_0/se/LPE/LPCreate.cpp deleted file mode 100644 index f2193df..0000000 --- a/ACTK1_0/se/LPE/LPCreate.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include "LPCreate.hpp" -#include "xml/XMLHelper.hpp" - - - namespace { - Extension& launchPhaseExtension() { - static Extension* lpExtension = new LPExtension(); - return *lpExtension; - } - }; // anonymous namespace - -void LPCreate::setExtension () -{ - - DOMElement *lpeCreate = - xmlWriter->appendChild( xmlWriter->appendChild( command, "extension"), - "launch:create", launchPhaseExtension().getURI()); - DOMElement *lpecd = - xmlWriter->appendChild( xmlWriter->appendChild( lpeCreate, "launch:phase"), - "launch:phase", launchPhaseExtension().getURI() ); - -} diff --git a/ACTK1_0/se/LPE/LPCreate.d b/ACTK1_0/se/LPE/LPCreate.d new file mode 100644 index 0000000..88d44b0 --- /dev/null +++ b/ACTK1_0/se/LPE/LPCreate.d @@ -0,0 +1,10 @@ +build/LPCreate.o se/LPE/LPCreate.d: se/LPE/LPCreate.cpp \ + se/LPE/LPCreate.hpp se/DomainCreateCommand.hpp se/CreateCommand.hpp \ + se/ObjectCommand.hpp se/Command.hpp se/SendSE.hpp xml/EPPWriter.hpp \ + xml/XMLWriter.hpp common/Logger.hpp common/Properties.hpp \ + config/config.h common/EPPException.hpp common/ConfigurationError.hpp \ + xml/ParsingException.hpp se/Extension.hpp se/CommandExtension.hpp \ + se/ObjectType.hpp se/StandardCommandType.hpp se/EnumType.hpp \ + se/IllegalArgException.hpp se/CommandType.hpp common/StringUtils.hpp \ + se/Period.hpp se/PeriodUnit.hpp se/LPE/LPLaunch.hpp \ + se/LPE/LPExtension.hpp xml/XMLHelper.hpp xml/XStr.hpp diff --git a/ACTK1_0/se/LPE/LPCreate.hpp b/ACTK1_0/se/LPE/LPCreate.hpp deleted file mode 100644 index f6127e9..0000000 --- a/ACTK1_0/se/LPE/LPCreate.hpp +++ /dev/null @@ -1,42 +0,0 @@ -/* - * LPCreate.hpp - * - * Created on: Jan 23, 2014 - * Author: jdaugherty - */ - -#ifndef LPCREATE_HPP_ -#define LPCREATE_HPP_ - -#include "se/DomainCreateCommand.hpp" -#include "LPLaunch.hpp" - -class LPCreate : public DomainCreateCommand -{ -private: - - LPLaunch *draft_tan_epp_launchphase_12; - void setExtension (); - -public: - /** - * Constructor for a domain:create EPP command. All core EPP domain:create - * attributes may be set using this constructor. - */ - LPCreate (const std::string& name, - const std::string& pw, - const std::string* registrantID, - const std::vector* techContacts = NULL, - const std::vector* nameservers = NULL, - const std::vector* adminContacts = NULL, - const std::vector* billingContacts = NULL, - const Period* period = NULL) : - DomainCreateCommand( name, pw, registrantID, techContacts, nameservers, adminContacts, billingContacts, period) - { setExtension(); } - - virtual void addToCommand(const Command &command) const; -}; - - - -#endif /* LPCREATE_HPP_ */ diff --git a/ACTK1_0/se/LPE/LPExtension.d b/ACTK1_0/se/LPE/LPExtension.d new file mode 100644 index 0000000..0aacf84 --- /dev/null +++ b/ACTK1_0/se/LPE/LPExtension.d @@ -0,0 +1,2 @@ +build/LPExtension.o se/LPE/LPExtension.d: se/LPE/LPExtension.cpp \ + se/LPE/LPExtension.hpp se/Extension.hpp diff --git a/ACTK1_0/se/LPE/LPLaunch.cpp b/ACTK1_0/se/LPE/LPLaunch.cpp deleted file mode 100644 index 87774f0..0000000 --- a/ACTK1_0/se/LPE/LPLaunch.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "xml/XMLHelper.hpp" -#include "LPLaunch.hpp" - -void LPLaunch::appendData(XMLWriter* xmlWriter, DOMElement* addElement) -{ - DOMElement* lpDataElement = xmlWriter->appendChild(addElement, "claims"); - XMLHelper::setTextContent(xmlWriter->appendChild(lpDataElement, "claims"), claims); - - -} -void LPLaunch::createXMLElement(XMLWriter* xmlWriter, DOMElement* addElement) -{ - - -} diff --git a/ACTK1_0/se/LPE/LPLaunch.d b/ACTK1_0/se/LPE/LPLaunch.d new file mode 100644 index 0000000..9998de5 --- /dev/null +++ b/ACTK1_0/se/LPE/LPLaunch.d @@ -0,0 +1,4 @@ +build/LPLaunch.o se/LPE/LPLaunch.d: se/LPE/LPLaunch.cpp xml/XMLHelper.hpp \ + xml/XStr.hpp se/LPE/LPLaunch.hpp xml/XMLWriter.hpp common/Logger.hpp \ + common/Properties.hpp config/config.h common/EPPException.hpp \ + common/ConfigurationError.hpp se/LPE/LPExtension.hpp se/Extension.hpp diff --git a/ACTK1_0/se/LPE/LPLaunch.hpp b/ACTK1_0/se/LPE/LPLaunch.hpp deleted file mode 100644 index 5d06303..0000000 --- a/ACTK1_0/se/LPE/LPLaunch.hpp +++ /dev/null @@ -1,45 +0,0 @@ -#ifndef LPDATA_HPP_ -#define LPDATA_HPP_ - -#include - -#include "xercesc/dom/DOMElement.hpp" -#include "xml/XMLWriter.hpp" -#include "se/LPE/LPExtension.hpp" - -using namespace std; - -class LPLaunch : public Extension -{ - public: - LPLaunch() : - claims("claims"), - phase("sunrise"), - status("available") - {} - - virtual ~LPLaunch() {} - - const string getPhase() const; - const string getStatus() const; - - void appendData(XMLWriter* xmlWriter, DOMElement* addElement); - void createXMLElement(XMLWriter* xmlWriter, DOMElement* addElement); - - - private: - string claims; - string phase; - string status; -}; - -inline const string LPLaunch::getPhase() const -{ - return phase; -} -inline const string LPLaunch::getStatus() const -{ - return status; -} - -#endif /* LPDATA_HPP_ */ diff --git a/ACTK1_0/se/LPE/LPRespExtender.cpp b/ACTK1_0/se/LPE/LPRespExtender.cpp deleted file mode 100644 index c8e46d2..0000000 --- a/ACTK1_0/se/LPE/LPRespExtender.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include - -#include "LPLaunch.hpp" -#include "LPRespExtender.hpp" - -using namespace std; - -void LPRespExtender::fromXML(XMLDocument *xmlDoc) -{ -// infData.reset(new LPExtension); - -// if (xmlDoc->getNodeCount("count(" + MAXSIGLIFE_EXPR() + ")") > 0) -// { -// int maxSigLifeInt = getInt(xmlDoc->getNodeValue(MAXSIGLIFE_EXPR())); - -// auto_ptr maxSigLife(new SecDNSMaxSigLifeType(maxSigLifeInt));// -// infData->setMaxSigLife(maxSigLife.release()); -// } - -// int secDnsCount = getResponseDSData(xmlDoc); -// initialised = (secDnsCount > 0) && (infData->getDSDataListSize() == secDnsCount); - - if (!initialised) - { - // secDnsCount = getResponseKeyData(xmlDoc); - //initialised = (secDnsCount > 0) && (infData->getKeyDataListSize() == secDnsCount); - } -} -bool LPRespExtender::isInitialised() const {return initialised;} diff --git a/ACTK1_0/se/LPE/LPRespExtender.d b/ACTK1_0/se/LPE/LPRespExtender.d new file mode 100644 index 0000000..c39214c --- /dev/null +++ b/ACTK1_0/se/LPE/LPRespExtender.d @@ -0,0 +1,6 @@ +build/LPRespExtender.o se/LPE/LPRespExtender.d: se/LPE/LPRespExtender.cpp \ + se/LPE/LPLaunch.hpp xml/XMLWriter.hpp common/Logger.hpp \ + common/Properties.hpp config/config.h common/EPPException.hpp \ + common/ConfigurationError.hpp se/LPE/LPExtension.hpp se/Extension.hpp \ + se/LPE/LPRespExtender.hpp se/ResponseExtension.hpp se/ReceiveSE.hpp \ + xml/XMLDocument.hpp diff --git a/ACTK1_0/se/LPE/LPRespExtender.hpp b/ACTK1_0/se/LPE/LPRespExtender.hpp deleted file mode 100644 index d197cb2..0000000 --- a/ACTK1_0/se/LPE/LPRespExtender.hpp +++ /dev/null @@ -1,18 +0,0 @@ - -#include "se/ResponseExtension.hpp" -#include "LPLaunch.hpp" - -class LPRespExtender : public ResponseExtension -{ - -public: - LPRespExtender() : - initialised(false), - infData(NULL) - {} - virtual void fromXML(XMLDocument *xmlDoc); - virtual bool isInitialised() const; -private: - bool initialised; - std::auto_ptr infData; -}; diff --git a/ACTK1_0/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp b/ACTK1_0/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp index 269432d..43fc63b 100644 --- a/ACTK1_0/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp +++ b/ACTK1_0/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp @@ -16,7 +16,7 @@ void testSecDNSAllFields() Timer::setTime("20140101.010101"); CLTRID::setClID("ACTKUTST"); - DomainCreateCommand createCommand("ACTKUTST.com.au", "jtkUT3st", NULL); + DomainCreateCommand createCommand("ACTKUTST.mop.biz", "jtkUT3st", NULL); auto_ptr dsData(new SecDNSDSData(12345, 3, 1, "49FD46E6C4B45C55D4AC")); auto_ptr keyData(new SecDNSKeyData(256, 3, 1, "AQPJ////4Q==")); @@ -34,7 +34,7 @@ void testSecDNSAllFields() const string xml = createCommand.toXML(); ASSERT_EQ(xml, - "ACTKUTST.com.aujtkUT3st604800123453149FD46E6C4B45C55D4AC25631AQPJ////4Q==ACTKUTST.20140101.010101.0" + "ACTKUTST.mop.bizjtkUT3st604800123453149FD46E6C4B45C55D4AC25631AQPJ////4Q==ACTKUTST.20140101.010101.0" ); } @@ -43,7 +43,7 @@ void testSecDNSMultipleDSDataWithoutMaxSigLife() Timer::setTime("20140101.010101"); CLTRID::setClID("ACTKUTST"); - DomainCreateCommand createCommand("ACTKUTST.com.au", "jtkUT3st", NULL); + DomainCreateCommand createCommand("ACTKUTST.mop.biz", "jtkUT3st", NULL); auto_ptr dsData(new SecDNSDSData(12345, 3, 1, "38FD46E6C4B45C55D4AC")); auto_ptr keyData(new SecDNSKeyData(256, 3, 1, "AQPJ////4Q==")); @@ -62,7 +62,7 @@ void testSecDNSMultipleDSDataWithoutMaxSigLife() const string xml = createCommand.toXML(); ASSERT_EQ(xml, - "ACTKUTST.com.aujtkUT3st123453138FD46E6C4B45C55D4AC25631AQPJ////4Q==67892249FD46E6C4B45C55D4ACACTKUTST.20140101.010101.0" + "ACTKUTST.mop.bizjtkUT3st123453138FD46E6C4B45C55D4AC25631AQPJ////4Q==67892249FD46E6C4B45C55D4ACACTKUTST.20140101.010101.0" ); } @@ -71,7 +71,7 @@ void testSecDNSAllFieldsMin() Timer::setTime("20140101.010101"); CLTRID::setClID("ACTKUTST"); - DomainCreateCommand createCommand("ACTKUTST.com.au", "jtkUT3st", NULL); + DomainCreateCommand createCommand("ACTKUTST.mop.biz", "jtkUT3st", NULL); auto_ptr dsData(new SecDNSDSData(0, 0, 0, "49FD46E6C4B45C55D4AC")); auto_ptr keyData(new SecDNSKeyData(0, 0, 0, "AQPJ////4Q==")); @@ -89,7 +89,7 @@ void testSecDNSAllFieldsMin() const string xml = createCommand.toXML(); ASSERT_EQ(xml, - "ACTKUTST.com.aujtkUT3st100049FD46E6C4B45C55D4AC000AQPJ////4Q==ACTKUTST.20140101.010101.0" + "ACTKUTST.mop.bizjtkUT3st100049FD46E6C4B45C55D4AC000AQPJ////4Q==ACTKUTST.20140101.010101.0" ); } @@ -98,7 +98,7 @@ void testSecDNSAllFieldsMax() Timer::setTime("20140101.010101"); CLTRID::setClID("ACTKUTST"); - DomainCreateCommand createCommand("ACTKUTST.com.au", "jtkUT3st", NULL); + DomainCreateCommand createCommand("ACTKUTST.mop.biz", "jtkUT3st", NULL); auto_ptr dsData(new SecDNSDSData(65535, 255, 255, "49FD46E6C4B45C55D4AC")); auto_ptr keyData(new SecDNSKeyData(65535, 255, 255, "AQPJ////4Q==")); @@ -116,7 +116,7 @@ void testSecDNSAllFieldsMax() const string xml = createCommand.toXML(); ASSERT_EQ(xml, - "ACTKUTST.com.aujtkUT3st21474836476553525525549FD46E6C4B45C55D4AC65535255255AQPJ////4Q==ACTKUTST.20140101.010101.0" + "ACTKUTST.mop.bizjtkUT3st21474836476553525525549FD46E6C4B45C55D4AC65535255255AQPJ////4Q==ACTKUTST.20140101.010101.0" ); } @@ -125,7 +125,7 @@ void testSecDNSJustKeyData() Timer::setTime("20140101.010101"); CLTRID::setClID("ACTKUTST"); - DomainCreateCommand createCommand("ACTKUTST.com.au", "jtkUT3st", NULL); + DomainCreateCommand createCommand("ACTKUTST.mop.biz", "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, - "ACTKUTST.com.aujtkUT3st6553565535255255AQPJ////4Q==ACTKUTST.20140101.010101.0" + "ACTKUTST.mop.bizjtkUT3st6553565535255255AQPJ////4Q==ACTKUTST.20140101.010101.0" ); } diff --git a/ACTK1_0/se/secDNS/DomainSecDNSInfoResponseExtensionTest.cpp b/ACTK1_0/se/secDNS/DomainSecDNSInfoResponseExtensionTest.cpp index 603e736..4e7ffb5 100644 --- a/ACTK1_0/se/secDNS/DomainSecDNSInfoResponseExtensionTest.cpp +++ b/ACTK1_0/se/secDNS/DomainSecDNSInfoResponseExtensionTest.cpp @@ -25,7 +25,7 @@ void buildXmlResponseBeforeExtension(const string& domainName, void testSecDNSInfoExtensionAllFields() { - string domainName = "test.com.au"; + string domainName = "test.mop.biz"; DomainInfoResponse response; DomainSecDNSInfoResponseExtension extension; response.registerExtension(&extension); @@ -45,7 +45,7 @@ void testSecDNSInfoExtensionAllFields() void testSecDNSInfoExtensionOnlyKeyData() { - string domainName = "test.com.au"; + string domainName = "test.mop.biz"; DomainInfoResponse response; DomainSecDNSInfoResponseExtension extension; response.registerExtension(&extension); @@ -66,7 +66,7 @@ void testSecDNSInfoExtensionOnlyKeyData() void testSecDNSInfoExtensionMultipleDsRecords() { - string domainName = "test.com.au"; + string domainName = "test.mop.biz"; DomainInfoResponse response; DomainSecDNSInfoResponseExtension extension; response.registerExtension(&extension); @@ -87,7 +87,7 @@ void testSecDNSInfoExtensionMultipleDsRecords() void testSecDNSInfoNoExtensionInitialised() { - string domainName = "test.com.au"; + string domainName = "test.mop.biz"; DomainInfoResponse response; DomainSecDNSInfoResponseExtension extension; response.registerExtension(&extension); @@ -226,10 +226,10 @@ void buildXmlResponseBeforeExtension(const string& domainName, << "" << "EXAMPLE" << "EXAMPLE" << "" - << "ns1.example.com.au" - << "ns2.example.com.au" << "" - << "ns1.example.com.au" - << "ns2.exmaple.com.au" << "Registrar" + << "ns1.example.mop.biz" + << "ns2.example.mop.biz" << "" + << "ns1.example.mop.biz" + << "ns2.exmaple.mop.biz" << "Registrar" << "Registrar" << "2006-02-09T15:44:58.0Z" << "2008-02-10T00:00:00.0Z" << "" diff --git a/ACTK1_0/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp b/ACTK1_0/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp index 03dd85e..1179aeb 100644 --- a/ACTK1_0/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp +++ b/ACTK1_0/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp @@ -18,7 +18,7 @@ void testSecDNSAddFieldsUrgent() string passwd = "jtkUT3st"; string registrantID = "JTKCON"; - DomainUpdateCommand updateCommand("ACTKUTST.com.au", &passwd, NULL, NULL, ®istrantID); + DomainUpdateCommand updateCommand("ACTKUTST.mop.biz", &passwd, NULL, NULL, ®istrantID); auto_ptr dsData(new SecDNSDSData(12345, 3, 1, "49FD46E6C4B45C55D4AC")); auto_ptr keyData(new SecDNSKeyData(256, 3, 1, "AQPJ////4Q==")); @@ -37,7 +37,7 @@ void testSecDNSAddFieldsUrgent() const string xml = updateCommand.toXML(); ASSERT_EQ(xml, - "ACTKUTST.com.auJTKCONjtkUT3st604800123453149FD46E6C4B45C55D4AC25631AQPJ////4Q==ACTKUTST.20140101.010101.0" + "ACTKUTST.mop.bizJTKCONjtkUT3st604800123453149FD46E6C4B45C55D4AC25631AQPJ////4Q==ACTKUTST.20140101.010101.0" ); } @@ -48,7 +48,7 @@ void testSecDNSRemoveFieldsNotUrgent() string passwd = "jtkUT3st"; string registrantID = "JTKCON"; - DomainUpdateCommand updateCommand("ACTKUTST.com.au", &passwd, NULL, NULL, ®istrantID); + DomainUpdateCommand updateCommand("ACTKUTST.mop.biz", &passwd, NULL, NULL, ®istrantID); auto_ptr dsData(new SecDNSDSData(65535, 255, 255, "49FD46E6C4B45C55D4AC")); auto_ptr keyData(new SecDNSKeyData(65535, 255, 255, "AQPJ////4Q==")); @@ -65,7 +65,7 @@ void testSecDNSRemoveFieldsNotUrgent() const string xml = updateCommand.toXML(); ASSERT_EQ(xml, - "ACTKUTST.com.auJTKCONjtkUT3st6553525525549FD46E6C4B45C55D4AC65535255255AQPJ////4Q==ACTKUTST.20140101.010101.0" + "ACTKUTST.mop.bizJTKCONjtkUT3st6553525525549FD46E6C4B45C55D4AC65535255255AQPJ////4Q==ACTKUTST.20140101.010101.0" ); } @@ -76,7 +76,7 @@ void testSecDNSRemoveAll() string passwd = "jtkUT3st"; string registrantID = "JTKCON"; - DomainUpdateCommand updateCommand("ACTKUTST.com.au", &passwd, NULL, NULL, ®istrantID); + DomainUpdateCommand updateCommand("ACTKUTST.mop.biz", &passwd, NULL, NULL, ®istrantID); auto_ptr remData(new SecDNSRemType()); @@ -90,7 +90,7 @@ void testSecDNSRemoveAll() const string xml = updateCommand.toXML(); ASSERT_EQ(xml, - "ACTKUTST.com.auJTKCONjtkUT3sttrueACTKUTST.20140101.010101.0" + "ACTKUTST.mop.bizJTKCONjtkUT3sttrueACTKUTST.20140101.010101.0" ); } @@ -101,7 +101,7 @@ void testSecDNSRemoveAllAndAddDsData() string passwd = "jtkUT3st"; string registrantID = "JTKCON"; - DomainUpdateCommand updateCommand("ACTKUTST.com.au", &passwd, NULL, NULL, ®istrantID); + DomainUpdateCommand updateCommand("ACTKUTST.mop.biz", &passwd, NULL, NULL, ®istrantID); auto_ptr remData(new SecDNSRemType()); @@ -120,7 +120,7 @@ void testSecDNSRemoveAllAndAddDsData() const string xml = updateCommand.toXML(); ASSERT_EQ(xml, - "ACTKUTST.com.auJTKCONjtkUT3sttrue6553525525549FD46E6C4B45C55D4ACACTKUTST.20140101.010101.0" + "ACTKUTST.mop.bizJTKCONjtkUT3sttrue6553525525549FD46E6C4B45C55D4ACACTKUTST.20140101.010101.0" ); } @@ -131,7 +131,7 @@ void testSecDNSRemoveAllAndAddKeyData() string passwd = "jtkUT3st"; string registrantID = "JTKCON"; - DomainUpdateCommand updateCommand("ACTKUTST.com.au", &passwd, NULL, NULL, ®istrantID); + DomainUpdateCommand updateCommand("ACTKUTST.mop.biz", &passwd, NULL, NULL, ®istrantID); auto_ptr remData(new SecDNSRemType()); @@ -150,7 +150,7 @@ void testSecDNSRemoveAllAndAddKeyData() const string xml = updateCommand.toXML(); ASSERT_EQ(xml, - "ACTKUTST.com.auJTKCONjtkUT3sttrue65535255255AQPJ////4Q==ACTKUTST.20140101.010101.0" + "ACTKUTST.mop.bizJTKCONjtkUT3sttrue65535255255AQPJ////4Q==ACTKUTST.20140101.010101.0" ); } @@ -161,7 +161,7 @@ void testSecDNSRemoveAllAndAddKeyDataAndChangeMaxSigLife() string passwd = "jtkUT3st"; string registrantID = "JTKCON"; - DomainUpdateCommand updateCommand("ACTKUTST.com.au", &passwd, NULL, NULL, ®istrantID); + DomainUpdateCommand updateCommand("ACTKUTST.mop.biz", &passwd, NULL, NULL, ®istrantID); auto_ptr remData(new SecDNSRemType()); @@ -185,7 +185,7 @@ void testSecDNSRemoveAllAndAddKeyDataAndChangeMaxSigLife() const string xml = updateCommand.toXML(); ASSERT_EQ(xml, - "ACTKUTST.com.auJTKCONjtkUT3sttrue65535255255AQPJ////4Q==604800ACTKUTST.20140101.010101.0" + "ACTKUTST.mop.bizJTKCONjtkUT3sttrue65535255255AQPJ////4Q==604800ACTKUTST.20140101.010101.0" ); } diff --git a/ACTK1_0/session/SessionManagerFactory.hpp b/ACTK1_0/session/SessionManagerFactory.hpp index 65f0e54..53f85cb 100644 --- a/ACTK1_0/session/SessionManagerFactory.hpp +++ b/ACTK1_0/session/SessionManagerFactory.hpp @@ -23,7 +23,7 @@ enum acTKScenario { /** * This factory provides instances of SessionManager implementations. The * default SessionManager implementation is - * com.ausregistry.jtoolkit2.session.SessionManagerImpl. Alternative + * mop.bizsregistry.jtoolkit2.session.SessionManagerImpl. Alternative * implementations may be loaded as described in the newInstance * descriptions. */ @@ -35,7 +35,7 @@ public: /** * Create a new SessionManager instance. The implementation defaults to * SessionManagerImpl but may be overridden by setting the system - * property com.ausregistry.jtoolkit2.sessionManager.class to the full + * property mop.bizsregistry.jtoolkit2.sessionManager.class to the full * name of the alternative class. * * @param propertiesFile The location of a properties file to be used to @@ -58,7 +58,7 @@ public: /** * Create a new SessionManager instance. The implementation defaults to * SessionManagerImpl but may be overridden by setting the system - * property com.ausregistry.jtoolkit2.sessionManager.class to the full + * property mop.bizsregistry.jtoolkit2.sessionManager.class to the full * name of the alternative class. * * @param props SessionManager properties that have already been loaded. diff --git a/ACTK1_0/session/SessionManagerImpl.hpp b/ACTK1_0/session/SessionManagerImpl.hpp index e089a2d..4dca2bb 100644 --- a/ACTK1_0/session/SessionManagerImpl.hpp +++ b/ACTK1_0/session/SessionManagerImpl.hpp @@ -79,7 +79,7 @@ public: * occur during processing. Use of the underlying session is protected * against concurrent use by other threads by using the * getSession/releaseSession features of this SessionManager's {@link - * com.ausregistry.jtoolkit2.session.SessionPool}. This method guarantees + * mop.bizsregistry.jtoolkit2.session.SessionPool}. This method guarantees * that the session used will be returned to the pool before the method * returns. * diff --git a/ACTK1_0/session/SessionPool.hpp b/ACTK1_0/session/SessionPool.hpp index 3465ebd..dd7230d 100644 --- a/ACTK1_0/session/SessionPool.hpp +++ b/ACTK1_0/session/SessionPool.hpp @@ -13,7 +13,7 @@ class StatsViewer; /** * A SessionPool has responsibility for maintaining a persistent pool of EPP * sessions to a single EPP server. A pool may only grow to the size specified - * in its {@link com.ausregistry.jtoolkit2.session.SessionPoolProperties} and + * in its {@link mop.bizsregistry.jtoolkit2.session.SessionPoolProperties} and * after successful initialisation may be instructed to hold sessions open for * at least the time specified by the client timeout property. The client must * correctly specify the EPP server's timeout value in order for the diff --git a/ACTK1_0/session/SessionPoolProperties.hpp b/ACTK1_0/session/SessionPoolProperties.hpp index 8da297d..a39bbe1 100644 --- a/ACTK1_0/session/SessionPoolProperties.hpp +++ b/ACTK1_0/session/SessionPoolProperties.hpp @@ -5,8 +5,8 @@ /** * Configure the behaviour of a SessionPool. {@link - * com.ausregistry.jtoolkit2.session.Session}s in the pool are configured from - * the {@link com.ausregistry.jtoolkit2.session.SessionProperties} extended by + * mop.bizsregistry.jtoolkit2.session.Session}s in the pool are configured from + * the {@link mop.bizsregistry.jtoolkit2.session.SessionProperties} extended by * this. */ class SessionPoolProperties : public SessionProperties diff --git a/ACTK1_0/session/StatsManager.hpp b/ACTK1_0/session/StatsManager.hpp index 3968711..a7a63d5 100644 --- a/ACTK1_0/session/StatsManager.hpp +++ b/ACTK1_0/session/StatsManager.hpp @@ -14,14 +14,14 @@ public: /** * Increment the result count for the given code. This is reflected in the * return value of {@link - * com.ausregistry.jtoolkit2.session.StatsViewer#getResultCodeCount}. + * mop.bizsregistry.jtoolkit2.session.StatsViewer#getResultCodeCount}. */ virtual void incResultCounter(int resultCode) = 0; /** * Increment the command count for the given command type. This is * reflected in the return value of {@link - * com.ausregistry.jtoolkit2.session.StatsViewer#getCommandCount}. + * mop.bizsregistry.jtoolkit2.session.StatsViewer#getCommandCount}. */ virtual void incCommandCounter(const CommandType* type) = 0; }; diff --git a/AusRegCliever/server/mdAusReg.cpp b/AusRegCliever/server/mdAusReg.cpp index 53a48f5..0312e73 100644 --- a/AusRegCliever/server/mdAusReg.cpp +++ b/AusRegCliever/server/mdAusReg.cpp @@ -8,8 +8,8 @@ #include "session/StatsManager.hpp" #include "se/DomainCheckCommand.hpp" #include "se/DomainCheckResponse.hpp" -#include "se/LPE/LPCheck.hpp" -#include "se/LPE/LPCreate.hpp" +#include "se/LPE/LPChkCmdExtension.hpp" +//#include "se/LPE/LPCrtExtension.hpp" #include "se/TransferOp.hpp" #include "se/IntPostalInfo.hpp" #include "se/ContactCreateCommand.hpp" @@ -108,9 +108,9 @@ void ausRegEPPTK::doOTEB() int cmd=0; const char *thatAccount="secura2-ote", *thisAccount="secura1-ote"; - string op("newInstance"); - Transaction thisTest; - LPLaunch *lpExts; + string op("newInstance"); + const string phase("sunrise"); + Transaction thisTest; scenario(thisConfig->tkScenario,thisConfig->cfg_path); @@ -185,7 +185,9 @@ void ausRegEPPTK::doOTEB() theseLogs->logN(1,"(%d) LPE Check of unicycles.bike",cmd++); - LPCheck oteCommand_2("unicycles.bike"); + DomainCheckCommand oteCommand_2("unicycles.bike"); + LPChkCmdExtension lpe(&phase); + oteCommand_2.appendExtension(lpe); DomainCheckResponse oteResponse_2; try { @@ -287,7 +289,7 @@ void ausRegEPPTK::doOTEB() theseLogs->logN(1,"(%d) Sunrise create %s with ICANN SMD test files.",cmd++,name5); - LPCreate oteCommand_5(name5,pw,&RID, &tech, &ns, &admin, &billing); + DomainCreateCommand oteCommand_5(name5,pw,&RID, &tech, &ns, &admin, &billing); DomainCreateResponse oteResponse_5; thisTest = Transaction(&oteCommand_5, &oteResponse_5); @@ -295,7 +297,7 @@ void ausRegEPPTK::doOTEB() theseLogs->logN(1,"(%d) Create test-validate.claimsgasix (TCN).",cmd++); - LPCreate oteCommand_6("test-validate.claimsgasix",pw,&RID, &tech, &ns, &admin, &billing); + DomainCreateCommand oteCommand_6("test-validate.claimsgasix",pw,&RID, &tech, &ns, &admin, &billing); DomainCreateResponse oteResponse_6; thisTest = Transaction(&oteCommand_6, &oteResponse_6);