diff --git a/ACTK1_0/se/LPE/LPCmdExtender.cpp b/ACTK1_0/se/LPE/LPCmdExtender.cpp index 9e8063c..fcfdb2d 100644 --- a/ACTK1_0/se/LPE/LPCmdExtender.cpp +++ b/ACTK1_0/se/LPE/LPCmdExtender.cpp @@ -1,4 +1,5 @@ #include "se/Command.hpp" +#include "se/CommandType.hpp" #include "LPExtension.hpp" #include "xml/XMLHelper.hpp" #include "LPCmdExtender.hpp" @@ -15,7 +16,11 @@ void LPCmdExtender::addToCommand(const Command &command) const { XMLWriter* xmlWriter = command.getXmlWriter(); DOMElement* extensionElement = command.getExtensionElement(); - DOMElement* createElement = xmlWriter->appendChild(extensionElement, + DOMElement* createElement; + + thisCommand = command.getCommandType()->getCommandName(); + + createElement = xmlWriter->appendChild(extensionElement, "create", launchPhaseExtension().getURI()); if (createData.get() != NULL) diff --git a/ACTK1_0/se/LPE/LPCmdExtender.hpp b/ACTK1_0/se/LPE/LPCmdExtender.hpp index 9ca5038..c4a32c8 100644 --- a/ACTK1_0/se/LPE/LPCmdExtender.hpp +++ b/ACTK1_0/se/LPE/LPCmdExtender.hpp @@ -1,18 +1,22 @@ #ifndef _LPE_COMMAND_EXTENSION_HPP_ #define _LPE_COMMAND_EXTENSION_HPP_ +#include "se/Command.hpp" #include "se/CommandExtension.hpp" #include "LPLaunch.hpp" + class LPCmdExtender : public CommandExtension { public: virtual void addToCommand(const Command &command) const; void setCreateData(LPLaunch* createData); - void createXMLElement(XMLWriter* xmlWriter, DOMElement* addElement); + private: + + std::string &thisCommand; std::auto_ptr createData; }; diff --git a/AusRegCliever/server/mdAusReg.cpp b/AusRegCliever/server/mdAusReg.cpp index 91fdb77..316535d 100644 --- a/AusRegCliever/server/mdAusReg.cpp +++ b/AusRegCliever/server/mdAusReg.cpp @@ -167,7 +167,7 @@ void ausRegEPPTK::doOTEB() theseLogs->logN(1,"Continue OTE Transactions."); sleep(2); - theseLogs->logN(1,"(%d) Conventional check of yoda.guru",cmd++); + theseLogs->logN(1,"(%d) Non-LPE check of yoda.guru",cmd++); DomainCheckCommand oteCommand_1(name2); DomainCheckResponse oteResponse_1; @@ -184,7 +184,8 @@ void ausRegEPPTK::doOTEB() theseLogs->logN(1,"(%d) LPE Check of unicycles.bike",cmd++); DomainCheckCommand oteCommand_2("unicycles.bike"); - LPCmdExtender oteCX; oteCX.addToCommand(oteCommand_2); + LPCmdExtender oteCX; + oteCommand_2.appendExtension(oteCX); DomainCheckResponse oteResponse_2; @@ -297,7 +298,8 @@ void ausRegEPPTK::doOTEB() theseLogs->logN(1,"(%d) Create test-validate.claimsgasix (TCN).",cmd++); DomainCreateCommand oteCommand_6("test-validate.claimsgasix",pw,&RID, &tech, &ns, &admin, &billing); - LPCmdExtender oteC6X; oteC6X.addToCommand(oteCommand_6); + LPCmdExtender oteC6X; + oteCommand_6.appendExtension(oteC6X); DomainCreateResponse oteResponse_6; thisTest = Transaction(&oteCommand_6, &oteResponse_6);