diff --git a/ACTK1_0/Makefile b/ACTK1_0/Makefile
index 50167de..2f21454 100644
--- a/ACTK1_0/Makefile
+++ b/ACTK1_0/Makefile
@@ -13,7 +13,7 @@ CC = gcc
#PRODORDEV += -O2
PRODORDEV += -ggdb3
-CXXFLAGS = $(PRODORDEV) -Wall -Wpointer-arith -Wcast-qual -D_REENTRANT -fPIC
+CXXFLAGS = $(PRODORDEV) -Wall -Wpointer-arith -Wcast-qual -D_REENTRANT -fPIC
CPPFLAGS = -fPIC -D_GNU_SOURCE -D$(LOCATION)
CXXFLAGS += -D_GNU_SOURCE -O0 -D$(LOCATION)
@@ -51,7 +51,7 @@ BUILD_OBJ_DIR = build
###### Include Paths
-INCLUDE_DIR = -I . -I $(XERCES_INC_DIR) -I $(XALAN_INC_DIR)
+INCLUDE_DIR = -I . -I $(XERCES_INC_DIR) -I $(XALAN_INC_DIR) -I ../AusRegCliever/include -I /usr/include
build_obj_dir = $(BUILD_OBJ_DIR)
@@ -104,7 +104,7 @@ ARTKLIBS = -L$(BUILD_LIB_DIR) -lACTK1_0 \
-L$(XALAN_LIB_DIR) -lxalan-c -lxalanMsg \
-L$(XERCES_LIB_DIR) -lxerces-c \
-lssl \
- -lrt
+ -lrt -llog4cpp
$(BUILD_OBJ_DIR)/%: $(BUILD_OBJ_DIR)/%.o
$(CXX) $(ARTKLIBS) -o $@ $<
diff --git a/ACTK1_0/OTE/LPECheckCommandTest.cpp b/ACTK1_0/OTE/LPECheckCommandTest.cpp
index bd1e2a5..95c106c 100644
--- a/ACTK1_0/OTE/LPECheckCommandTest.cpp
+++ b/ACTK1_0/OTE/LPECheckCommandTest.cpp
@@ -13,14 +13,14 @@ void doWork()
init("./etc/toolkit2.conf");
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
LPECheckCommand cmd("test-andvalidate.claimsgafour");
const string xml(cmd.toXML());
ASSERT_EQ(cmd.getCommandType()->getCommandName(), "check");
ASSERT_EQ(cmd.getObjectType()->getName(), "domain");
- ASSERT_EQ(xml, "test-andvalidate.claimsgafourJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "test-andvalidate.claimsgafourJTKUTEST.20140101.010101.0");
}
}
diff --git a/ACTK1_0/OTE/OteLPECreateCommandTest.cpp b/ACTK1_0/OTE/OteLPECreateCommandTest.cpp
index 004f8a7..4da575c 100644
--- a/ACTK1_0/OTE/OteLPECreateCommandTest.cpp
+++ b/ACTK1_0/OTE/OteLPECreateCommandTest.cpp
@@ -26,7 +26,7 @@ void doWork()
* parameters.
*/
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
vector techIds;
@@ -36,7 +36,7 @@ void doWork()
eligibilityType, policyReason, registrantName);
const string xml(cmd.toXML());
ASSERT_EQ(xml,
- "jtkutest.co.aeJTKCONJTKCON2jtkUT3stAusRegistryTrade License (IT)1JTKUTEST.20070101.010101.0");
+ "jtkutest.co.aeJTKCONJTKCON2jtkUT3stAusRegistryTrade License (IT)1JTKUTEST.20140101.010101.0");
}
/**
@@ -46,7 +46,7 @@ void doWork()
*
*/
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
vector techIds;
@@ -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.20070101.010101.0");
+ ASSERT_EQ(xml, "jtkutest.co.ae48ns1.ausregistry.netns2.ausregistry.netJTKCONJTKCONJTKCON2JTKCON2jtkUT3stAusRegistry01241326211Trade License (IT)Blah12312395231JTKUTEST.20140101.010101.0");
}
}
diff --git a/ACTK1_0/common/init.cpp b/ACTK1_0/common/init.cpp
index d404c10..08c685f 100644
--- a/ACTK1_0/common/init.cpp
+++ b/ACTK1_0/common/init.cpp
@@ -18,9 +18,12 @@
#include
#include
+#define MDLOG_USER
+#include
const char *otePeer="epp.ote.donuts.co";
int tkScenario=0;
+mdLogger mdLog;
namespace {
@@ -93,5 +96,7 @@ void scenario(int scenario,const std::string& system_props_file)
{
tkScenario = scenario;
+ if (tkScenario >= ACTK_OTEB)
+ mdLog.init(false);
static const Init doInit(system_props_file);
}
diff --git a/ACTK1_0/common/init.hpp b/ACTK1_0/common/init.hpp
index 27e3e8e..c3ccfe1 100644
--- a/ACTK1_0/common/init.hpp
+++ b/ACTK1_0/common/init.hpp
@@ -3,6 +3,9 @@
#include
+char *userLogPath = "./logs/";
+int tkDebugThreshold = 9999999999;
+
void init(const std::string &system_props_file);
void scenario(int which,const std::string &system_props_file);
diff --git a/ACTK1_0/se/ContactCheckCommandTest.cpp b/ACTK1_0/se/ContactCheckCommandTest.cpp
index 4a75736..f11e1a5 100644
--- a/ACTK1_0/se/ContactCheckCommandTest.cpp
+++ b/ACTK1_0/se/ContactCheckCommandTest.cpp
@@ -10,17 +10,17 @@ void doWork()
{
init("./etc/toolkit2.conf");
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
auto_ptr cmd(new ContactCheckCommand("JTKCON"));
const string xml(cmd->toXML());
ASSERT_EQ(xml,
- "JTKCONJTKUTEST.20070101.010101.0");
+ "JTKCONJTKUTEST.20140101.010101.0");
}
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
vector ids;
ids.push_back("JTKCON1");
@@ -28,7 +28,7 @@ void doWork()
auto_ptr cmd(new ContactCheckCommand(ids));
const string xml(cmd->toXML());
ASSERT_EQ(xml,
- "JTKCON1JTKCON2JTKUTEST.20070101.010101.0");
+ "JTKCON1JTKCON2JTKUTEST.20140101.010101.0");
}
}
diff --git a/ACTK1_0/se/ContactDeleteCommandTest.cpp b/ACTK1_0/se/ContactDeleteCommandTest.cpp
index 1005386..ade206b 100644
--- a/ACTK1_0/se/ContactDeleteCommandTest.cpp
+++ b/ACTK1_0/se/ContactDeleteCommandTest.cpp
@@ -13,11 +13,11 @@ void doWork()
init("./etc/toolkit2.conf");
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
ContactDeleteCommand cmd("JTKCON");
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "JTKCONJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "JTKCONJTKUTEST.20140101.010101.0");
}
}
diff --git a/ACTK1_0/se/ContactInfoCommandTest.cpp b/ACTK1_0/se/ContactInfoCommandTest.cpp
index 9b45ba3..298d876 100644
--- a/ACTK1_0/se/ContactInfoCommandTest.cpp
+++ b/ACTK1_0/se/ContactInfoCommandTest.cpp
@@ -13,19 +13,19 @@ void doWork()
init("./etc/toolkit2.conf");
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
ContactInfoCommand cmd("C100000-AR");
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "C100000-ARJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "C100000-ARJTKUTEST.20140101.010101.0");
}
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
ContactInfoCommand cmd("C100000-AR", "jtkUT3st");
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "C100000-ARjtkUT3stJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "C100000-ARjtkUT3stJTKUTEST.20140101.010101.0");
}
}
diff --git a/ACTK1_0/se/ContactTransferRequestCommandTest.cpp b/ACTK1_0/se/ContactTransferRequestCommandTest.cpp
index 8efbddc..ba45c5d 100644
--- a/ACTK1_0/se/ContactTransferRequestCommandTest.cpp
+++ b/ACTK1_0/se/ContactTransferRequestCommandTest.cpp
@@ -14,11 +14,11 @@ void doWork()
{
init("./etc/toolkit2.conf");
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
ContactTransferRequestCommand cmd("JTKCON1", "jtkcon1pw");
- const string expected("JTKCON1jtkcon1pwJTKUTEST.20070101.010101.0");
+ const string expected("JTKCON1jtkcon1pwJTKUTEST.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 0dadfd2..15b613e 100644
--- a/ACTK1_0/se/DomainCheckCommandTest.cpp
+++ b/ACTK1_0/se/DomainCheckCommandTest.cpp
@@ -13,14 +13,14 @@ void doWork()
init("./etc/toolkit2.conf");
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
DomainCheckCommand cmd("test.com.au");
const string xml(cmd.toXML());
ASSERT_EQ(cmd.getCommandType()->getCommandName(), "check");
ASSERT_EQ(cmd.getObjectType()->getName(), "domain");
- ASSERT_EQ(xml, "test.com.auJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "test.com.auJTKUTEST.20140101.010101.0");
}
}
diff --git a/ACTK1_0/se/DomainDeleteCommandTest.cpp b/ACTK1_0/se/DomainDeleteCommandTest.cpp
index 311d2d7..a846d6a 100644
--- a/ACTK1_0/se/DomainDeleteCommandTest.cpp
+++ b/ACTK1_0/se/DomainDeleteCommandTest.cpp
@@ -13,11 +13,11 @@ void doWork()
init("./etc/toolkit2.conf");
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
DomainDeleteCommand cmd("jtkutest.com.au");
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20140101.010101.0");
}
}
diff --git a/ACTK1_0/se/DomainInfoCommandTest.cpp b/ACTK1_0/se/DomainInfoCommandTest.cpp
index 1e6c5b9..04ce325 100644
--- a/ACTK1_0/se/DomainInfoCommandTest.cpp
+++ b/ACTK1_0/se/DomainInfoCommandTest.cpp
@@ -13,11 +13,11 @@ void doWork()
init("./etc/toolkit2.conf");
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
DomainInfoCommand cmd("jtkutest.com.au");
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20140101.010101.0");
}
}
diff --git a/ACTK1_0/se/DomainKVCommandExtensionTest.cpp b/ACTK1_0/se/DomainKVCommandExtensionTest.cpp
index f18523f..ba37d55 100644
--- a/ACTK1_0/se/DomainKVCommandExtensionTest.cpp
+++ b/ACTK1_0/se/DomainKVCommandExtensionTest.cpp
@@ -18,7 +18,7 @@ const static string policyReason = "1";
void testUpdateSingleKVList()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
DomainKVCommandExtension extension(StandardCommandType::UPDATE());
@@ -30,13 +30,13 @@ void testUpdateSingleKVList()
const string xml = updateCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.ae- Trademark
- 1
- AusRegistry
JTKUTEST.20070101.010101.0"
+ "jtkutest.com.ae- Trademark
- 1
- AusRegistry
JTKUTEST.20140101.010101.0"
);
}
void testCreateSingleKVList()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
DomainKVCommandExtension extension(StandardCommandType::CREATE());
@@ -49,13 +49,13 @@ void testCreateSingleKVList()
const string xml = createCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.aeJTKCONjtkUT3st- Trademark
- 1
- AusRegistry
JTKUTEST.20070101.010101.0"
+ "jtkutest.com.aeJTKCONjtkUT3st- Trademark
- 1
- AusRegistry
JTKUTEST.20140101.010101.0"
);
}
void testMultipleKVList()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
DomainKVCommandExtension extension(StandardCommandType::CREATE());
@@ -69,7 +69,7 @@ void testMultipleKVList()
const string xml = createCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.aeJTKCONjtkUT3st- Trademark
- 1
- AusRegistry
- Trademark
- 1
- AusRegistry
JTKUTEST.20070101.010101.0"
+ "jtkutest.com.aeJTKCONjtkUT3st- Trademark
- 1
- AusRegistry
- Trademark
- 1
- AusRegistry
JTKUTEST.20140101.010101.0"
);
}
diff --git a/ACTK1_0/se/DomainRegistrantTransferCommandTest.cpp b/ACTK1_0/se/DomainRegistrantTransferCommandTest.cpp
index 3ff3343..7aa2b98 100644
--- a/ACTK1_0/se/DomainRegistrantTransferCommandTest.cpp
+++ b/ACTK1_0/se/DomainRegistrantTransferCommandTest.cpp
@@ -22,7 +22,7 @@ void addSampleKVItems(DomainRegistrantTransferCommand *command);
void testWithoutPeriod()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
auto_ptr command(
@@ -33,7 +33,7 @@ void testWithoutPeriod()
ASSERT_EQ(xml,
"jtkutest.com.ae"
+ EPPDateFormatter::toXSDate(*curExpDate)
- + "- Trademark
- 1231239523
- Blah
- Trademark
- 1
- Trade License
- 01241326211
- AusRegistry
testingJTKUTEST.20070101.010101.0"
+ + "- Trademark
- 1231239523
- Blah
- Trademark
- 1
- Trade License
- 01241326211
- AusRegistry
testingJTKUTEST.20140101.010101.0"
);
}
@@ -48,7 +48,7 @@ void testWithPeriod()
ASSERT_EQ(xml,
"jtkutest.com.ae"
+ EPPDateFormatter::toXSDate(*curExpDate)
- + "2- Trademark
- 1231239523
- Blah
- Trademark
- 1
- Trade License
- 01241326211
- AusRegistry
testingJTKUTEST.20070101.010101.0"
+ + "2- Trademark
- 1231239523
- Blah
- Trademark
- 1
- Trade License
- 01241326211
- AusRegistry
testingJTKUTEST.20140101.010101.0"
);
}
diff --git a/ACTK1_0/se/DomainTransferQueryCommandTest.cpp b/ACTK1_0/se/DomainTransferQueryCommandTest.cpp
index 4b9464b..732d73d 100644
--- a/ACTK1_0/se/DomainTransferQueryCommandTest.cpp
+++ b/ACTK1_0/se/DomainTransferQueryCommandTest.cpp
@@ -13,32 +13,32 @@ void doWork()
init("./etc/toolkit2.conf");
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
DomainTransferQueryCommand cmd("jtkutest.com.au");
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20140101.010101.0");
}
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
DomainTransferQueryCommand cmd("jtkutest.com.au", "jtkUt3st");
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "jtkutest.com.aujtkUt3stJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "jtkutest.com.aujtkUt3stJTKUTEST.20140101.010101.0");
}
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
DomainTransferQueryCommand cmd("jtkutest.com.au", "C100000-AR", "jtkUt3st");
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "jtkutest.com.aujtkUt3stJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "jtkutest.com.aujtkUt3stJTKUTEST.20140101.010101.0");
}
}
diff --git a/ACTK1_0/se/DomainUpdateCommandTest.cpp b/ACTK1_0/se/DomainUpdateCommandTest.cpp
index 9d0f117..1a21e42 100644
--- a/ACTK1_0/se/DomainUpdateCommandTest.cpp
+++ b/ACTK1_0/se/DomainUpdateCommandTest.cpp
@@ -18,18 +18,18 @@ using namespace std;
void testSimpleUpdate()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
DomainUpdateCommand cmd("jtkutest.com.au");
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20140101.010101.0");
}
void testFullUpdate()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
const char* addNsText[] = { "ns1.jtkutest.com.au", "ns2.jtkutest.com.au" };
@@ -77,12 +77,12 @@ void testFullUpdate()
DomainUpdateCommand cmd("jtkutest.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.20070101.010101.0");
+ ASSERT_EQ(xml, "jtkutest.com.auns1.jtkutest.com.auns2.jtkutest.com.auJTKCONJTKCON2JTKCON3non-paymentns3.jtkutest.com.auns4.jtkutest.com.auJTKCON2JTKCONJTKCONjtkUT3stJTKUTEST.20140101.010101.0");
}
void testSyncExpiryDateExtension(void)
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
DomainUpdateCommand cmd("jtkutest.com.au");
@@ -94,7 +94,7 @@ void testSyncExpiryDateExtension(void)
delete newExpiryDate;
ASSERT_EQ(xml,
- "jtkutest.com.au2005-04-03T22:00:00.0ZJTKUTEST.20070101.010101.0");
+ "jtkutest.com.au2005-04-03T22:00:00.0ZJTKUTEST.20140101.010101.0");
}
void testSyncExpiryDateExtensionWithNullDate(void)
diff --git a/ACTK1_0/se/HostCheckCommandTest.cpp b/ACTK1_0/se/HostCheckCommandTest.cpp
index 637a903..735d1af 100644
--- a/ACTK1_0/se/HostCheckCommandTest.cpp
+++ b/ACTK1_0/se/HostCheckCommandTest.cpp
@@ -13,22 +13,22 @@ void doWork()
init("./etc/toolkit2.conf");
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
HostCheckCommand hcc("ns1.jtkutest.com.au");
const string xml(hcc.toXML());
- ASSERT_EQ(xml, "ns1.jtkutest.com.auJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "ns1.jtkutest.com.auJTKUTEST.20140101.010101.0");
}
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
std::vector names;
names.push_back("ns1.jtkutest.com.au");
names.push_back("ns2.jtkutest.com.au");
HostCheckCommand hcc(names);
const string xml(hcc.toXML());
- ASSERT_EQ(xml, "ns1.jtkutest.com.auns2.jtkutest.com.auJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "ns1.jtkutest.com.auns2.jtkutest.com.auJTKUTEST.20140101.010101.0");
}
}
diff --git a/ACTK1_0/se/HostCreateCommandTest.cpp b/ACTK1_0/se/HostCreateCommandTest.cpp
index 26196c3..ad1dfec 100644
--- a/ACTK1_0/se/HostCreateCommandTest.cpp
+++ b/ACTK1_0/se/HostCreateCommandTest.cpp
@@ -13,16 +13,16 @@ void doWork()
init("./etc/toolkit2.conf");
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
HostCreateCommand hcc("ns1.jtkutest.com.au");
const string xml(hcc.toXML());
- ASSERT_EQ(xml, "ns1.jtkutest.com.auJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "ns1.jtkutest.com.auJTKUTEST.20140101.010101.0");
}
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
vector addrs;
addrs.push_back(InetAddress("192.168.0.1", IPVersion::IPv4()));
@@ -30,7 +30,7 @@ void doWork()
HostCreateCommand hcc("ns1.jtkutest.com.au", &addrs);
const string xml(hcc.toXML());
- ASSERT_EQ(xml, "ns1.jtkutest.com.au192.168.0.1::1JTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "ns1.jtkutest.com.au192.168.0.1::1JTKUTEST.20140101.010101.0");
}
}
diff --git a/ACTK1_0/se/HostDeleteCommandTest.cpp b/ACTK1_0/se/HostDeleteCommandTest.cpp
index 88ac3f9..e72e53c 100644
--- a/ACTK1_0/se/HostDeleteCommandTest.cpp
+++ b/ACTK1_0/se/HostDeleteCommandTest.cpp
@@ -13,10 +13,10 @@ void doWork()
init("./etc/toolkit2.conf");
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
HostDeleteCommand hcc("ns1.jtkutest.com.au");
const string xml(hcc.toXML());
- ASSERT_EQ(xml, "ns1.jtkutest.com.auJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "ns1.jtkutest.com.auJTKUTEST.20140101.010101.0");
}
}
diff --git a/ACTK1_0/se/HostInfoCommandTest.cpp b/ACTK1_0/se/HostInfoCommandTest.cpp
index 72661bb..763cda9 100644
--- a/ACTK1_0/se/HostInfoCommandTest.cpp
+++ b/ACTK1_0/se/HostInfoCommandTest.cpp
@@ -9,12 +9,12 @@ using namespace std;
void doWork()
{
init("./etc/toolkit2.conf");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
HostInfoCommand cmd("ns1.jtkutest.com.au");
const string xml = cmd.toXML();
- ASSERT_EQ("ns1.jtkutest.com.auJTKUTEST.20070101.010101.0", xml);
+ ASSERT_EQ("ns1.jtkutest.com.auJTKUTEST.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 7472bc2..f8311f4 100644
--- a/ACTK1_0/se/LoginCommandTest.cpp
+++ b/ACTK1_0/se/LoginCommandTest.cpp
@@ -21,39 +21,39 @@ void doWork()
init("./etc/toolkit2.conf");
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
LoginCommand cmd("JTKUTEST", "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.20070101.010101.0");
+ 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");
}
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
LoginCommand cmd("JTKUTEST", "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.20070101.010101.0");
+ 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");
}
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
LoginCommand cmd("JTKUTEST", "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.20070101.010101.0", xml);
+ 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);
}
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
const string newPw("n(-w18PW*");
LoginCommand cmd("JTKUTEST", "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.20070101.010101.0");
+ 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");
}
}
diff --git a/ACTK1_0/se/LogoutCommandTest.cpp b/ACTK1_0/se/LogoutCommandTest.cpp
index f57c185..b545b7a 100644
--- a/ACTK1_0/se/LogoutCommandTest.cpp
+++ b/ACTK1_0/se/LogoutCommandTest.cpp
@@ -13,12 +13,12 @@ void doWork()
init("./etc/toolkit2.conf");
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
LogoutCommand cmd;
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "JTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "JTKUTEST.20140101.010101.0");
}
}
diff --git a/ACTK1_0/se/PollAckCommandTest.cpp b/ACTK1_0/se/PollAckCommandTest.cpp
index 11fe25c..647e4b6 100644
--- a/ACTK1_0/se/PollAckCommandTest.cpp
+++ b/ACTK1_0/se/PollAckCommandTest.cpp
@@ -9,12 +9,12 @@ using namespace std;
void doWork()
{
init("./etc/toolkit2.conf");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
PollAckCommand cmd(123);
const string xml = cmd.toXML();
- ASSERT_EQ("JTKUTEST.20070101.010101.0", xml);
+ ASSERT_EQ("JTKUTEST.20140101.010101.0", xml);
}
int main(int argc, char* argv[])
diff --git a/ACTK1_0/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp b/ACTK1_0/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp
index 4d3673e..df1defb 100644
--- a/ACTK1_0/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp
+++ b/ACTK1_0/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp
@@ -13,7 +13,7 @@ using namespace std;
void testSecDNSAllFields()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
DomainCreateCommand createCommand("jtkutest.com.au", "jtkUT3st", NULL);
@@ -34,13 +34,13 @@ void testSecDNSAllFields()
const string xml = createCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.aujtkUT3st604800123453149FD46E6C4B45C55D4AC25631AQPJ////4Q==JTKUTEST.20070101.010101.0"
+ "jtkutest.com.aujtkUT3st604800123453149FD46E6C4B45C55D4AC25631AQPJ////4Q==JTKUTEST.20140101.010101.0"
);
}
void testSecDNSMultipleDSDataWithoutMaxSigLife()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
DomainCreateCommand createCommand("jtkutest.com.au", "jtkUT3st", NULL);
@@ -62,13 +62,13 @@ void testSecDNSMultipleDSDataWithoutMaxSigLife()
const string xml = createCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.aujtkUT3st123453138FD46E6C4B45C55D4AC25631AQPJ////4Q==67892249FD46E6C4B45C55D4ACJTKUTEST.20070101.010101.0"
+ "jtkutest.com.aujtkUT3st123453138FD46E6C4B45C55D4AC25631AQPJ////4Q==67892249FD46E6C4B45C55D4ACJTKUTEST.20140101.010101.0"
);
}
void testSecDNSAllFieldsMin()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
DomainCreateCommand createCommand("jtkutest.com.au", "jtkUT3st", NULL);
@@ -89,13 +89,13 @@ void testSecDNSAllFieldsMin()
const string xml = createCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.aujtkUT3st100049FD46E6C4B45C55D4AC000AQPJ////4Q==JTKUTEST.20070101.010101.0"
+ "jtkutest.com.aujtkUT3st100049FD46E6C4B45C55D4AC000AQPJ////4Q==JTKUTEST.20140101.010101.0"
);
}
void testSecDNSAllFieldsMax()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
DomainCreateCommand createCommand("jtkutest.com.au", "jtkUT3st", NULL);
@@ -116,13 +116,13 @@ void testSecDNSAllFieldsMax()
const string xml = createCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.aujtkUT3st21474836476553525525549FD46E6C4B45C55D4AC65535255255AQPJ////4Q==JTKUTEST.20070101.010101.0"
+ "jtkutest.com.aujtkUT3st21474836476553525525549FD46E6C4B45C55D4AC65535255255AQPJ////4Q==JTKUTEST.20140101.010101.0"
);
}
void testSecDNSJustKeyData()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
DomainCreateCommand createCommand("jtkutest.com.au", "jtkUT3st", NULL);
@@ -141,7 +141,7 @@ void testSecDNSJustKeyData()
const string xml = createCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.aujtkUT3st6553565535255255AQPJ////4Q==JTKUTEST.20070101.010101.0"
+ "jtkutest.com.aujtkUT3st6553565535255255AQPJ////4Q==JTKUTEST.20140101.010101.0"
);
}
diff --git a/ACTK1_0/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp b/ACTK1_0/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp
index 8873439..d372a7c 100644
--- a/ACTK1_0/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp
+++ b/ACTK1_0/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp
@@ -13,7 +13,7 @@ using namespace std;
void testSecDNSAddFieldsUrgent()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
string passwd = "jtkUT3st";
@@ -37,13 +37,13 @@ void testSecDNSAddFieldsUrgent()
const string xml = updateCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.auJTKCONjtkUT3st604800123453149FD46E6C4B45C55D4AC25631AQPJ////4Q==JTKUTEST.20070101.010101.0"
+ "jtkutest.com.auJTKCONjtkUT3st604800123453149FD46E6C4B45C55D4AC25631AQPJ////4Q==JTKUTEST.20140101.010101.0"
);
}
void testSecDNSRemoveFieldsNotUrgent()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
string passwd = "jtkUT3st";
@@ -65,13 +65,13 @@ void testSecDNSRemoveFieldsNotUrgent()
const string xml = updateCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.auJTKCONjtkUT3st6553525525549FD46E6C4B45C55D4AC65535255255AQPJ////4Q==JTKUTEST.20070101.010101.0"
+ "jtkutest.com.auJTKCONjtkUT3st6553525525549FD46E6C4B45C55D4AC65535255255AQPJ////4Q==JTKUTEST.20140101.010101.0"
);
}
void testSecDNSRemoveAll()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
string passwd = "jtkUT3st";
@@ -90,13 +90,13 @@ void testSecDNSRemoveAll()
const string xml = updateCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.auJTKCONjtkUT3sttrueJTKUTEST.20070101.010101.0"
+ "jtkutest.com.auJTKCONjtkUT3sttrueJTKUTEST.20140101.010101.0"
);
}
void testSecDNSRemoveAllAndAddDsData()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
string passwd = "jtkUT3st";
@@ -120,13 +120,13 @@ void testSecDNSRemoveAllAndAddDsData()
const string xml = updateCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.auJTKCONjtkUT3sttrue6553525525549FD46E6C4B45C55D4ACJTKUTEST.20070101.010101.0"
+ "jtkutest.com.auJTKCONjtkUT3sttrue6553525525549FD46E6C4B45C55D4ACJTKUTEST.20140101.010101.0"
);
}
void testSecDNSRemoveAllAndAddKeyData()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
string passwd = "jtkUT3st";
@@ -150,13 +150,13 @@ void testSecDNSRemoveAllAndAddKeyData()
const string xml = updateCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.auJTKCONjtkUT3sttrue65535255255AQPJ////4Q==JTKUTEST.20070101.010101.0"
+ "jtkutest.com.auJTKCONjtkUT3sttrue65535255255AQPJ////4Q==JTKUTEST.20140101.010101.0"
);
}
void testSecDNSRemoveAllAndAddKeyDataAndChangeMaxSigLife()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
string passwd = "jtkUT3st";
@@ -185,7 +185,7 @@ void testSecDNSRemoveAllAndAddKeyDataAndChangeMaxSigLife()
const string xml = updateCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.auJTKCONjtkUT3sttrue65535255255AQPJ////4Q==604800JTKUTEST.20070101.010101.0"
+ "jtkutest.com.auJTKCONjtkUT3sttrue65535255255AQPJ////4Q==604800JTKUTEST.20140101.010101.0"
);
}
diff --git a/ACTK1_0/session/ACSession.cpp b/ACTK1_0/session/ACSession.cpp
index d004728..a978657 100644
--- a/ACTK1_0/session/ACSession.cpp
+++ b/ACTK1_0/session/ACSession.cpp
@@ -23,6 +23,7 @@
#include
extern int tkScenario;
+extern mdLogger mdLog;
using namespace std;
@@ -31,6 +32,7 @@ ACSession::ACSession(SessionManagerProperties* props)
{
debugLogger = Logger::getLogger(pname + ".debug");
userLogger = Logger::getLogger(pname + ".user");
+ mdLog.logN(0,"AC Session Mgr compiled on " __DATE__ " @ " __TIME__);
configure(props);
}
@@ -40,11 +42,13 @@ ACSession::~ACSession()
void ACSession::run() {
+ mdLog.logN(0,"Begin Toolkit Scenario %d Session",tkScenario);
SessionManagerImpl::run();
}
void ACSession::shutdown() {
SessionManagerImpl::shutdown();
+ mdLog.logN(0,"End Toolkit Scenario %d Session",tkScenario);
}
diff --git a/ACTK1_0/session/ACSession.hpp b/ACTK1_0/session/ACSession.hpp
index 790b212..c062a58 100644
--- a/ACTK1_0/session/ACSession.hpp
+++ b/ACTK1_0/session/ACSession.hpp
@@ -7,7 +7,7 @@
#include
#include
-
+#include
class ACSession : public SessionManagerImpl
{
diff --git a/ACTK1_0/session/CommandCounterTest.cpp b/ACTK1_0/session/CommandCounterTest.cpp
index 83dcbe1..ed70c7f 100644
--- a/ACTK1_0/session/CommandCounterTest.cpp
+++ b/ACTK1_0/session/CommandCounterTest.cpp
@@ -9,7 +9,7 @@ using namespace std;
void testLoginCount()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CommandCounter cc(5000);
ASSERT_EQ(0, cc.getTotal());
ASSERT_EQ(0, cc.getCount(StandardCommandType::LOGIN()));
@@ -27,7 +27,7 @@ void testLoginCount()
void testMixedCommandsCount()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
// 5 second 'recent' time.
CommandCounter cc(5000);
@@ -49,7 +49,7 @@ void testMixedCommandsCount()
ASSERT_EQ(4, cc.getRecentExactTotal());
// 10 seconds later, which is greater than 5 seconds.
- Timer::setTime("20070101.010111");
+ Timer::setTime("20140101.010111");
ASSERT_EQ(4, cc.getTotal());
ASSERT_EQ(4, cc.getRecentTotal());
@@ -62,7 +62,7 @@ void testMixedCommandsCount()
void testPollCount()
{
Timer::setTime("");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
// 5 second recent window.
CommandCounter cc(5000);
@@ -73,16 +73,16 @@ void testPollCount()
ASSERT_EQ(1, cc.getRecentCount(StandardCommandType::POLL()));
// advance to 3sec
- Timer::setTime("20070101.010103");
+ Timer::setTime("20140101.010103");
cc.increment(StandardCommandType::POLL());
ASSERT_EQ(2, cc.getRecentCount(StandardCommandType::POLL()));
// advance to 8sec, (1sec event gone)
- Timer::setTime("20070101.010108");
+ Timer::setTime("20140101.010108");
ASSERT_EQ(1, cc.getRecentCount(StandardCommandType::POLL()));
// advance to 17sec (7 second event gone).
- Timer::setTime("20070101.010117");
+ Timer::setTime("20140101.010117");
ASSERT_EQ(0, cc.getRecentCount(StandardCommandType::POLL()));
}
diff --git a/ACTK1_0/session/SessionManagerFactory.hpp b/ACTK1_0/session/SessionManagerFactory.hpp
index 85e7c19..65f0e54 100644
--- a/ACTK1_0/session/SessionManagerFactory.hpp
+++ b/ACTK1_0/session/SessionManagerFactory.hpp
@@ -12,9 +12,9 @@
enum acTKScenario {
ACTK_ALONE = 0,
ACTK_INSECURE,
- ACTK_OTEA,
- ACTK_OTEB,
- ACTK_OTEC,
+ ACTK_OTEA, // Connectivity
+ ACTK_OTEB, // Basic Access
+ ACTK_OTEC, // Full Access
ACTK_PROD,
N_ACTK_SCENARIOS
};
diff --git a/ACTK1_0/session/SessionManagerTest.cpp b/ACTK1_0/session/SessionManagerTest.cpp
index 7b9bfe4..3bba23d 100644
--- a/ACTK1_0/session/SessionManagerTest.cpp
+++ b/ACTK1_0/session/SessionManagerTest.cpp
@@ -71,7 +71,7 @@ void doWork()
}
try {
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
op = "newInstance";
auto_ptr manager(SessionManagerFactory::newInstance(&props));
op = "startup";
diff --git a/ACTK1_0/session/TimerTest.cpp b/ACTK1_0/session/TimerTest.cpp
index 9fc1d8a..d48c57d 100644
--- a/ACTK1_0/session/TimerTest.cpp
+++ b/ACTK1_0/session/TimerTest.cpp
@@ -9,8 +9,8 @@ using namespace std;
int main(int argc, char* argv[])
{
const std::string bad_time = "123";
- const std::string good_time = "20070101.010101";
- const std::string good_time_string = "Mon Jan 1 01:01:01 2007\n";
+ const std::string good_time = "20140101.010101";
+ const std::string good_time_string = "Mon Jan 1 01:01:01 2014\n";
std::string timeString;
time_t time;
diff --git a/APIG/client/ausreg-cd.cpp b/APIG/client/ausreg-cd.cpp
index 00cd086..5e0a659 100644
--- a/APIG/client/ausreg-cd.cpp
+++ b/APIG/client/ausreg-cd.cpp
@@ -7,8 +7,7 @@
#include
bool cdHasTk;
- char cdOrTkValue;
-const char *cdOrTk=&cdOrTkValue;
+const char *cdOrTk=NULL;
using namespace std;
@@ -121,13 +120,14 @@ void acClientServer() { // AKA "Cliever"
}
int main(int const argc, const char ** const argv)
{
+ bool noParms=false;
const char *exeName,*banner = "\n" CD_NAME " " CD_VERSION " compiled on " __DATE__ " @ " __TIME__ " (%d)\n";
- int mthParm, rc = OK;
+ int mthParm=2, rc = OK;
thisCliever = NULL;
- cdHasTk = strstr(argv[0],"loadtk") ? true : false;
- cdOrTkValue = cdHasTk ? 'd' : 'D'; // d == EPP Toolkit enabled, D = !d
+ cdOrTk = argv[0];
+ cdHasTk = strstr(cdOrTk,"ausreg-cd") ? true : false;
shm.truncate(CD_GLOBAL_SIZE);
mapped_region acCDglobal(shm, read_write);
@@ -141,17 +141,27 @@ int main(int const argc, const char ** const argv)
thisConfig->shellProcess = getpid();
strcpy(thisConfig->origCmd,argv[0]);
- if (argc < 2 || argc > 7) usage();
+ if (argc < 1 || argc > 7) usage();
+
+ if (argc == 1 || *argv[1] == '?')
+ { noParms = true;
+ thisConfig->telemetryPort = 5000;
+ mthParm=1;
+ }
+ else thisConfig->telemetryPort = atoi(argv[1]);
- thisConfig->telemetryPort = atoi(argv[1]);
if (thisConfig->telemetryPort < 1000 || thisConfig->telemetryPort > 65535)
{
std::cerr << "The value is invalid.\n";
exit(1);
}
- thisConfig->telemetryPortStr = std::string(argv[1]);
- for (mthParm=2;mthParm < argc;mthParm++) {
- if (*argv[mthParm] == '*') {
+ if (argc > 1) thisConfig->telemetryPortStr = std::string(argv[1]);
+ for (;mthParm < argc;mthParm++) {
+ if (*argv[mthParm] == '?') {
+ usage();
+ }
+ else
+ if (*argv[mthParm] == '*') {
thisConfig->runCommander = false;
}
else
@@ -234,8 +244,8 @@ void signal_handler(int sig)
}
void usage() {
- std::cerr << "Usage: " << cdOrTk<< " ['*'] [device=TEST] [mdIP=" MD_DEFAULT_IP "] [logs=\\tmp]\n\n where \n\n"
- "\t is required, must be the first parameter, and must be 1000 or greater. \n"
+ std::cerr << "Usage: " << cdOrTk << " ['*'] [device=TEST] [mdIP=" MD_DEFAULT_IP "] [logs=\\tmp]\n\n where \n\n"
+ "\t defaults to 5000, must be the first parameter, and must be 1000 or greater. \n"
"\t The other parameters are optional and non-positional and take the shown defaults. \n"
"\t '*', if present, indicates skip the command loop (string quotes may be required). \n\n";
exit(1);
diff --git a/APIG/client/commander.cpp b/APIG/client/commander.cpp
index 9292860..93ca547 100644
--- a/APIG/client/commander.cpp
+++ b/APIG/client/commander.cpp
@@ -106,6 +106,10 @@ void mdCommander::driver() {
memset(argsNow,0,sizeof(argsNow));
initscr();
cbreak();
+ getmaxyx(stdscr,row,col);
+ if (row < 30 || col < 80) {
+ std::cerr << "Terminal too small for AC commander.";
+ }
greet();
while(acceptingInput) {
refresh();
@@ -222,12 +226,18 @@ void mdCommander::driver() {
}
if (strlen(rawString) >= 3 && strlen(rawString) <= 5 )
- {if (!strcmp(rawString,"log")) {
+ {if (!strcmp(rawString,"loG")) {
sprintf(wwork,"cut -b 1-%d /tmp/ausreg-cd.log | less",col);
system(wwork);
clear();
continue;
}
+ if (!strcmp(rawString,"log")) {
+ sprintf(wwork,"cut -b 1-%d /tmp/ausreg-cd-ui.log | less",col);
+ system(wwork);
+ clear();
+ continue;
+ }
if (!strcmp(rawString,"mlog")) {
sprintf(wwork,"cut -b 1-%d /tmp/drde-cliever.log | less",col);
system(wwork);
@@ -243,6 +253,10 @@ void mdCommander::driver() {
system(work);
shm.remove("ausreg-cd-global");
sprintf(work,"rm /tmp/ausreg-cd.lock");
+ shm.remove("ausreg-cd-global");
+ sprintf(work,"rm /tmp/ausreg-cd-ui.log");
+ system(work);
+ sprintf(work,"rm /tmp/ausreg-cd.log");
system(work);
goto done;
}
@@ -266,7 +280,6 @@ void mdCommander::greet() {
*prompt="Enter ? or command";
sprintf(theBanner,banner,thisConfig->shellProcess,thisConfig->daemonProcess);
- getmaxyx(stdscr,row,col);
mvprintw(0,(col-strlen(banner))/2,"%s",theBanner);
mvprintw(row/2,(col-strlen(title))/2,"%s",title);
mvprintw((row/2)+2,(col-strlen(warn))/2,"%s",warn);
@@ -291,12 +304,14 @@ void mdCommander::help() {
mvprintw(13,10," W - write to the AC watched folder");
mvprintw(14,10," X - discard ");
mvprintw(15,10," - make the target device");
- mvprintw(16,10," log - display this cliever's log");
- mvprintw(17,10," mlog - display the master daemon log");
- mvprintw(18,10," done - terminate commander but not process");
- mvprintw(19,10," q/quit - terminate this process and its' children");
- mvprintw(23,5," is an integer, above active everywhere outside data entry (>>)");
- mvprintw(24,5,"no space before , X0/W0 to delete/write all commands.");
+ mvprintw(16,10," loG - display this cd UI log");
+ mvprintw(17,10," log - display this cd daemon log*");
+ mvprintw(18,10," mlog - display the master daemon log");
+ mvprintw(19,10," done - terminate commander but not process");
+ mvprintw(20,10," q/quit - end process tree, delete log files");
+ mvprintw(22,5," is an integer, above active everywhere outside data entry (>>)");
+ mvprintw(23,5,"no space before , X0/W0 to delete/write all commands.");
+ mvprintw(24,5,"*will be inaccessible if another user running cd on this computer.");
mvprintw(row-2,1,"%s",prompt);
refresh();
@@ -317,10 +332,20 @@ void mdCommander::eppMainMenu() {
mvprintw(15,10," U - update");
mvprintw(16,10," D - delete");
mvprintw(17,10," T - transfer");
- mvprintw(18,10," D - delete");
mvprintw(19,10,"Meta");
- mvprintw(20,10," x - load XML for 1 above from ./xml ");
- mvprintw(21,10," A - load all named above from ./xml ");
+ mvprintw(20,10," x - load XSD for 1 above");
+ mvprintw(21,10," A - load all above");
+ mvprintw(22,10," v - vi/xmledit the schema ");
+ mvprintw(23,10," w - write blank XML form for 1 above");
+ mvprintw(24,10," W - write blank forms for all");
+
+ mvprintw(8,50, "Commands are defined");
+ mvprintw(9,50, "by the xsd in ./resources.");
+ mvprintw(11,50,"These reflect what's in");
+ mvprintw(12,50,"the SourceForge 2007 ");
+ mvprintw(13,50,"toolkit and AC now.");
+ mvprintw(15,50,"If no XSD loaded you'll see");
+ mvprintw(16,50,"stubs in the internal editor.");
say((char *)"Action letter or ? to exit");
}
diff --git a/AusRegCliever/include/ausRegTK.h b/AusRegCliever/include/ausRegTK.h
index fd15ccc..be4f712 100644
--- a/AusRegCliever/include/ausRegTK.h
+++ b/AusRegCliever/include/ausRegTK.h
@@ -27,11 +27,13 @@ class ausRegEPPTK {
// See the Toolkit Overview. At tkScenario zeo supposedly it can do everything.
- ausRegEPPTK() { // tkScenario = ACTK_OTEB; moved to config
+ ausRegEPPTK() { tkScenario=thisConfig->tkScenario; // Maybe R-R pair specific later
daysRunning = 0;
}
bool doNothing(const std::string propertiesFilePath);
void doOTEA();
void doOTEB();
+ void doOTEC();
+ void doOTEP();
};
diff --git a/AusRegCliever/include/cliever-md.h b/AusRegCliever/include/cliever-md.h
index 14138d7..3fb4e9b 100644
--- a/AusRegCliever/include/cliever-md.h
+++ b/AusRegCliever/include/cliever-md.h
@@ -38,10 +38,6 @@ namespace fsm = boost::statechart;
#include "mdState.h"
#include "mdHost.h"
-#if ARTKENABLED > 0
-#include "ausRegTK.h"
-#endif
-
#define MD_HAUSHALT 2000 // milliseconds between attention routine
#define MD_LOCK_FILE "cliever-md.lock"
@@ -64,4 +60,8 @@ namespace fsm = boost::statechart;
#endif
+#if ARTKENABLED > 0
+#include "ausRegTK.h"
+#endif
+
diff --git a/AusRegCliever/include/masterDaemon.h b/AusRegCliever/include/masterDaemon.h
index 2264443..8dbe984 100644
--- a/AusRegCliever/include/masterDaemon.h
+++ b/AusRegCliever/include/masterDaemon.h
@@ -43,7 +43,7 @@ public:
received,
sentCommands;
-#if ARTKENABLED > 0
+#if (ARTKENABLED > 0)
ausRegEPPTK *artk;
#endif
masterDaemonConfig *cfg;
diff --git a/AusRegCliever/include/mdHost.h b/AusRegCliever/include/mdHost.h
index fae6545..6901a31 100644
--- a/AusRegCliever/include/mdHost.h
+++ b/AusRegCliever/include/mdHost.h
@@ -22,7 +22,7 @@ public:
handle,mdStdDevIdx;
md_device type;
mdState state;
-
+ std::string vendor;
udp::endpoint ip;
// Superset of the RFC speced
@@ -35,7 +35,7 @@ public:
mdHost(md_device t) : type(t) {clieverGroup = handle = mdStdDevIdx = -1;}
T* registeR(md_device t);
-
+ void registrY(T* device,std::string operatorName);
void registerCmd(const char *cmdName,const mdIncoming &mdI);
};
@@ -65,7 +65,14 @@ public:
mdPeer() : mdHost( MDDEV_PEER )
{
- cmds["RST"] = new mdCommand((md_mand)0,std::string("RST"));
+ cmds["check"] = new mdCommand((md_mand)0,std::string("CHK"));
+ cmds["info"] = new mdCommand((md_mand)0,std::string("INF"));
+ cmds["poll"] = new mdCommand((md_mand)0,std::string("POL"));
+ cmds["transfer query"] = new mdCommand((md_mand)0,std::string("TQY"));
+ cmds["create"] = new mdCommand((md_mand)0,std::string("REG"));
+ cmds["renew"] = new mdCommand((md_mand)0,std::string("REN"));
+ cmds["poll"] = new mdCommand((md_mand)0,std::string("POL"));
+ cmds["transfer query"] = new mdCommand((md_mand)0,std::string("TQY"));
}
mdPeer *validateClient(int handle, const mdClientBirth &c, mdResponse &r);
void registerCmd(const char *cmdName,const mdIncoming &mdI);
diff --git a/AusRegCliever/include/mdLogger.h b/AusRegCliever/include/mdLogger.h
index 9453c59..2608f14 100644
--- a/AusRegCliever/include/mdLogger.h
+++ b/AusRegCliever/include/mdLogger.h
@@ -8,15 +8,28 @@
#include "log4cpp/BasicLayout.hh"
#include "log4cpp/Priority.hh"
+#ifndef KEEPINSYNCWMD
+#define KEEPINSYNCWMD
+enum acTKScenario {
+ ACTK_ALONE = 0,
+ ACTK_INSECURE,
+ ACTK_OTEA,
+ ACTK_OTEB,
+ ACTK_OTEC,
+ ACTK_PROD,
+ N_ACTK_SCENARIOS
+};
+#endif
+
using namespace log4cpp;
class mdLogger {
public:
char *logPath;
- mdLogger() {};
+ mdLogger() {};
- void init();
+ void init(bool isMain);
void logN(int n, const char *format, ...);
// log iff m positive and >= config.debugThreshold,
// set in powers of 10
diff --git a/AusRegCliever/server/masterDaemon.cpp b/AusRegCliever/server/masterDaemon.cpp
index 288799c..c061b20 100644
--- a/AusRegCliever/server/masterDaemon.cpp
+++ b/AusRegCliever/server/masterDaemon.cpp
@@ -224,7 +224,7 @@ void masterDaemon::processEvent( const mdAPIFrame &thisFrame )
assert(EventSender::isSending());
}
void oteA() {
-#if ARTKENABLED > 0
+#if (ARTKENABLED > 0)
int nthDay;
for (nthDay=0;nthDay<30;nthDay++) {
@@ -236,27 +236,49 @@ void oteA() {
}
#endif
}void oteB() {
-#if ARTKENABLED > 0
+#if (ARTKENABLED > 0)
+
+ theseLogs->logNdebug(MAX_DEBUG,0,"OTE Basic Access BOJ");
+ thisService->artk->doOTEB();
+ theseLogs->logNdebug(MAX_DEBUG,0,"OTE Basic Access end of Batch");
+
+#endif
+}
+void oteC() {
+#if (ARTKENABLED > 0)
+ int nthDay;
+
+ theseLogs->logNdebug(MAX_DEBUG,0,"OTE Full Access BOJ");
+ thisService->artk->doOTEB();
+ theseLogs->logNdebug(MAX_DEBUG,0,"OTE Full Access end of Batch");
+
+#endif
+}
+void oteP() {
+#if (ARTKENABLED > 0)
int nthDay;
for (nthDay=0;nthDay<30;nthDay++) {
- theseLogs->logNdebug(MAX_DEBUG,1,"PreProd / OTEB day %d",nthDay);
- thisService->artk->doOTEB();
- theseLogs->logNdebug(MAX_DEBUG,1,"Preprod/ OTEB day %d",nthDay);
+ theseLogs->logNdebug(MAX_DEBUG,1,"AC Production SoD %d",nthDay);
+ thisService->artk->doOTEP();
+ theseLogs->logNdebug(MAX_DEBUG,1,"AC Production EoD %d",nthDay);
thisService->artk->daysRunning = nthDay;
}
#endif
- }
+}
void masterDaemon::run() {
deviceFactory = new mdHostFabrik();
fg = new mdDGChannel( thisService->io_, 0 );
-#if ARTKENABLED > 0
+#if (ARTKENABLED > 0)
if (initAusRegTK()) return;
+ theseLogs->logNdebug(MAX_DEBUG,1,"Aus Registry Toolkit Scenario %d.",
+ thisConfig->tkScenario);
+
if (artk->tkScenario == ACTK_OTEA) {
boost::thread oteArun(oteA);
assert(oteArun.joinable());
@@ -267,13 +289,25 @@ void masterDaemon::run() {
boost::thread oteBrun(oteB);
assert(oteBrun.joinable());
oteBrun.join();
- theseLogs->logNdebug(MAX_DEBUG,0,"Pre-production Ops / OTEB EOJ.");
+ theseLogs->logNdebug(MAX_DEBUG,0,"OTE Basic Access Test EOJ.");
+ }
+ if (artk->tkScenario == ACTK_OTEC) {
+ boost::thread oteCrun(oteC);
+ assert(oteCrun.joinable());
+ oteCrun.join();
+ theseLogs->logNdebug(MAX_DEBUG,0,"OTE Full Access EOJ.");
+ }
+ if (artk->tkScenario == ACTK_PROD) {
+ boost::thread otePrun(oteC);
+ assert(otePrun.joinable());
+ otePrun.join();
+ theseLogs->logNdebug(MAX_DEBUG,0,"AC Production EOJ.");
}
#endif
listen();
boost::thread work(mdWQ);
assert(work.joinable());
- theseLogs->logNdebug(MAX_DEBUG,0,"Master Daemon worker started, foreground async i/o service joins MD worker.");
+ theseLogs->logNdebug(MAX_DEBUG,0,"Batches done, MD worker start, joins worker.");
io_.run();
work.join();
}
diff --git a/AusRegCliever/server/masterDaemonConfig.cpp b/AusRegCliever/server/masterDaemonConfig.cpp
index 100232b..d632d15 100644
--- a/AusRegCliever/server/masterDaemonConfig.cpp
+++ b/AusRegCliever/server/masterDaemonConfig.cpp
@@ -7,7 +7,7 @@ masterDaemonConfig::masterDaemonConfig() {
tkScenario = ACTK_PROD;
nClievers = 0;
- configPath = "./";
+ configPath = "./etc/toolkit2.conf";
logPath = "/tmp";
daemonized = true;
// used in the logNdebug by increasing power of 10.
diff --git a/AusRegCliever/server/mdAusReg.cpp b/AusRegCliever/server/mdAusReg.cpp
index 23ae09d..b292bc8 100644
--- a/AusRegCliever/server/mdAusReg.cpp
+++ b/AusRegCliever/server/mdAusReg.cpp
@@ -5,6 +5,16 @@
#include "common/SystemProperties.hpp"
#include "session/Session.hpp"
#include "session/StatsManager.hpp"
+#include "se/DomainCheckCommand.hpp"
+#include "se/DomainCheckResponse.hpp"
+#include "OTE/LPECheckCommand.hpp"
+#include "OTE/LPECheckResponse.hpp"
+#include "se/DomainCreateCommand.hpp"
+#include "se/DomainCreateResponse.hpp"
+#include "se/DomainRegistrantTransferCommand.hpp"
+#include "se/DomainRegistrantTransferResponse.hpp"
+#include "OTE/LPECreateCommand.hpp"
+#include "OTE/LPECreateResponse.hpp"
using namespace std;
@@ -37,7 +47,7 @@ void ausRegEPPTK::doOTEA()
scenario(tkScenario,thisConfig->cfg_path);
try {
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
auto_ptr manager(SessionManagerFactory::newInstance(&props));
auto_ptr sess(SessionFactory::newInstance(&props));
op = "startup";
@@ -74,14 +84,13 @@ void ausRegEPPTK::doOTEA()
}
void ausRegEPPTK::doOTEB()
{
- int cmd=0;
+ int cmd=0,thisAccount=0;
string op("newInstance");
- if (!daysRunning)
- scenario(tkScenario,thisConfig->cfg_path);
+ scenario(tkScenario,thisConfig->cfg_path);
try {
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
auto_ptr manager(SessionManagerFactory::newInstance(&props));
auto_ptr sess(SessionFactory::newInstance(&props));
op = "startup";
@@ -91,17 +100,52 @@ void ausRegEPPTK::doOTEB()
sess->open();
- theseLogs->logN(1,"OTE Basic Access Tests.");
- theseLogs->logN(1,"OTE Basic Access Tests (%d).",cmd++);
+ theseLogs->logN(1,"OTE Basic Access [Hello] (%d).",cmd++);
sess->writeXML(TEST_SE);
sess->read();
theseLogs->logN(1,"Begin Actual Tests.");
sleep(2);
theseLogs->logN(1,"(%d) Conventional check of thoughtcrime.biz",cmd++);
+
+ DomainCheckCommand baCommand_1("thoughtcrime.biz");
+ DomainCheckResponse baResponse_1;
+
theseLogs->logN(1,"(%d) LPE Check of test-validate.claimsgasix",cmd++);
- theseLogs->logN(1,"(%d) Register .ote using OTE Account %d.",cmd++);
- theseLogs->logN(1,"(%d) Transfer .ote to OTE Account %d.",cmd++);
+
+ LPECheckCommand baCommand_2("test-validate.claimsgasix");
+ LPECheckResponse baResponse_2;
+
+ theseLogs->logN(2,"(%d) Register .ote using OTE Account %d.",cmd++,
+ thisAccount++);
+
+ const std::string pw("password");
+ const std::string RID("registrantID");
+
+ DomainCreateCommand baCommand_3("secura1.ote",pw,&RID);
+ DomainCreateResponse baResponse_3;
+
+
+ theseLogs->logN(2,"(%d) Transfer .ote to OTE Account %d.",cmd++,
+ thisAccount++);
+
+ const XMLGregorianCalendar curExpDate;
+ const std::string kvListName;
+ const std::string explanation;
+
+ DomainRegistrantTransferCommand
+ baCommand_4("secura1.ote",curExpDate,kvListName,explanation);
+ DomainRegistrantTransferResponse baResponse_4;
+
theseLogs->logN(1,"(%d) Sunrise create with ICANN SMD test files.",cmd++);
+
+ LPECreateCommand baCommand_5("test-validate.claimsgasix",pw,&RID);
+ LPECreateResponse baResponse_5;
+
+ theseLogs->logN(1,"(%d) Attempt create subject to claims.",cmd++);
+
+ LPECreateCommand baCommand_6("test-validate.claimsgasix",pw,&RID);
+ LPECreateResponse baResponse_6;
+
theseLogs->logN(1,"End OTE Basic Access Tests.",cmd++);
sess->close();
@@ -111,12 +155,57 @@ void ausRegEPPTK::doOTEB()
catch (EPPException& e)
{ const char *eMsg = e.getMessage().c_str();
const char *opNow = op.c_str();
- theseLogs->logN(2,"EPP Exception during OTE A (%s): %s .",opNow,eMsg);
+ theseLogs->logN(2,"EPP Exception during OTE B (%s): %s .",opNow,eMsg);
throw e;
}
catch (...)
{
- theseLogs->logN(2,"General Exception during OTE A (%s).",op.c_str());
+ theseLogs->logN(2,"General Exception during OTE B (%s).",op.c_str());
}
}
+
+void ausRegEPPTK::doOTEP()
+{
+ int hours,hoops;
+ string op("newInstance");
+
+ scenario(thisConfig->tkScenario,thisConfig->cfg_path);
+
+ try {
+ Timer::setTime("20140101.010101");
+ auto_ptr manager(SessionManagerFactory::newInstance(&props));
+ auto_ptr sess(SessionFactory::newInstance(&props));
+ op = "startup";
+ manager->startup();
+ op = "run (keep-alive)";
+ manager->run();
+ sess->open();
+
+ for (hours=0;hours < 24;hours++) {
+ // Spawn the keep alive thread.
+ theseLogs->logN(1,"AC Production Hour %d.",hours);
+
+ // if thisEPPServer(mdStdDevIdx).vendor == "Donuts"
+ for (hoops=0;hoops<7;hoops++) {
+ sess->writeXML(TEST_SE);
+ sess->read();
+ sleep(857);
+ }
+
+ }
+ sess->close();
+ manager->shutdown();
+
+ }
+ catch (EPPException& e)
+ { const char *eMsg = e.getMessage().c_str();
+ const char *opNow = op.c_str();
+ theseLogs->logN(2,"EPP Exception in Production (%s): %s .",opNow,eMsg);
+ throw e;
+ }
+ catch (...)
+ {
+ theseLogs->logN(2,"General Exception Production (%s).",op.c_str());
+ }
+}
diff --git a/AusRegCliever/server/mdHost.cpp b/AusRegCliever/server/mdHost.cpp
index c38f971..25635b0 100644
--- a/AusRegCliever/server/mdHost.cpp
+++ b/AusRegCliever/server/mdHost.cpp
@@ -45,9 +45,9 @@ template T* mdHost::registeR(md_device t) {
thisConfig->allClients[h] = value; // validateClient has already added to group
return value ;
-}/*
+}
template
- void mdHost::lxi_control(T *device, std::string fullText) {
+ void mdHost::registrY(T *device, std::string fullText) {
T *target = device;
char *ip,*port,*command,*timeout,*argv[5];
@@ -62,14 +62,14 @@ template
sprintf(timeout,"--timeout %s",target->timeout.c_str());
sprintf(command,"--scpi %s",fullText.c_str());
- lxi_control(5,argv);
+ vendor = fullText;
free(ip);
free(port);
free(timeout);
free(command);
-}*/
+}
mdClientServer* mdClientServer::validateClient(int handle, mdResponse &r) {
bool isNew=true;
@@ -136,7 +136,7 @@ mdPeer* mdPeer::validateClient(int handle, const mdClientBirth &c, mdResponse &r
}
std::string mdHostFabrik::newFromAPI(md_device type,std::string thisSpecialOne) {
-
+// stub for XMLRPC/APIG dynamic API
}
void mdHostFabrik::newFromHeartbeat(const mdClientBirth &thisOne) {
diff --git a/AusRegCliever/server/mdLogger.cpp b/AusRegCliever/server/mdLogger.cpp
index f4fc56a..132682c 100644
--- a/AusRegCliever/server/mdLogger.cpp
+++ b/AusRegCliever/server/mdLogger.cpp
@@ -1,5 +1,11 @@
+#ifndef MDLOG_USER
#include "cliever-md.h"
+#else
+// External user set log base path with this someplace
+ extern char * userLogPath;
+
+#endif
#include "log4cpp/Category.hh"
#include "log4cpp/Appender.hh"
#include "log4cpp/FileAppender.hh"
@@ -18,21 +24,25 @@ using namespace log4cpp;
PatternLayout *layout;
char *logPath,*mainLogFileName,xmlrpcLogFileName;
-void mdLogger::init() {
+void mdLogger::init(bool isMain) {
const char *mainLogFileName = "drde-cliever.log",
*actkLogFileName = "actk1_3_2.log";
- logPath = new char [strlen(thisConfig->logPath) +
- strlen(actkLogFileName) + 2];
- strcpy(logPath,thisConfig->logPath);
+#ifdef MDLOG_USER
+ logPath = new char [strlen(userLogPath) +
+ strlen(actkLogFileName) + 2];
+
+ strcpy(logPath,userLogPath);
strcat(logPath,"/");
strcat(logPath,actkLogFileName);
+#if (MDLOG_USER == 1)
thisConfig->xmlrpcLogpath = logPath;
-
- logPath = new char [strlen(thisConfig->logPath) +
+#endif
+#else
+ logPath = new char [strlen(thisConfig->logPath) +
strlen(mainLogFileName) + 1];
strcpy(logPath,thisConfig->logPath);
@@ -41,7 +51,8 @@ void mdLogger::init() {
thisConfig->logPath = logPath;
- app = new FileAppender("default", std::string(logPath));
+#endif
+ app = new FileAppender("default", logPath);
layout = new PatternLayout();
layout->setConversionPattern("%d %p %c %x: %m%n");
app->setLayout(layout);
diff --git a/AusRegEPPTK/se/AeDomainCreateCommandTest.cpp b/AusRegEPPTK/se/AeDomainCreateCommandTest.cpp
index 5cbf47a..39a0fd2 100644
--- a/AusRegEPPTK/se/AeDomainCreateCommandTest.cpp
+++ b/AusRegEPPTK/se/AeDomainCreateCommandTest.cpp
@@ -26,7 +26,7 @@ void doWork()
* parameters.
*/
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
vector techIds;
@@ -36,7 +36,7 @@ void doWork()
eligibilityType, policyReason, registrantName);
const string xml(cmd.toXML());
ASSERT_EQ(xml,
- "jtkutest.co.aeJTKCONJTKCON2jtkUT3stAusRegistryTrade License (IT)1JTKUTEST.20070101.010101.0");
+ "jtkutest.co.aeJTKCONJTKCON2jtkUT3stAusRegistryTrade License (IT)1JTKUTEST.20140101.010101.0");
}
/**
@@ -46,7 +46,7 @@ void doWork()
*
*/
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
vector techIds;
@@ -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.20070101.010101.0");
+ ASSERT_EQ(xml, "jtkutest.co.ae48ns1.ausregistry.netns2.ausregistry.netJTKCONJTKCONJTKCON2JTKCON2jtkUT3stAusRegistry01241326211Trade License (IT)Blah12312395231JTKUTEST.20140101.010101.0");
}
}
diff --git a/AusRegEPPTK/se/ArDomainPolicyDeleteCommandTest.cpp b/AusRegEPPTK/se/ArDomainPolicyDeleteCommandTest.cpp
index b886c26..da85479 100644
--- a/AusRegEPPTK/se/ArDomainPolicyDeleteCommandTest.cpp
+++ b/AusRegEPPTK/se/ArDomainPolicyDeleteCommandTest.cpp
@@ -12,12 +12,12 @@ void doWork()
{
init("./etc/toolkit2.conf");
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
ArDomainPolicyDeleteCommand cmd("jtkutest.com.au", "jtkutest");
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "jtkutest.com.aujtkutestJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "jtkutest.com.aujtkutestJTKUTEST.20140101.010101.0");
}
}
diff --git a/AusRegEPPTK/se/ArDomainPolicyUndeleteCommandTest.cpp b/AusRegEPPTK/se/ArDomainPolicyUndeleteCommandTest.cpp
index f914738..b2b36c2 100644
--- a/AusRegEPPTK/se/ArDomainPolicyUndeleteCommandTest.cpp
+++ b/AusRegEPPTK/se/ArDomainPolicyUndeleteCommandTest.cpp
@@ -12,12 +12,12 @@ void doWork()
{
init("./etc/toolkit2.conf");
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
ArDomainPolicyUndeleteCommand cmd("jtkutest.com.au");
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20140101.010101.0");
}
}
diff --git a/AusRegEPPTK/se/ArDomainUndeleteCommandTest.cpp b/AusRegEPPTK/se/ArDomainUndeleteCommandTest.cpp
index 1979e03..137fd41 100644
--- a/AusRegEPPTK/se/ArDomainUndeleteCommandTest.cpp
+++ b/AusRegEPPTK/se/ArDomainUndeleteCommandTest.cpp
@@ -13,11 +13,11 @@ void doWork()
{
init("./etc/toolkit2.conf");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
ArDomainUndeleteCommand cmd("jtkutest.com.au");
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20140101.010101.0");
}
int main(int argc, char* argv[])
diff --git a/AusRegEPPTK/se/ArDomainUnrenewCommandTest.cpp b/AusRegEPPTK/se/ArDomainUnrenewCommandTest.cpp
index 5d2bc68..846af3b 100644
--- a/AusRegEPPTK/se/ArDomainUnrenewCommandTest.cpp
+++ b/AusRegEPPTK/se/ArDomainUnrenewCommandTest.cpp
@@ -13,13 +13,13 @@ void doWork()
{
init("./etc/toolkit2.conf");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
ArDomainUnrenewCommand cmd(
"jtkutest.com.au", *EPPDateFormatter::fromXSDateTime("2014-01-01T00:00:00.0Z"));
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "jtkutest.com.au2014-01-01JTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "jtkutest.com.au2014-01-01JTKUTEST.20140101.010101.0");
}
int main(int argc, char* argv[])
diff --git a/AusRegEPPTK/se/AuDomainCreateCommandTest.cpp b/AusRegEPPTK/se/AuDomainCreateCommandTest.cpp
index 9f77061..5fe0b4e 100644
--- a/AusRegEPPTK/se/AuDomainCreateCommandTest.cpp
+++ b/AusRegEPPTK/se/AuDomainCreateCommandTest.cpp
@@ -26,7 +26,7 @@ void doWork()
* parameters.
*/
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
vector techIds;
@@ -36,7 +36,7 @@ void doWork()
eligibilityType, policyReason, registrantName);
const string xml(cmd.toXML());
ASSERT_EQ(xml,
- "jtkutest.com.auJTKCONJTKCON2jtkUT3stAusRegistryCompany1JTKUTEST.20070101.010101.0");
+ "jtkutest.com.auJTKCONJTKCON2jtkUT3stAusRegistryCompany1JTKUTEST.20140101.010101.0");
}
/**
@@ -46,7 +46,7 @@ void doWork()
*
*/
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
vector techIds;
@@ -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.20070101.010101.0");
+ ASSERT_EQ(xml, "jtkutest.com.auns1.ausregistry.netns2.ausregistry.netJTKCONJTKCONJTKCON2JTKCON2jtkUT3stAusRegistry01241326211CompanyBlah12312395231JTKUTEST.20140101.010101.0");
}
}
diff --git a/AusRegEPPTK/se/AuDomainModifyRegistrantCommandTest.cpp b/AusRegEPPTK/se/AuDomainModifyRegistrantCommandTest.cpp
index 27616b2..e1638d6 100644
--- a/AusRegEPPTK/se/AuDomainModifyRegistrantCommandTest.cpp
+++ b/AusRegEPPTK/se/AuDomainModifyRegistrantCommandTest.cpp
@@ -21,7 +21,7 @@ void doWork()
const string eligibilityIDType = "OTHER";
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
AuDomainModifyRegistrantCommand cmd(
@@ -36,7 +36,7 @@ void doWork()
&eligibilityID,
&eligibilityIDType);
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "jtkutest.com.auAusRegistry01241326211CompanyBlah12312395231testingJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "jtkutest.com.auAusRegistry01241326211CompanyBlah12312395231testingJTKUTEST.20140101.010101.0");
}
}
diff --git a/AusRegEPPTK/se/AuDomainTransferRegistrantCommandTest.cpp b/AusRegEPPTK/se/AuDomainTransferRegistrantCommandTest.cpp
index fe3cc10..662d277 100644
--- a/AusRegEPPTK/se/AuDomainTransferRegistrantCommandTest.cpp
+++ b/AusRegEPPTK/se/AuDomainTransferRegistrantCommandTest.cpp
@@ -25,7 +25,7 @@ void doWork()
auto_ptr curExpDate(EPPDateFormatter::fromXSDateTime("2014-01-01T01:01:01.0Z"));
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
AuDomainTransferRegistrantCommand cmd(
@@ -36,11 +36,11 @@ void doWork()
registrantName,
"testing");
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "jtkutest.com.au2014-01-01AusRegistryOther1testingJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "jtkutest.com.au2014-01-01AusRegistryOther1testingJTKUTEST.20140101.010101.0");
}
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
Period p(2, PeriodUnit::YEARS());
@@ -58,7 +58,7 @@ void doWork()
&eligibilityIDType,
&p);
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "jtkutest.com.au2014-01-012AusRegistry01241326211CompanyBlah12312395231testingJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "jtkutest.com.au2014-01-012AusRegistry01241326211CompanyBlah12312395231testingJTKUTEST.20140101.010101.0");
}
}
diff --git a/AusRegEPPTK/se/ContactCheckCommandTest.cpp b/AusRegEPPTK/se/ContactCheckCommandTest.cpp
index 4a75736..f11e1a5 100644
--- a/AusRegEPPTK/se/ContactCheckCommandTest.cpp
+++ b/AusRegEPPTK/se/ContactCheckCommandTest.cpp
@@ -10,17 +10,17 @@ void doWork()
{
init("./etc/toolkit2.conf");
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
auto_ptr cmd(new ContactCheckCommand("JTKCON"));
const string xml(cmd->toXML());
ASSERT_EQ(xml,
- "JTKCONJTKUTEST.20070101.010101.0");
+ "JTKCONJTKUTEST.20140101.010101.0");
}
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
vector ids;
ids.push_back("JTKCON1");
@@ -28,7 +28,7 @@ void doWork()
auto_ptr cmd(new ContactCheckCommand(ids));
const string xml(cmd->toXML());
ASSERT_EQ(xml,
- "JTKCON1JTKCON2JTKUTEST.20070101.010101.0");
+ "JTKCON1JTKCON2JTKUTEST.20140101.010101.0");
}
}
diff --git a/AusRegEPPTK/se/ContactDeleteCommandTest.cpp b/AusRegEPPTK/se/ContactDeleteCommandTest.cpp
index 1005386..ade206b 100644
--- a/AusRegEPPTK/se/ContactDeleteCommandTest.cpp
+++ b/AusRegEPPTK/se/ContactDeleteCommandTest.cpp
@@ -13,11 +13,11 @@ void doWork()
init("./etc/toolkit2.conf");
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
ContactDeleteCommand cmd("JTKCON");
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "JTKCONJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "JTKCONJTKUTEST.20140101.010101.0");
}
}
diff --git a/AusRegEPPTK/se/ContactInfoCommandTest.cpp b/AusRegEPPTK/se/ContactInfoCommandTest.cpp
index 9b45ba3..298d876 100644
--- a/AusRegEPPTK/se/ContactInfoCommandTest.cpp
+++ b/AusRegEPPTK/se/ContactInfoCommandTest.cpp
@@ -13,19 +13,19 @@ void doWork()
init("./etc/toolkit2.conf");
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
ContactInfoCommand cmd("C100000-AR");
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "C100000-ARJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "C100000-ARJTKUTEST.20140101.010101.0");
}
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
ContactInfoCommand cmd("C100000-AR", "jtkUT3st");
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "C100000-ARjtkUT3stJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "C100000-ARjtkUT3stJTKUTEST.20140101.010101.0");
}
}
diff --git a/AusRegEPPTK/se/ContactTransferRequestCommandTest.cpp b/AusRegEPPTK/se/ContactTransferRequestCommandTest.cpp
index 8efbddc..ba45c5d 100644
--- a/AusRegEPPTK/se/ContactTransferRequestCommandTest.cpp
+++ b/AusRegEPPTK/se/ContactTransferRequestCommandTest.cpp
@@ -14,11 +14,11 @@ void doWork()
{
init("./etc/toolkit2.conf");
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
ContactTransferRequestCommand cmd("JTKCON1", "jtkcon1pw");
- const string expected("JTKCON1jtkcon1pwJTKUTEST.20070101.010101.0");
+ const string expected("JTKCON1jtkcon1pwJTKUTEST.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 0dadfd2..15b613e 100644
--- a/AusRegEPPTK/se/DomainCheckCommandTest.cpp
+++ b/AusRegEPPTK/se/DomainCheckCommandTest.cpp
@@ -13,14 +13,14 @@ void doWork()
init("./etc/toolkit2.conf");
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
DomainCheckCommand cmd("test.com.au");
const string xml(cmd.toXML());
ASSERT_EQ(cmd.getCommandType()->getCommandName(), "check");
ASSERT_EQ(cmd.getObjectType()->getName(), "domain");
- ASSERT_EQ(xml, "test.com.auJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "test.com.auJTKUTEST.20140101.010101.0");
}
}
diff --git a/AusRegEPPTK/se/DomainDeleteCommandTest.cpp b/AusRegEPPTK/se/DomainDeleteCommandTest.cpp
index 311d2d7..a846d6a 100644
--- a/AusRegEPPTK/se/DomainDeleteCommandTest.cpp
+++ b/AusRegEPPTK/se/DomainDeleteCommandTest.cpp
@@ -13,11 +13,11 @@ void doWork()
init("./etc/toolkit2.conf");
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
DomainDeleteCommand cmd("jtkutest.com.au");
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20140101.010101.0");
}
}
diff --git a/AusRegEPPTK/se/DomainInfoCommandTest.cpp b/AusRegEPPTK/se/DomainInfoCommandTest.cpp
index 1e6c5b9..04ce325 100644
--- a/AusRegEPPTK/se/DomainInfoCommandTest.cpp
+++ b/AusRegEPPTK/se/DomainInfoCommandTest.cpp
@@ -13,11 +13,11 @@ void doWork()
init("./etc/toolkit2.conf");
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
DomainInfoCommand cmd("jtkutest.com.au");
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20140101.010101.0");
}
}
diff --git a/AusRegEPPTK/se/DomainKVCommandExtensionTest.cpp b/AusRegEPPTK/se/DomainKVCommandExtensionTest.cpp
index f18523f..ba37d55 100644
--- a/AusRegEPPTK/se/DomainKVCommandExtensionTest.cpp
+++ b/AusRegEPPTK/se/DomainKVCommandExtensionTest.cpp
@@ -18,7 +18,7 @@ const static string policyReason = "1";
void testUpdateSingleKVList()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
DomainKVCommandExtension extension(StandardCommandType::UPDATE());
@@ -30,13 +30,13 @@ void testUpdateSingleKVList()
const string xml = updateCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.ae- Trademark
- 1
- AusRegistry
JTKUTEST.20070101.010101.0"
+ "jtkutest.com.ae- Trademark
- 1
- AusRegistry
JTKUTEST.20140101.010101.0"
);
}
void testCreateSingleKVList()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
DomainKVCommandExtension extension(StandardCommandType::CREATE());
@@ -49,13 +49,13 @@ void testCreateSingleKVList()
const string xml = createCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.aeJTKCONjtkUT3st- Trademark
- 1
- AusRegistry
JTKUTEST.20070101.010101.0"
+ "jtkutest.com.aeJTKCONjtkUT3st- Trademark
- 1
- AusRegistry
JTKUTEST.20140101.010101.0"
);
}
void testMultipleKVList()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
DomainKVCommandExtension extension(StandardCommandType::CREATE());
@@ -69,7 +69,7 @@ void testMultipleKVList()
const string xml = createCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.aeJTKCONjtkUT3st- Trademark
- 1
- AusRegistry
- Trademark
- 1
- AusRegistry
JTKUTEST.20070101.010101.0"
+ "jtkutest.com.aeJTKCONjtkUT3st- Trademark
- 1
- AusRegistry
- Trademark
- 1
- AusRegistry
JTKUTEST.20140101.010101.0"
);
}
diff --git a/AusRegEPPTK/se/DomainRegistrantTransferCommandTest.cpp b/AusRegEPPTK/se/DomainRegistrantTransferCommandTest.cpp
index 6542c16..c6d26f8 100644
--- a/AusRegEPPTK/se/DomainRegistrantTransferCommandTest.cpp
+++ b/AusRegEPPTK/se/DomainRegistrantTransferCommandTest.cpp
@@ -22,7 +22,7 @@ void addSampleKVItems(DomainRegistrantTransferCommand *command);
void testWithoutPeriod()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
auto_ptr command(
@@ -33,7 +33,7 @@ void testWithoutPeriod()
ASSERT_EQ(xml,
"jtkutest.com.ae"
+ EPPDateFormatter::toXSDate(*curExpDate)
- + "- Trademark
- 1231239523
- Blah
- Trademark
- 1
- Trade License
- 01241326211
- AusRegistry
testingJTKUTEST.20070101.010101.0"
+ + "- Trademark
- 1231239523
- Blah
- Trademark
- 1
- Trade License
- 01241326211
- AusRegistry
testingJTKUTEST.20140101.010101.0"
);
}
@@ -48,7 +48,7 @@ void testWithPeriod()
ASSERT_EQ(xml,
"jtkutest.com.ae"
+ EPPDateFormatter::toXSDate(*curExpDate)
- + "2- Trademark
- 1231239523
- Blah
- Trademark
- 1
- Trade License
- 01241326211
- AusRegistry
testingJTKUTEST.20070101.010101.0"
+ + "2- Trademark
- 1231239523
- Blah
- Trademark
- 1
- Trade License
- 01241326211
- AusRegistry
testingJTKUTEST.20140101.010101.0"
);
}
diff --git a/AusRegEPPTK/se/DomainTransferQueryCommandTest.cpp b/AusRegEPPTK/se/DomainTransferQueryCommandTest.cpp
index 4b9464b..732d73d 100644
--- a/AusRegEPPTK/se/DomainTransferQueryCommandTest.cpp
+++ b/AusRegEPPTK/se/DomainTransferQueryCommandTest.cpp
@@ -13,32 +13,32 @@ void doWork()
init("./etc/toolkit2.conf");
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
DomainTransferQueryCommand cmd("jtkutest.com.au");
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20140101.010101.0");
}
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
DomainTransferQueryCommand cmd("jtkutest.com.au", "jtkUt3st");
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "jtkutest.com.aujtkUt3stJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "jtkutest.com.aujtkUt3stJTKUTEST.20140101.010101.0");
}
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
DomainTransferQueryCommand cmd("jtkutest.com.au", "C100000-AR", "jtkUt3st");
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "jtkutest.com.aujtkUt3stJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "jtkutest.com.aujtkUt3stJTKUTEST.20140101.010101.0");
}
}
diff --git a/AusRegEPPTK/se/DomainUpdateCommandTest.cpp b/AusRegEPPTK/se/DomainUpdateCommandTest.cpp
index 6ee7a33..045d153 100644
--- a/AusRegEPPTK/se/DomainUpdateCommandTest.cpp
+++ b/AusRegEPPTK/se/DomainUpdateCommandTest.cpp
@@ -18,18 +18,18 @@ using namespace std;
void testSimpleUpdate()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
DomainUpdateCommand cmd("jtkutest.com.au");
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "jtkutest.com.auJTKUTEST.20140101.010101.0");
}
void testFullUpdate()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
const char* addNsText[] = { "ns1.jtkutest.com.au", "ns2.jtkutest.com.au" };
@@ -77,12 +77,12 @@ void testFullUpdate()
DomainUpdateCommand cmd("jtkutest.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.20070101.010101.0");
+ ASSERT_EQ(xml, "jtkutest.com.auns1.jtkutest.com.auns2.jtkutest.com.auJTKCONJTKCON2JTKCON3non-paymentns3.jtkutest.com.auns4.jtkutest.com.auJTKCON2JTKCONJTKCONjtkUT3stJTKUTEST.20140101.010101.0");
}
void testSyncExpiryDateExtension(void)
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
DomainUpdateCommand cmd("jtkutest.com.au");
@@ -94,7 +94,7 @@ void testSyncExpiryDateExtension(void)
delete newExpiryDate;
ASSERT_EQ(xml,
- "jtkutest.com.au2005-04-03T22:00:00.0ZJTKUTEST.20070101.010101.0");
+ "jtkutest.com.au2005-04-03T22:00:00.0ZJTKUTEST.20140101.010101.0");
}
void testSyncExpiryDateExtensionWithNullDate(void)
diff --git a/AusRegEPPTK/se/HostCheckCommandTest.cpp b/AusRegEPPTK/se/HostCheckCommandTest.cpp
index 637a903..735d1af 100644
--- a/AusRegEPPTK/se/HostCheckCommandTest.cpp
+++ b/AusRegEPPTK/se/HostCheckCommandTest.cpp
@@ -13,22 +13,22 @@ void doWork()
init("./etc/toolkit2.conf");
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
HostCheckCommand hcc("ns1.jtkutest.com.au");
const string xml(hcc.toXML());
- ASSERT_EQ(xml, "ns1.jtkutest.com.auJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "ns1.jtkutest.com.auJTKUTEST.20140101.010101.0");
}
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
std::vector names;
names.push_back("ns1.jtkutest.com.au");
names.push_back("ns2.jtkutest.com.au");
HostCheckCommand hcc(names);
const string xml(hcc.toXML());
- ASSERT_EQ(xml, "ns1.jtkutest.com.auns2.jtkutest.com.auJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "ns1.jtkutest.com.auns2.jtkutest.com.auJTKUTEST.20140101.010101.0");
}
}
diff --git a/AusRegEPPTK/se/HostCreateCommandTest.cpp b/AusRegEPPTK/se/HostCreateCommandTest.cpp
index 26196c3..ad1dfec 100644
--- a/AusRegEPPTK/se/HostCreateCommandTest.cpp
+++ b/AusRegEPPTK/se/HostCreateCommandTest.cpp
@@ -13,16 +13,16 @@ void doWork()
init("./etc/toolkit2.conf");
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
HostCreateCommand hcc("ns1.jtkutest.com.au");
const string xml(hcc.toXML());
- ASSERT_EQ(xml, "ns1.jtkutest.com.auJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "ns1.jtkutest.com.auJTKUTEST.20140101.010101.0");
}
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
vector addrs;
addrs.push_back(InetAddress("192.168.0.1", IPVersion::IPv4()));
@@ -30,7 +30,7 @@ void doWork()
HostCreateCommand hcc("ns1.jtkutest.com.au", &addrs);
const string xml(hcc.toXML());
- ASSERT_EQ(xml, "ns1.jtkutest.com.au192.168.0.1::1JTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "ns1.jtkutest.com.au192.168.0.1::1JTKUTEST.20140101.010101.0");
}
}
diff --git a/AusRegEPPTK/se/HostDeleteCommandTest.cpp b/AusRegEPPTK/se/HostDeleteCommandTest.cpp
index 88ac3f9..e72e53c 100644
--- a/AusRegEPPTK/se/HostDeleteCommandTest.cpp
+++ b/AusRegEPPTK/se/HostDeleteCommandTest.cpp
@@ -13,10 +13,10 @@ void doWork()
init("./etc/toolkit2.conf");
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
HostDeleteCommand hcc("ns1.jtkutest.com.au");
const string xml(hcc.toXML());
- ASSERT_EQ(xml, "ns1.jtkutest.com.auJTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "ns1.jtkutest.com.auJTKUTEST.20140101.010101.0");
}
}
diff --git a/AusRegEPPTK/se/HostInfoCommandTest.cpp b/AusRegEPPTK/se/HostInfoCommandTest.cpp
index 72661bb..763cda9 100644
--- a/AusRegEPPTK/se/HostInfoCommandTest.cpp
+++ b/AusRegEPPTK/se/HostInfoCommandTest.cpp
@@ -9,12 +9,12 @@ using namespace std;
void doWork()
{
init("./etc/toolkit2.conf");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
HostInfoCommand cmd("ns1.jtkutest.com.au");
const string xml = cmd.toXML();
- ASSERT_EQ("ns1.jtkutest.com.auJTKUTEST.20070101.010101.0", xml);
+ ASSERT_EQ("ns1.jtkutest.com.auJTKUTEST.20140101.010101.0", xml);
}
int main(int argc, char* argv[])
diff --git a/AusRegEPPTK/se/LoginCommandTest.cpp b/AusRegEPPTK/se/LoginCommandTest.cpp
index 7472bc2..f8311f4 100644
--- a/AusRegEPPTK/se/LoginCommandTest.cpp
+++ b/AusRegEPPTK/se/LoginCommandTest.cpp
@@ -21,39 +21,39 @@ void doWork()
init("./etc/toolkit2.conf");
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
LoginCommand cmd("JTKUTEST", "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.20070101.010101.0");
+ 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");
}
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
LoginCommand cmd("JTKUTEST", "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.20070101.010101.0");
+ 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");
}
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
LoginCommand cmd("JTKUTEST", "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.20070101.010101.0", xml);
+ 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);
}
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
const string newPw("n(-w18PW*");
LoginCommand cmd("JTKUTEST", "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.20070101.010101.0");
+ 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");
}
}
diff --git a/AusRegEPPTK/se/LogoutCommandTest.cpp b/AusRegEPPTK/se/LogoutCommandTest.cpp
index f57c185..b545b7a 100644
--- a/AusRegEPPTK/se/LogoutCommandTest.cpp
+++ b/AusRegEPPTK/se/LogoutCommandTest.cpp
@@ -13,12 +13,12 @@ void doWork()
init("./etc/toolkit2.conf");
{
CLTRID::setClID("JTKUTEST");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
LogoutCommand cmd;
const string xml(cmd.toXML());
- ASSERT_EQ(xml, "JTKUTEST.20070101.010101.0");
+ ASSERT_EQ(xml, "JTKUTEST.20140101.010101.0");
}
}
diff --git a/AusRegEPPTK/se/PollAckCommandTest.cpp b/AusRegEPPTK/se/PollAckCommandTest.cpp
index 11fe25c..647e4b6 100644
--- a/AusRegEPPTK/se/PollAckCommandTest.cpp
+++ b/AusRegEPPTK/se/PollAckCommandTest.cpp
@@ -9,12 +9,12 @@ using namespace std;
void doWork()
{
init("./etc/toolkit2.conf");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
PollAckCommand cmd(123);
const string xml = cmd.toXML();
- ASSERT_EQ("JTKUTEST.20070101.010101.0", xml);
+ ASSERT_EQ("JTKUTEST.20140101.010101.0", xml);
}
int main(int argc, char* argv[])
diff --git a/AusRegEPPTK/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp b/AusRegEPPTK/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp
index 4d3673e..df1defb 100644
--- a/AusRegEPPTK/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp
+++ b/AusRegEPPTK/se/secDNS/DomainSecDNSCreateCommandExtensionTest.cpp
@@ -13,7 +13,7 @@ using namespace std;
void testSecDNSAllFields()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
DomainCreateCommand createCommand("jtkutest.com.au", "jtkUT3st", NULL);
@@ -34,13 +34,13 @@ void testSecDNSAllFields()
const string xml = createCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.aujtkUT3st604800123453149FD46E6C4B45C55D4AC25631AQPJ////4Q==JTKUTEST.20070101.010101.0"
+ "jtkutest.com.aujtkUT3st604800123453149FD46E6C4B45C55D4AC25631AQPJ////4Q==JTKUTEST.20140101.010101.0"
);
}
void testSecDNSMultipleDSDataWithoutMaxSigLife()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
DomainCreateCommand createCommand("jtkutest.com.au", "jtkUT3st", NULL);
@@ -62,13 +62,13 @@ void testSecDNSMultipleDSDataWithoutMaxSigLife()
const string xml = createCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.aujtkUT3st123453138FD46E6C4B45C55D4AC25631AQPJ////4Q==67892249FD46E6C4B45C55D4ACJTKUTEST.20070101.010101.0"
+ "jtkutest.com.aujtkUT3st123453138FD46E6C4B45C55D4AC25631AQPJ////4Q==67892249FD46E6C4B45C55D4ACJTKUTEST.20140101.010101.0"
);
}
void testSecDNSAllFieldsMin()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
DomainCreateCommand createCommand("jtkutest.com.au", "jtkUT3st", NULL);
@@ -89,13 +89,13 @@ void testSecDNSAllFieldsMin()
const string xml = createCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.aujtkUT3st100049FD46E6C4B45C55D4AC000AQPJ////4Q==JTKUTEST.20070101.010101.0"
+ "jtkutest.com.aujtkUT3st100049FD46E6C4B45C55D4AC000AQPJ////4Q==JTKUTEST.20140101.010101.0"
);
}
void testSecDNSAllFieldsMax()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
DomainCreateCommand createCommand("jtkutest.com.au", "jtkUT3st", NULL);
@@ -116,13 +116,13 @@ void testSecDNSAllFieldsMax()
const string xml = createCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.aujtkUT3st21474836476553525525549FD46E6C4B45C55D4AC65535255255AQPJ////4Q==JTKUTEST.20070101.010101.0"
+ "jtkutest.com.aujtkUT3st21474836476553525525549FD46E6C4B45C55D4AC65535255255AQPJ////4Q==JTKUTEST.20140101.010101.0"
);
}
void testSecDNSJustKeyData()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
DomainCreateCommand createCommand("jtkutest.com.au", "jtkUT3st", NULL);
@@ -141,7 +141,7 @@ void testSecDNSJustKeyData()
const string xml = createCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.aujtkUT3st6553565535255255AQPJ////4Q==JTKUTEST.20070101.010101.0"
+ "jtkutest.com.aujtkUT3st6553565535255255AQPJ////4Q==JTKUTEST.20140101.010101.0"
);
}
diff --git a/AusRegEPPTK/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp b/AusRegEPPTK/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp
index 8873439..d372a7c 100644
--- a/AusRegEPPTK/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp
+++ b/AusRegEPPTK/se/secDNS/DomainSecDNSUpdateCommandExtensionTest.cpp
@@ -13,7 +13,7 @@ using namespace std;
void testSecDNSAddFieldsUrgent()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
string passwd = "jtkUT3st";
@@ -37,13 +37,13 @@ void testSecDNSAddFieldsUrgent()
const string xml = updateCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.auJTKCONjtkUT3st604800123453149FD46E6C4B45C55D4AC25631AQPJ////4Q==JTKUTEST.20070101.010101.0"
+ "jtkutest.com.auJTKCONjtkUT3st604800123453149FD46E6C4B45C55D4AC25631AQPJ////4Q==JTKUTEST.20140101.010101.0"
);
}
void testSecDNSRemoveFieldsNotUrgent()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
string passwd = "jtkUT3st";
@@ -65,13 +65,13 @@ void testSecDNSRemoveFieldsNotUrgent()
const string xml = updateCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.auJTKCONjtkUT3st6553525525549FD46E6C4B45C55D4AC65535255255AQPJ////4Q==JTKUTEST.20070101.010101.0"
+ "jtkutest.com.auJTKCONjtkUT3st6553525525549FD46E6C4B45C55D4AC65535255255AQPJ////4Q==JTKUTEST.20140101.010101.0"
);
}
void testSecDNSRemoveAll()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
string passwd = "jtkUT3st";
@@ -90,13 +90,13 @@ void testSecDNSRemoveAll()
const string xml = updateCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.auJTKCONjtkUT3sttrueJTKUTEST.20070101.010101.0"
+ "jtkutest.com.auJTKCONjtkUT3sttrueJTKUTEST.20140101.010101.0"
);
}
void testSecDNSRemoveAllAndAddDsData()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
string passwd = "jtkUT3st";
@@ -120,13 +120,13 @@ void testSecDNSRemoveAllAndAddDsData()
const string xml = updateCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.auJTKCONjtkUT3sttrue6553525525549FD46E6C4B45C55D4ACJTKUTEST.20070101.010101.0"
+ "jtkutest.com.auJTKCONjtkUT3sttrue6553525525549FD46E6C4B45C55D4ACJTKUTEST.20140101.010101.0"
);
}
void testSecDNSRemoveAllAndAddKeyData()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
string passwd = "jtkUT3st";
@@ -150,13 +150,13 @@ void testSecDNSRemoveAllAndAddKeyData()
const string xml = updateCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.auJTKCONjtkUT3sttrue65535255255AQPJ////4Q==JTKUTEST.20070101.010101.0"
+ "jtkutest.com.auJTKCONjtkUT3sttrue65535255255AQPJ////4Q==JTKUTEST.20140101.010101.0"
);
}
void testSecDNSRemoveAllAndAddKeyDataAndChangeMaxSigLife()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CLTRID::setClID("JTKUTEST");
string passwd = "jtkUT3st";
@@ -185,7 +185,7 @@ void testSecDNSRemoveAllAndAddKeyDataAndChangeMaxSigLife()
const string xml = updateCommand.toXML();
ASSERT_EQ(xml,
- "jtkutest.com.auJTKCONjtkUT3sttrue65535255255AQPJ////4Q==604800JTKUTEST.20070101.010101.0"
+ "jtkutest.com.auJTKCONjtkUT3sttrue65535255255AQPJ////4Q==604800JTKUTEST.20140101.010101.0"
);
}
diff --git a/AusRegEPPTK/session/CommandCounterTest.cpp b/AusRegEPPTK/session/CommandCounterTest.cpp
index 83dcbe1..ed70c7f 100644
--- a/AusRegEPPTK/session/CommandCounterTest.cpp
+++ b/AusRegEPPTK/session/CommandCounterTest.cpp
@@ -9,7 +9,7 @@ using namespace std;
void testLoginCount()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
CommandCounter cc(5000);
ASSERT_EQ(0, cc.getTotal());
ASSERT_EQ(0, cc.getCount(StandardCommandType::LOGIN()));
@@ -27,7 +27,7 @@ void testLoginCount()
void testMixedCommandsCount()
{
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
// 5 second 'recent' time.
CommandCounter cc(5000);
@@ -49,7 +49,7 @@ void testMixedCommandsCount()
ASSERT_EQ(4, cc.getRecentExactTotal());
// 10 seconds later, which is greater than 5 seconds.
- Timer::setTime("20070101.010111");
+ Timer::setTime("20140101.010111");
ASSERT_EQ(4, cc.getTotal());
ASSERT_EQ(4, cc.getRecentTotal());
@@ -62,7 +62,7 @@ void testMixedCommandsCount()
void testPollCount()
{
Timer::setTime("");
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
// 5 second recent window.
CommandCounter cc(5000);
@@ -73,16 +73,16 @@ void testPollCount()
ASSERT_EQ(1, cc.getRecentCount(StandardCommandType::POLL()));
// advance to 3sec
- Timer::setTime("20070101.010103");
+ Timer::setTime("20140101.010103");
cc.increment(StandardCommandType::POLL());
ASSERT_EQ(2, cc.getRecentCount(StandardCommandType::POLL()));
// advance to 8sec, (1sec event gone)
- Timer::setTime("20070101.010108");
+ Timer::setTime("20140101.010108");
ASSERT_EQ(1, cc.getRecentCount(StandardCommandType::POLL()));
// advance to 17sec (7 second event gone).
- Timer::setTime("20070101.010117");
+ Timer::setTime("20140101.010117");
ASSERT_EQ(0, cc.getRecentCount(StandardCommandType::POLL()));
}
diff --git a/AusRegEPPTK/session/SessionManagerTest.cpp b/AusRegEPPTK/session/SessionManagerTest.cpp
index cdadc6d..cd86125 100644
--- a/AusRegEPPTK/session/SessionManagerTest.cpp
+++ b/AusRegEPPTK/session/SessionManagerTest.cpp
@@ -66,7 +66,7 @@ void doWork()
}
try {
- Timer::setTime("20070101.010101");
+ Timer::setTime("20140101.010101");
op = "newInstance";
auto_ptr manager(SessionManagerFactory::newInstance(&props));
op = "startup";
diff --git a/AusRegEPPTK/session/TimerTest.cpp b/AusRegEPPTK/session/TimerTest.cpp
index 9fc1d8a..d48c57d 100644
--- a/AusRegEPPTK/session/TimerTest.cpp
+++ b/AusRegEPPTK/session/TimerTest.cpp
@@ -9,8 +9,8 @@ using namespace std;
int main(int argc, char* argv[])
{
const std::string bad_time = "123";
- const std::string good_time = "20070101.010101";
- const std::string good_time_string = "Mon Jan 1 01:01:01 2007\n";
+ const std::string good_time = "20140101.010101";
+ const std::string good_time_string = "Mon Jan 1 01:01:01 2014\n";
std::string timeString;
time_t time;
diff --git a/README b/README
index 3da88b5..109b4fc 100644
--- a/README
+++ b/README
@@ -33,7 +33,9 @@
The git repo mirrors my Eclipse project.
- Everything except the AusReg TK has been used
- from the normal debian pkgs, so you can use
- aptitude, dpkg etc, to examine on in your
- unix account on the delivery host.
+ At first everything except the AusReg TK was gotten
+ from the normal debian pkgs. The working situation
+ 2014-01 is more complicated than that but on a new host
+ (not necessarily debian) that should be done first.
+
+