Limal Commits
Threads by month
- ----- 2024 -----
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
July 2010
- 1 participants
- 17 discussions
r2691 - in /limal-branches/mc-devel/limal-ca-mgm/src: CA.cpp PathName.cpp
by mcalmer＠svn.opensuse.org 17 Jul '10
by mcalmer＠svn.opensuse.org 17 Jul '10
17 Jul '10
Author: mcalmer
Date: Sat Jul 17 19:03:27 2010
New Revision: 2691
URL: http://svn.opensuse.org/viewcvs/limal?rev=2691&view=rev
Log:
remove some more blocxx includes
Modified:
limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp
limal-branches/mc-devel/limal-ca-mgm/src/PathName.cpp
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp Sat Jul 17 19:03:27 2010
@@ -25,11 +25,8 @@
#include <limal/Exception.hpp>
#include <limal/PathUtils.hpp>
#include <limal/PathInfo.hpp>
-#include <blocxx/MD5.hpp>
#include <limal/Date.hpp>
#include <limal/String.hpp>
-#include <blocxx/StringBuffer.hpp>
-
#include <openssl/pem.h>
Modified: limal-branches/mc-devel/limal-ca-mgm/src/PathName.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/PathName.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/PathName.cpp Sat Jul 17 19:03:27 2010
@@ -37,7 +37,6 @@
#include <limal/PathName.hpp>
#include <limal/Exception.hpp>
-#include <blocxx/EnvVars.hpp>
#include <limal/String.hpp>
#include "Utils.hpp"
@@ -57,14 +56,11 @@
namespace path
{
-using namespace blocxx;
-
// -------------------------------------------------------------------
// anonymous namespace
namespace
{
-
size_t
findTildeEnd(const std::string &name)
{
@@ -86,7 +82,6 @@
std::string
expandTilde(const std::string &name)
{
- // FIXME: improve blocxx::UserInfo and use it!!!
if( name.compare(0, 1, "~") == 0)
{
std::string user;
@@ -101,8 +96,7 @@
{
if( ::getuid() != ::geteuid())
{
- EnvVars env(EnvVars::E_CURRENT_ENVIRONMENT);
- home = env.getValue("HOME").c_str();
+ home = getenv("HOME");
if( home.compare(0, 1, "~") == 0)
home = "";
@@ -133,7 +127,7 @@
if( !home.empty())
{
- return home + BLOCXX_FILENAME_SEPARATOR + rest;
+ return home + "/" + rest;
}
}
return name;
--
To unsubscribe, e-mail: limal-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: limal-commit+help(a)opensuse.org
1
0
r2690 - in /limal-branches/mc-devel/limal-ca-mgm/testsuite: TestLineFormater.hpp TestLineFormater2.hpp TestRepos/Test_CA1/cam.txt TestRepos/Test_CA1/index.txt TestRepos/Test_CA1/serial
by mcalmer＠svn.opensuse.org 17 Jul '10
by mcalmer＠svn.opensuse.org 17 Jul '10
17 Jul '10
Author: mcalmer
Date: Sat Jul 17 18:40:31 2010
New Revision: 2690
URL: http://svn.opensuse.org/viewcvs/limal?rev=2690&view=rev
Log:
Special Formater for the testcases
Added:
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestLineFormater.hpp
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestLineFormater2.hpp
Modified:
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/serial
Added: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestLineFormater.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestLineFormater.hpp (added)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestLineFormater.hpp Sat Jul 17 18:40:31 2010
@@ -0,0 +1,32 @@
+#ifndef LIMAL_TEST_LINE_FORMATER_HPP
+#define LIMAL_TEST_LINE_FORMATER_HPP
+
+#include <iosfwd>
+#include <string>
+#include <limal/LogControl.hpp>
+
+///////////////////////////////////////////////////////////////////
+//namespace ca_mgm
+//{ /////////////////////////////////////////////////////////////////
+
+ struct TestLineFormater : public ca_mgm::LogControl::LineFormater
+ {
+ virtual std::string format( const std::string & group_r,
+ ca_mgm::logger::LogLevel level_r,
+ const char * ,
+ const char * ,
+ int ,
+ const std::string & message_r )
+ {
+ return ca_mgm::str::form( "%-5s %s - %s",
+ ca_mgm::logger::logLevelToString( level_r).c_str(),
+ group_r.c_str(), message_r.c_str());
+ }
+ virtual ~TestLineFormater() {}
+ };
+
+
+ /////////////////////////////////////////////////////////////////
+//} // namespace ca_mgm
+///////////////////////////////////////////////////////////////////
+#endif // LIMAL_TEST_LINE_FORMATER_HPP
Added: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestLineFormater2.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestLineFormater2.hpp (added)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestLineFormater2.hpp Sat Jul 17 18:40:31 2010
@@ -0,0 +1,41 @@
+#ifndef LIMAL_TEST_LINE_FORMATER2_HPP
+#define LIMAL_TEST_LINE_FORMATER2_HPP
+
+#include <iosfwd>
+#include <string>
+#include <limal/LogControl.hpp>
+
+///////////////////////////////////////////////////////////////////
+//namespace ca_mgm
+//{ /////////////////////////////////////////////////////////////////
+
+ struct TestLineFormater2 : public ca_mgm::LogControl::LineFormater
+ {
+ virtual std::string format( const std::string & group_r,
+ ca_mgm::logger::LogLevel level_r,
+ const char * ,
+ const char * ,
+ int ,
+ const std::string & message_r )
+ {
+ if(level_r == ca_mgm::logger::E_ERROR)
+ {
+ return ca_mgm::str::form( "%-5s %s - %s",
+ ca_mgm::logger::logLevelToString( level_r).c_str(),
+ group_r.c_str(), "not log openssl errors for testing");
+ }
+ else
+ {
+ return ca_mgm::str::form( "%-5s %s - %s",
+ ca_mgm::logger::logLevelToString( level_r).c_str(),
+ group_r.c_str(), message_r.c_str());
+ }
+ }
+ virtual ~TestLineFormater2() {}
+ };
+
+
+ /////////////////////////////////////////////////////////////////
+//} // namespace ca_mgm
+///////////////////////////////////////////////////////////////////
+#endif // LIMAL_TEST_LINE_FORMATER_HPP
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt Sat Jul 17 18:40:31 2010
@@ -1,14 +0,0 @@
-d12f85f32848ae7f9f1d8064813aaa53-1279384536 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-68b3a1b7290aadfd42361b1b3c14e69a-1279384539 /C=DE/CN=Test Server Certificate\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1279384543 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1279384546 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1279384550 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-d12f85f32848ae7f9f1d8064813aaa53-1279384559 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-c293624b6a877f401407ce8f8f1f327e-1279384560 /C=DE/L=Nuremberg/O=SUSE Linux GmbH/OU=IT/CN=SUSE User CA/emailAddress=security-team(a)suse.de
-d12f85f32848ae7f9f1d8064813aaa53-1279384562 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-c1943ae4b9bd7320fae3e29f217483e3-1279384563 /C=DE/CN=Test Request/emailAddress=suse(a)suse.de
-d816690a832b0e52becd255d3a62e975-1279384566 /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse(a)suse.de
-9198f6798d9da70d7cbfb67b610633f5-1279384567 /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse(a)suse.de
-3e248858337c2b46dc67a0f9389376dd-1279384569 /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse(a)suse.de
-bf04fdd95062554800c1556085f47063-1279384571 /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse(a)suse.de
-9797ac11af29f94b82c1e5b0499ab5f2-1279384574 /C=DE/CN=Test Sub CA/emailAddress=suse(a)suse.de
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt Sat Jul 17 18:40:31 2010
@@ -1,11 +0,0 @@
-V 110717163538Z 01 unknown /C=DE/CN=Test CA/SUSE Inc.\Gmbh/emailAddress=suse(a)suse.de
-V 110717163539Z 02 unknown /C=DE/CN=Test Server Certificate/SUSE Inc.\Gmbh/emailAddress=suse(a)suse.de
-V 110717163541Z 03 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-V 110717163544Z 04 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-V 110717163547Z 05 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-R 110717163604Z 100717163605Z 06 unknown /C=DE/CN=Test Certificate for revocation/emailAddress=suse(a)suse.de
-R 110717163606Z 100717163607Z,holdInstruction,holdInstructionCallIssuer 07 unknown /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse(a)suse.de
-R 110717163607Z 100717163608Z,keyTime,20100717161928Z 08 unknown /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse(a)suse.de
-R 110717163609Z 100717163611Z,CAkeyTime,20100717161931Z 09 unknown /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse(a)suse.de
-R 110717163611Z 100717163613Z,holdInstruction,1.6.21.43 0A unknown /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse(a)suse.de
-V 120716163614Z 0B unknown /C=DE/CN=Test Sub CA/emailAddress=suse(a)suse.de
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/serial
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/serial (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/serial Sat Jul 17 18:40:31 2010
@@ -1 +1 @@
-0C
+01
\ No newline at end of file
--
To unsubscribe, e-mail: limal-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: limal-commit+help(a)opensuse.org
1
0
r2689 - in /limal-branches/mc-devel/limal-ca-mgm: src/ src/INIParser/ src/limal/ testsuite/ testsuite/CA5/ testsuite/CA6/ testsuite/CA7/ testsuite/TestRepos/Test_CA1/ testsuite/TestRepos/Test_CA2/ ...
by mcalmer＠svn.opensuse.org 17 Jul '10
by mcalmer＠svn.opensuse.org 17 Jul '10
17 Jul '10
Author: mcalmer
Date: Sat Jul 17 18:38:59 2010
New Revision: 2689
URL: http://svn.opensuse.org/viewcvs/limal?rev=2689&view=rev
Log:
- replace blocxx::Logger with own implementaion
- adapt testcases to the new Logger
Added:
limal-branches/mc-devel/limal-ca-mgm/src/LogControl.cpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/LogControl.hpp
Removed:
limal-branches/mc-devel/limal-ca-mgm/src/Logger.cpp
Modified:
limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.cpp
limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.h
limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniParser.cpp
limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniParser.h
limal-branches/mc-devel/limal-ca-mgm/src/Makefile.am
limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/Logger.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/Makefile.am
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA1.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA2.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA3.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA4.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5/testcase1.err
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5/testcase2.err
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5/testcase3.err
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6/testcase1.err
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6/testcase2.err
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6/testcase3.err
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA7.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA7/testcase1.err
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA8.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA9.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CAConfig.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CRLTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest2.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest3.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest4.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest5.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest6.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ConvertTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/DeleteCATest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ExportTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/IPv6CheckTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCATest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCommonCertificateTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportRequestTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ListCATreeTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ListTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCATest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCRLTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCertificateTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCertificateTest2.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseRequestTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/RemoveCertificateTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/RemoveRequestTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/RequestTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest2.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest3.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest4.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest5.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/SubCATest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/.rand
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem
limal-branches/mc-devel/limal-ca-mgm/testsuite/UpdateDBTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/VerifyTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/chg1.err
limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/comment.err
limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/delete.err
limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/read1.err
limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/select1.err
limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/wr_add.err
limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/wr_chg.err
limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/CA1.err
limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/CAConfig.err
limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/ConvertTest.err
limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/ImportCATest.err
limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/ListTest.err
limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/VerifyTest.err
limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/sysConfig.err
limal-branches/mc-devel/limal-ca-mgm/testsuite/sysConfig.cc
Modified: limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.cpp Sat Jul 17 18:38:59 2010
@@ -115,7 +115,7 @@
IniSectionIdxIterator v = isections.find(k);
if (v == isections.end ())
{
- LIMAL_SLOG_ERROR (logger, "Internal error. Section " << k.c_str() << " not found. This can't happen." );
+ ERR << "Internal error. Section " << k.c_str() << " not found. This can't happen." << std::endl;
abort();
}
IniSection &s = v->second->s ();
@@ -139,7 +139,7 @@
isections.equal_range (k);
if (r.first == r.second) // empty range = not found
{
- LIMAL_SLOG_ERROR (logger, "Internal error. Value " << path[from].c_str() << " not found. This can't happen." );
+ ERR << "Internal error. Value " << path[from].c_str() << " not found. This can't happen." << std::endl;
abort ();
}
IniSection& s = (--r.second)->second->s ();
@@ -264,7 +264,7 @@
}
// empty range, no such key
- LIMAL_SLOG_DEBUG (logger, "Read: Invalid path" << pathToString(p).c_str() << "[" << depth <<"]");
+ DBG << "Read: Invalid path" << pathToString(p).c_str() << "[" << depth <<"]" << std::endl;
return -1;
}
@@ -287,7 +287,7 @@
return getMyValue (p, out, what, depth);
}
- LIMAL_SLOG_DEBUG (logger, "Read: Invalid path" << pathToString (p).c_str() << "[" << depth <<"]");
+ DBG << "Read: Invalid path" << pathToString (p).c_str() << "[" << depth <<"]" << std::endl;
return -1;
}
@@ -355,7 +355,7 @@
// empty range, no such key
}
- LIMAL_SLOG_DEBUG (logger, "Read: Invalid path " << pathToString (p).c_str() << "[" << depth <<"]");
+ DBG << "Read: Invalid path " << pathToString (p).c_str() << "[" << depth <<"]" << std::endl;
return -1;
}
@@ -379,7 +379,7 @@
return 0;
}
- LIMAL_SLOG_ERROR (logger, "Read: Invalid path " << pathToString (p).c_str() << "[" << depth <<"]");
+ ERR << "Read: Invalid path " << pathToString (p).c_str() << "[" << depth <<"]" << std::endl;
return -1;
}
@@ -421,7 +421,7 @@
return delValueFlat (p);
if (p.size() < 2)
{
- LIMAL_SLOG_ERROR (logger, "I do not know what to delete at " << pathToString(p).c_str());
+ ERR << "I do not know what to delete at " << pathToString(p).c_str() << std::endl;
return -1;
}
std::string s (p[0]);
@@ -439,7 +439,7 @@
if (p.size() < 2)
{
- LIMAL_SLOG_ERROR (logger, "I do not know what to write to " << pathToString(p).c_str());
+ ERR << "I do not know what to write to " << pathToString(p).c_str() << std::endl;
return -1;
}
std::string s (p[0]);
@@ -475,7 +475,7 @@
if (xi == xe)
{
// not found, need to add it;
- LIMAL_SLOG_DEBUG (logger, "Write: adding recursively "<< k.c_str () << " to " << pathToString(p).c_str());
+ DBG << "Write: adding recursively "<< k.c_str () << " to " << pathToString(p).c_str() << std::endl;
IniSection s (ip, k);
container.push_back (IniContainerElement (s));
@@ -519,7 +519,7 @@
if (xi == xe)
{
///need to add a section ...
- LIMAL_SLOG_DEBUG (logger, "Adding section " << pathToString(p).c_str());
+ DBG << "Adding section " << pathToString(p).c_str() << std::endl;
// prepare it to have its property set
// create it
IniSection s (ip, k);
@@ -585,7 +585,7 @@
return s.delSection (p, depth+1);
}
//error
- LIMAL_SLOG_ERROR (logger, "Delete: Invalid path" << pathToString(p).c_str() << "[" << depth << "]");
+ ERR << "Delete: Invalid path" << pathToString(p).c_str() << "[" << depth << "]" << std::endl;
return -1;
}
else
@@ -593,7 +593,7 @@
// bottom level, massacre begins
if (xi == xe)
{
- LIMAL_SLOG_DEBUG (logger, "Can not delete " << pathToString(p).c_str() <<". Key does not exist." );
+ DBG << "Can not delete " << pathToString(p).c_str() <<". Key does not exist." << std::endl;
}
while (xi != xe)
{
@@ -605,7 +605,7 @@
int IniSection::WriteAll (const std::vector<std::string>&p, const SectionAll& in, int depth)
{
- LIMAL_SLOG_INFO (logger, "This function has not been tested cause it is not needed at the moment.");
+ INF << "This function has not been tested cause it is not needed at the moment." << std::endl;
if (depth < int(p.size ()))
{
// recurse to find the starting section
@@ -623,7 +623,7 @@
return setAllDoIt (in);
}
- LIMAL_SLOG_DEBUG (logger, "Read: Invalid path" << pathToString (p).c_str() << "[" << depth <<"]");
+ DBG << "Read: Invalid path" << pathToString (p).c_str() << "[" << depth <<"]" << std::endl;
return -1;
}
@@ -638,7 +638,7 @@
std::string kind = in.kind;
if (kind != "section")
{
- LIMAL_SLOG_ERROR (logger, "Kind should be 'section'");
+ ERR << "Kind should be 'section'" << std::endl;
return -1;
}
@@ -676,7 +676,7 @@
}
else
{
- LIMAL_SLOG_ERROR (logger, "Item in Write (.all) of unrecognized kind " << kind.c_str ());
+ ERR << "Item in Write (.all) of unrecognized kind " << kind.c_str () << std::endl;
ret = -1;
break;
}
@@ -718,13 +718,13 @@
if (xi == xe)
{
///need to add a value ...
- LIMAL_SLOG_DEBUG (logger, "Adding value " <<
+ DBG << "Adding value " <<
pathToString (p).c_str() << "=" <<
- prop.c_str ());
+ prop.c_str () << std::endl;
if (what)
{
- LIMAL_SLOG_ERROR (logger, "You must add value before changing comment/type. " <<
- pathToString (p).c_str ());
+ ERR << "You must add value before changing comment/type. " <<
+ pathToString (p).c_str () << std::endl;
return -1;
}
// prepare it to have its property set
@@ -783,7 +783,7 @@
if (xi == xe)
{
// not found, need to add it;
- LIMAL_SLOG_DEBUG (logger, "Write: adding recursively " << k.c_str () << " to " << pathToString(p).c_str());
+ DBG << "Write: adding recursively " << k.c_str () << " to " << pathToString(p).c_str() << std::endl;
IniSection s (ip, k);
container.push_back (IniContainerElement (s));
@@ -821,7 +821,7 @@
if (xi == xe)
{
- LIMAL_SLOG_DEBUG ( logger, "Can not delete " << k.c_str() << " Key does not exist." );
+ DBG << "Can not delete " << k.c_str() << " Key does not exist." << std::endl;
}
while (xi != xe)
{
@@ -850,7 +850,7 @@
return s.delValue (p, depth+1);
}
//error
- LIMAL_SLOG_ERROR (logger, "Delete: Invalid path "<< pathToString (p).c_str() << "[" << depth <<"]");
+ ERR << "Delete: Invalid path "<< pathToString (p).c_str() << "[" << depth <<"]" << std::endl;
return -1;
}
else
@@ -929,7 +929,7 @@
if (p.size()<2)
{
- LIMAL_SLOG_ERROR (logger, "I do not know what to read from " << pathToString(p).c_str());
+ ERR << "I do not know what to read from " << pathToString(p).c_str() << std::endl;
return -1;
}
std::string s (p[0]);
@@ -944,13 +944,13 @@
else if (s == "st" || s == "section_type" || s == "sectiontype")
return getSectionProp (p, out, rewrite? 1:2, 1);
- LIMAL_SLOG_ERROR (logger, "I do not know what to read from " << pathToString(p).c_str());
+ ERR << "I do not know what to read from " << pathToString(p).c_str() << std::endl;
return -1;
}
int IniSection::ReadAll (const std::vector<std::string>&p, SectionAll&out)
{
- LIMAL_SLOG_INFO (logger, "This function has not been tested cause it is not needed at the moment.");
+ INF << "This function has not been tested cause it is not needed at the moment." << std::endl;
if (p.size() >= 1 && p[0] == "all")
{
return getAll (p, out, 1);
@@ -967,7 +967,7 @@
return dirValueFlat (p, l);
if (p.size()<1)
{
- LIMAL_SLOG_ERROR (logger, "I do not know what to dir from "<< pathToString(p).c_str());
+ ERR << "I do not know what to dir from "<< pathToString(p).c_str() << std::endl;
return -1;
}
@@ -977,7 +977,7 @@
else if (s == "s" || s == "section")
return dirHelper (p, l, 1, 1);
- LIMAL_SLOG_ERROR (logger, "I do not know what to dir from "<< pathToString(p).c_str());
+ ERR << "I do not know what to dir from "<< pathToString(p).c_str() << std::endl;
return -1;
}
int IniSection::dirHelper (const std::vector<std::string>&p, StringList&out,int get_sect,int depth)
@@ -1001,7 +1001,7 @@
return s.dirHelper (p, out, get_sect, depth+1);
}
//error
- LIMAL_SLOG_DEBUG (logger, "Dir: Invalid path "<< pathToString (p).c_str() << "[" << depth <<"]");
+ DBG << "Dir: Invalid path "<< pathToString (p).c_str() << "[" << depth <<"]" << std::endl;
return -1;
}
@@ -1011,8 +1011,8 @@
IniEntryMapIterator i = values.find(n);
if (i == values.end())
{
- LIMAL_SLOG_ERROR (logger, "Internal error. Value " << n << " not found in section " << name.c_str());
- abort();
+ ERR << "Internal error. Value " << n << " not found in section " << name.c_str();
+ abort() << std::endl;
}
return (*i).second;
}
@@ -1039,7 +1039,7 @@
if (xi == xe)
{
- LIMAL_SLOG_ERROR (logger, "Internal error. Section " << n << " not found in section " << name.c_str());
+ ERR << "Internal error. Section " << n << " not found in section " << name.c_str() << std::endl;
abort();
}
return (--xe)->second->s ();
Modified: limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.h
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.h (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.h Sat Jul 17 18:38:59 2010
@@ -14,6 +14,8 @@
#ifndef IniFile_h
#define IniFile_h
+#define LIMAL_LOGGER_LOGGROUP "IniParser"
+
#include <limal/Logger.hpp>
#include <limal/String.hpp>
#include <blocxx/IntrusiveReference.hpp>
@@ -22,7 +24,7 @@
#include <map>
#include <vector>
-#define INIPARSER "IniParser"
+//#define INIPARSER "IniParser"
namespace LIMAL_NAMESPACE
{
@@ -261,7 +263,7 @@
IniSectionIndex isections;
// create Logger instance
- Logger logger;
+ //Logger logger;
/** build ivalues and isections */
void reindex ();
@@ -434,15 +436,16 @@
// IniSection ();
public:
/** explicit uninitialized constructor */
- IniSection (const char *u): IniBase (u),
- logger(INIPARSER) {}
+ IniSection (const char *u): IniBase (u)
+ //, logger(INIPARSER)
+ {}
IniSection (const blocxx::IntrusiveReference<IniParser> &p)
: IniBase (-1),
ip (p),
end_comment (), rewrite_by(-1),
- container (), ivalues (), isections (),
- logger(INIPARSER)
+ container (), ivalues (), isections ()
+ //,logger(INIPARSER)
{}
/**
@@ -453,8 +456,8 @@
IniBase (s),
ip (s.ip),
end_comment (s.end_comment), rewrite_by (s.rewrite_by),
- container (s.container),
- logger("IniParser")
+ container (s.container)
+ // , logger("IniParser")
{ reindex (); }
void operator = (const IniSection &s)
Modified: limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniParser.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniParser.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniParser.cpp Sat Jul 17 18:38:59 2010
@@ -127,13 +127,13 @@
COMPARE_OPTION (no_finalcomment_kill)
COMPARE_OPTION (read_only)
COMPARE_OPTION (flat)
- LIMAL_SLOG_ERROR (logger,"Option not implemented yet:"<< sv.c_str());
+ ERR <<"Option not implemented yet:"<< sv.c_str() << std::endl;
#undef COMPARE_OPTION
}
if (ignore_case && multiple_files)
{
- LIMAL_SLOG_ERROR (logger, "When using multiple files, ignore_case does not work");
+ ERR << "When using multiple files, ignore_case does not work" << std::endl;
ignore_case = false;
}
}
@@ -233,15 +233,15 @@
if (!pa.end.compile (entry.multiEnd,
REG_EXTENDED | (ignore_case ? REG_ICASE : 0)))
{
- LIMAL_SLOG_ERROR (logger,"Bad regexp(multiline): "<<
- entry.multiEnd.c_str());
+ ERR <<"Bad regexp(multiline): "<<
+ entry.multiEnd.c_str() << std::endl;
pa.multiline_valid = false;
}
}
else
{
- LIMAL_SLOG_ERROR (logger,"Bad regexp(multiline): "<<
- entry.multiBegin.c_str());
+ ERR <<"Bad regexp(multiline): "<<
+ entry.multiBegin.c_str() << std::endl;
}
}
@@ -250,8 +250,8 @@
{
if (pa.multiline_valid)
{
- LIMAL_SLOG_ERROR (logger,"Bad regexp(match): "<<
- entry.line.regExpr.c_str());
+ ERR <<"Bad regexp(match): "<<
+ entry.line.regExpr.c_str() << std::endl;
}
break;
}
@@ -298,7 +298,7 @@
}
#define scanner_error(format,args...) \
- LIMAL_LOG_ERROR (logger, str::form( "%s:%d " format, scanner_file.c_str (), scanner_line, ##args).c_str())
+ ERR << str::form( "%s:%d " format, scanner_file.c_str (), scanner_line, ##args).c_str() << std::endl
void StripLine (std::string&l, regmatch_t&r)
{
@@ -345,7 +345,7 @@
{
if ( !started)
{
- LIMAL_SLOG_ERROR (logger,"Parser not initialized");
+ ERR <<"Parser not initialized" << std::endl;
return -1;
}
@@ -373,7 +373,7 @@
{
section_index = j;
section_name = m[1];
- LIMAL_SLOG_DEBUG (logger, "Rewriting " << *f << " to " << section_name.c_str());
+ DBG << "Rewriting " << *f << " to " << section_name.c_str() << std::endl;
break;
}
}
@@ -384,7 +384,7 @@
{
// new file
if (scanner_start (*f))
- LIMAL_SLOG_ERROR (logger,"Cannot open " << *f);
+ ERR <<"Cannot open " << *f << std::endl;
else
{
FileDescr fdsc (*f);
@@ -399,10 +399,10 @@
if ((*ff).second.changed ())
{
if (scanner_start (*f))
- LIMAL_SLOG_ERROR (logger,"Cannot open " << *f);
+ ERR <<"Cannot open " << *f << std::endl;
else
{
- LIMAL_SLOG_DEBUG (logger, "File " << *f << " changed. Reloading.");
+ DBG << "File " << *f << " changed. Reloading." << std::endl;
FileDescr fdsc (*f);
multi_files [*f] = fdsc;
inifile.initSection (section_name, "", -1, section_index);
@@ -417,7 +417,7 @@
{
if (scanner_start (file.c_str()))
{
- LIMAL_SLOG_ERROR (logger,"Can not open " << file.c_str());
+ ERR <<"Can not open " << file.c_str() << std::endl;
return -1;
}
parse_helper(inifile);
@@ -751,7 +751,7 @@
// Therefore we do not reparse.
if (repeat_names)
{
- LIMAL_SLOG_DEBUG (logger, "Skipping possible reparse due to repeat_names");
+ DBG << "Skipping possible reparse due to repeat_names" << std::endl;
return;
}
if (multiple_files)
@@ -760,7 +760,7 @@
{
if (timestamp != getTimeStamp())
{
- LIMAL_SLOG_ERROR (logger, "Data file '" << file.c_str() << "' was changed externaly!");
+ ERR << "Data file '" << file.c_str() << "' was changed externaly!" << std::endl;
parse ();
}
}
@@ -777,7 +777,7 @@
}
if (stat(file.c_str(), &st))
{
- LIMAL_SLOG_ERROR (logger, "Unable to stat '" << file.c_str() << "': " << strerror(errno));
+ ERR << "Unable to stat '" << file.c_str() << "': " << strerror(errno) << std::endl;
return 0;
}
return st.st_mtime;
@@ -786,7 +786,7 @@
{
if ( !started)
{
- LIMAL_SLOG_ERROR (logger,"Parser not initialized");
+ ERR <<"Parser not initialized" << std::endl;
return -1;
}
@@ -794,12 +794,12 @@
std::string filename = multiple_files ? files[0] : file;
if (!inifile.isDirty())
{
- LIMAL_SLOG_DEBUG (logger, "File " << filename << " did not change. Not saving." );
+ DBG << "File " << filename << " did not change. Not saving." << std::endl;
return 0;
}
if (read_only)
{
- LIMAL_SLOG_DEBUG (logger, "Attempt to write file " << filename << " that was mounted read-only. Not saving." );
+ DBG << "Attempt to write file " << filename << " that was mounted read-only. Not saving." << std::endl;
return 0;
}
UpdateIfModif ();
@@ -819,7 +819,7 @@
std::string filename = getFileName (s.getName (), wb);
if (!s.isDirty ()) {
- LIMAL_SLOG_DEBUG (logger, "Skipping file " << filename.c_str() << " that was not changed." );
+ DBG << "Skipping file " << filename.c_str() << " that was not changed." << std::endl;
continue;
}
s.initReadBy ();
@@ -829,7 +829,7 @@
if (!of.good())
{
bugs++;
- LIMAL_SLOG_ERROR (logger,"Can not open file " << filename.c_str() << " for write");
+ ERR <<"Can not open file " << filename.c_str() << " for write" << std::endl;
continue;
}
write_helper (s, of, 0);
@@ -838,7 +838,7 @@
}
else
{
- LIMAL_SLOG_ERROR (logger,"Value "<< ci->e ().getName () <<" encountered at multifile top level" );
+ ERR <<"Value "<< ci->e ().getName () <<" encountered at multifile top level" << std::endl;
}
}
}
@@ -849,7 +849,7 @@
ofstream of(file.c_str());
if (!of.good())
{
- LIMAL_SLOG_ERROR (logger,"Can not open file " << file.c_str() << " for write");
+ ERR <<"Can not open file " << file.c_str() << " for write" << std::endl;
return -1;
}
@@ -924,7 +924,7 @@
int max = rewrites[rb].out.length () + sec.length () + 1;
char*buf = new char[max + 1];
snprintf (buf, max, rewrites[rb].out.c_str (), sec.c_str());
- LIMAL_SLOG_DEBUG (logger, "Rewriting " << sec.c_str() << " to " << buf);
+ DBG << "Rewriting " << sec.c_str() << " to " << buf << std::endl;
file = buf;
delete [] buf;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniParser.h
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniParser.h (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniParser.h Sat Jul 17 18:38:59 2010
@@ -256,7 +256,7 @@
int write_helper(IniSection&ini, std::ofstream&of,int depth);
// create Logger instance
- Logger logger;
+ //Logger logger;
IniParser(const IniParser &);
IniParser& operator=(const IniParser &);
@@ -273,7 +273,7 @@
linecomments (), comments (),
sections (), params (), rewrites (),
started (false), multiple_files (false),
- logger (INIPARSER),
+ //logger (INIPARSER),
// inifile ("toplevel")
inifile (this)
{}
Added: limal-branches/mc-devel/limal-ca-mgm/src/LogControl.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/LogControl.cpp (added)
+++ limal-branches/mc-devel/limal-ca-mgm/src/LogControl.cpp Sat Jul 17 18:38:59 2010
@@ -0,0 +1,439 @@
+/** \file LogControl.cc
+ *
+*/
+#include <iostream>
+#include <fstream>
+#include <string>
+
+#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
+//#include "zypp/base/ProfilingFormater.h"
+#include <limal/String.hpp>
+#include <limal/Date.hpp>
+#include <limal/PathInfo.hpp>
+
+using std::endl;
+
+///////////////////////////////////////////////////////////////////
+namespace ca_mgm
+{ /////////////////////////////////////////////////////////////////
+
+ ///////////////////////////////////////////////////////////////////
+ namespace log
+ { /////////////////////////////////////////////////////////////////
+
+ StdoutLineWriter::StdoutLineWriter()
+ : StreamLineWriter( std::cout )
+ {}
+
+ StderrLineWriter::StderrLineWriter()
+ : StreamLineWriter( std::cerr )
+ {}
+
+ FileLineWriter::FileLineWriter( const path::PathName & file_r, mode_t mode_r )
+ {
+ if ( file_r == path::PathName("-") )
+ {
+ _str = &std::cerr;
+ }
+ else
+ {
+ // set unbuffered write
+ std::ofstream * fstr = 0;
+ _outs.reset( (fstr = new std::ofstream( file_r.toString().c_str(), std::ios_base::app )) );
+ fstr->rdbuf()->pubsetbuf(0,0);
+ _str = &(*fstr);
+ if ( mode_r )
+ {
+ // not filesystem::chmod, as filesystem:: functions log,
+ // and this FileWriter is not yet in place.
+ ::chmod( file_r.toString().c_str(), mode_r );
+ }
+ }
+ }
+
+ /////////////////////////////////////////////////////////////////
+ } // namespace log
+ ///////////////////////////////////////////////////////////////////
+
+
+ ///////////////////////////////////////////////////////////////////
+ // LineFormater
+ ///////////////////////////////////////////////////////////////////
+ std::string LogControl::LineFormater::format( const std::string & group_r,
+ logger::LogLevel level_r,
+ const char * file_r,
+ const char * func_r,
+ int line_r,
+ const std::string & message_r )
+ {
+ static char hostname[1024];
+ static char nohostname[] = "unknown";
+ std::string now( Date::now().form( "%Y-%m-%d %H:%M:%S" ) );
+ return str::form( "%s <%d> %s(%d) [%s] %s(%s):%d %s",
+ now.c_str(), level_r,
+ ( gethostname( hostname, 1024 ) ? nohostname : hostname ),
+ getpid(),
+ group_r.c_str(),
+ file_r, func_r, line_r,
+ message_r.c_str() );
+ }
+
+ ///////////////////////////////////////////////////////////////////
+ namespace logger
+ { /////////////////////////////////////////////////////////////////
+
+ inline void putStream( const std::string & group_r, LogLevel level_r,
+ const char * file_r, const char * func_r, int line_r,
+ const std::string & buffer_r );
+
+ ///////////////////////////////////////////////////////////////////
+ //
+ // CLASS NAME : Loglinebuf
+ //
+ class Loglinebuf : public std::streambuf {
+
+ public:
+ /** */
+ Loglinebuf( const std::string & group_r, LogLevel level_r )
+ : _group( group_r )
+ , _level( level_r )
+ , _file( "" )
+ , _func( "" )
+ , _line( -1 )
+ {}
+ /** */
+ ~Loglinebuf()
+ {
+ if ( !_buffer.empty() )
+ writeout( "\n", 1 );
+ }
+
+ /** */
+ void tagSet( const char * fil_r, const char * fnc_r, int lne_r )
+ {
+ _file = fil_r;
+ _func = fnc_r;
+ _line = lne_r;
+ }
+
+ private:
+ /** */
+ virtual std::streamsize xsputn( const char * s, std::streamsize n )
+ { return writeout( s, n ); }
+ /** */
+ virtual int overflow( int ch = EOF )
+ {
+ if ( ch != EOF )
+ {
+ char tmp = ch;
+ writeout( &tmp, 1 );
+ }
+ return 0;
+ }
+ /** */
+ virtual int writeout( const char* s, std::streamsize n )
+ {
+ if ( s && n )
+ {
+ const char * c = s;
+ for ( int i = 0; i < n; ++i, ++c )
+ {
+ if ( *c == '\n' ) {
+ _buffer += std::string( s, c-s );
+ logger::putStream( _group, _level, _file, _func, _line, _buffer );
+ _buffer = std::string();
+ s = c+1;
+ }
+ }
+ if ( s < c )
+ {
+ _buffer += std::string( s, c-s );
+ }
+ }
+ return n;
+ }
+
+ private:
+ std::string _group;
+ LogLevel _level;
+ const char * _file;
+ const char * _func;
+ int _line;
+ std::string _buffer;
+ };
+
+ ///////////////////////////////////////////////////////////////////
+
+ ///////////////////////////////////////////////////////////////////
+ //
+ // CLASS NAME : Loglinestream
+ //
+ class Loglinestream {
+
+ public:
+ /** */
+ Loglinestream( const std::string & group_r, LogLevel level_r )
+ : _mybuf( group_r, level_r )
+ , _mystream( &_mybuf )
+ {}
+ /** */
+ ~Loglinestream()
+ { _mystream.flush(); }
+
+ public:
+ /** */
+ std::ostream & getStream( const char * fil_r, const char * fnc_r, int lne_r )
+ {
+ _mybuf.tagSet( fil_r, fnc_r, lne_r );
+ return _mystream;
+ }
+
+ private:
+ Loglinebuf _mybuf;
+ std::ostream _mystream;
+ };
+ ///////////////////////////////////////////////////////////////////
+
+ ///////////////////////////////////////////////////////////////////
+ //
+ // CLASS NAME : LogControlImpl
+ //
+ /** LogControl implementation (Singleton).
+ *
+ * \note There is a slight difference in using the _lineFormater and _lineWriter!
+ * \li \c _lineFormater must not be NULL (create default LogControl::LineFormater)
+ * \li \c _lineWriter is NULL if no logging is performed, this way we can pass
+ * _no_stream as logstream to the application, and avoid unnecessary formating
+ * of logliles, which would then be discarded when passed to some dummy
+ * LineWriter.
+ */
+ struct LogControlImpl
+ {
+ public:
+ bool isEnabledFor( LogLevel level_r )
+ { return (level_r <= _level); }
+
+ void setLogLevel( LogLevel level_r )
+ { _level = level_r; }
+
+ /** NULL _lineWriter indicates no loggin. */
+ void setLineWriter( const shared_ptr<LogControl::LineWriter> & writer_r )
+ { _lineWriter = writer_r; }
+
+ shared_ptr<LogControl::LineWriter> getLineWriter() const
+ { return _lineWriter; }
+
+ /** Assert \a _lineFormater is not NULL. */
+ void setLineFormater( const shared_ptr<LogControl::LineFormater> & format_r )
+ {
+ if ( format_r )
+ _lineFormater = format_r;
+ else
+ _lineFormater.reset( new LogControl::LineFormater );
+ }
+
+ void logfile( const path::PathName & logfile_r, mode_t mode_r = 0640 )
+ {
+ if ( logfile_r.empty() )
+ setLineWriter( shared_ptr<LogControl::LineWriter>() );
+ else if ( logfile_r == path::PathName( "-" ) )
+ setLineWriter( shared_ptr<LogControl::LineWriter>(new log::StderrLineWriter) );
+ else
+ setLineWriter( shared_ptr<LogControl::LineWriter>(new log::FileLineWriter(logfile_r, mode_r)) );
+ }
+
+ private:
+ std::ostream _no_stream;
+ int _level;
+
+ shared_ptr<LogControl::LineFormater> _lineFormater;
+ shared_ptr<LogControl::LineWriter> _lineWriter;
+
+ public:
+ /** Provide the log stream to write (logger interface) */
+ std::ostream & getStream( const std::string & group_r,
+ LogLevel level_r,
+ const char * file_r,
+ const char * func_r,
+ const int line_r )
+ {
+ if ( ! _lineWriter )
+ return _no_stream;
+ if ( level_r > _level )
+ return _no_stream;
+
+ if ( !_streamtable[group_r][level_r] )
+ {
+ _streamtable[group_r][level_r].reset( new Loglinestream( group_r, level_r ) );
+ }
+ return _streamtable[group_r][level_r]->getStream( file_r, func_r, line_r );
+ }
+
+ /** Format and write out a logline from Loglinebuf. */
+ void putStream( const std::string & group_r,
+ LogLevel level_r,
+ const char * file_r,
+ const char * func_r,
+ int line_r,
+ const std::string & message_r )
+ {
+ if ( _lineWriter )
+ _lineWriter->writeOut( _lineFormater->format( group_r, level_r,
+ file_r, func_r, line_r,
+ message_r ) );
+ }
+
+ private:
+ typedef shared_ptr<Loglinestream> StreamPtr;
+ typedef std::map<LogLevel,StreamPtr> StreamSet;
+ typedef std::map<std::string,StreamSet> StreamTable;
+ /** one streambuffer per group and level */
+ StreamTable _streamtable;
+
+ private:
+ /** Singleton ctor.
+ * No logging per default, unless enabled via $ZYPP_LOGFILE.
+ */
+ LogControlImpl()
+ : _no_stream( NULL )
+ , _level( E_INFO )
+ , _lineFormater( new LogControl::LineFormater )
+ {
+ if ( getenv("ZYPP_LOGFILE") )
+ logfile( getenv("ZYPP_LOGFILE") );
+ }
+
+ public:
+ /** The LogControlImpl singleton
+ * \note As most dtors log, it is inportant that the
+ * LogControlImpl instance is the last static variable
+ * destructed. At least destucted after all statics
+ * which log from their dtor.
+ */
+ static LogControlImpl instance;
+ };
+ ///////////////////////////////////////////////////////////////////
+
+ // 'THE' LogControlImpl singleton
+ LogControlImpl LogControlImpl::instance;
+
+ ///////////////////////////////////////////////////////////////////
+
+ /** \relates LogControlImpl Stream output */
+ inline std::ostream & operator<<( std::ostream & str, const LogControlImpl & obj )
+ {
+ return str << "LogControlImpl";
+ }
+
+ ///////////////////////////////////////////////////////////////////
+ //
+ // Access from logger::
+ //
+ ///////////////////////////////////////////////////////////////////
+
+ std::ostream & getStream( const char * group_r,
+ LogLevel level_r,
+ const char * file_r,
+ const char * func_r,
+ const int line_r )
+ {
+ return LogControlImpl::instance.getStream( group_r,
+ level_r,
+ file_r,
+ func_r,
+ line_r );
+ }
+
+ /** That's what Loglinebuf calls. */
+ inline void putStream( const std::string & group_r, LogLevel level_r,
+ const char * file_r, const char * func_r, int line_r,
+ const std::string & buffer_r )
+ {
+ LogControlImpl::instance.putStream( group_r, level_r,
+ file_r, func_r, line_r,
+ buffer_r );
+ }
+
+ bool isEnabledFor( logger::LogLevel level_r )
+ { return LogControlImpl::instance.isEnabledFor( level_r ); }
+
+ void setLogLevel( logger::LogLevel level_r )
+ { LogControlImpl::instance.setLogLevel( level_r); }
+
+ std::string logLevelToString( LogLevel level_r )
+ {
+ switch (level_r)
+ {
+ case E_FATAL:
+ return "FATAL";
+ break;
+ case E_ERROR:
+ return "ERROR";
+ break;
+ case E_WARN:
+ return "WARN";
+ break;
+ case E_INFO:
+ return "INFO";
+ break;
+ case E_DEBUG:
+ return "DEBUG";
+ break;
+ }
+ return "UNKNOWN";
+ }
+
+ /////////////////////////////////////////////////////////////////
+ } // namespace logger
+ ///////////////////////////////////////////////////////////////////
+
+ ///////////////////////////////////////////////////////////////////
+ //
+ // CLASS NAME : LogControl
+ // Forward to LogControlImpl singleton.
+ //
+ ///////////////////////////////////////////////////////////////////
+
+ using logger::LogControlImpl;
+
+ void LogControl::logfile( const path::PathName & logfile_r )
+ { LogControlImpl::instance.logfile( logfile_r ); }
+
+ void LogControl::logfile( const path::PathName & logfile_r, mode_t mode_r )
+ { LogControlImpl::instance.logfile( logfile_r, mode_r ); }
+
+ shared_ptr<LogControl::LineWriter> LogControl::getLineWriter() const
+ { return LogControlImpl::instance.getLineWriter(); }
+
+ void LogControl::setLineWriter( const shared_ptr<LineWriter> & writer_r )
+ { LogControlImpl::instance.setLineWriter( writer_r ); }
+
+ void LogControl::setLineFormater( const shared_ptr<LineFormater> & formater_r )
+ { LogControlImpl::instance.setLineFormater( formater_r ); }
+
+ void LogControl::logNothing()
+ { LogControlImpl::instance.setLineWriter( shared_ptr<LineWriter>() ); }
+
+ void LogControl::logToStdErr()
+ { LogControlImpl::instance.setLineWriter( shared_ptr<LineWriter>( new log::StderrLineWriter ) ); }
+
+ bool LogControl::isEnabledFor( logger::LogLevel level_r )
+ { return LogControlImpl::instance.isEnabledFor( level_r ); }
+
+ void LogControl::setLogLevel( logger::LogLevel level_r )
+ { LogControlImpl::instance.setLogLevel( level_r); }
+
+ /******************************************************************
+ **
+ ** FUNCTION NAME : operator<<
+ ** FUNCTION TYPE : std::ostream &
+ */
+ std::ostream & operator<<( std::ostream & str, const LogControl & obj )
+ {
+ return str << LogControlImpl::instance;
+ }
+
+ /////////////////////////////////////////////////////////////////
+} // namespace ca_mgm
+///////////////////////////////////////////////////////////////////
Modified: limal-branches/mc-devel/limal-ca-mgm/src/Makefile.am
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/Makefile.am (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/Makefile.am Sat Jul 17 18:38:59 2010
@@ -22,7 +22,7 @@
ValueIntCheck.cpp \
ValueCheck.cpp \
Exception.cpp \
- Logger.cpp \
+ LogControl.cpp \
PathName.cpp \
PathInfo.cpp \
PathUtils.cpp \
Modified: limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp Sat Jul 17 18:38:59 2010
@@ -46,18 +46,28 @@
// -------------------------------------------------------------------
#define LOGIT(level,message) \
-LIMAL_SLOG(Logger("ca-mgm"), level, message)
+LIMAL_LOGGER_LOG("ca-mgm", level) << message << std::endl
#define LOGIT_DEBUG(message) \
- LIMAL_SLOG(Logger("ca-mgm"), blocxx::E_DEBUG_LEVEL, message)
+ _DBG("ca-mgm") << message << std::endl
#define LOGIT_INFO(message) \
- LIMAL_SLOG(Logger("ca-mgm"), blocxx::E_INFO_LEVEL, message)
+ _INF("ca-mgm") << message << std::endl
#define LOGIT_ERROR(message) \
- LIMAL_SLOG(Logger("ca-mgm"), blocxx::E_ERROR_LEVEL, message)
+ _ERR("ca-mgm") << message << std::endl
#define LOGIT_DEBUG_STRINGARRAY(text, stringarray) \
+ if( ca_mgm::logger::isEnabledFor(ca_mgm::logger::E_DEBUG) ) { \
+ uint s = stringarray.size(); \
+ for(uint i = 0; i < s; i++) { \
+ _DBG("ca-mgm") << text << "(" << (i+1) << "/" << s << "):" \
+ << stringarray[i] << std::endl; \
+ } \
+ } \
+
+/*
+#define LOGIT_DEBUG_STRINGARRAY(text, stringarray) \
Logger d("ca-mgm"); \
if(d.isEnabledFor("DEBUG")) { \
uint s = stringarray.size(); \
@@ -68,6 +78,7 @@
<< stringarray[i]); \
} \
}
+*/
// -------------------------------------------------------------------
Added: limal-branches/mc-devel/limal-ca-mgm/src/limal/LogControl.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/LogControl.hpp (added)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/LogControl.hpp Sat Jul 17 18:38:59 2010
@@ -0,0 +1,166 @@
+/** \file limal/LogControl.h
+ *
+*/
+#ifndef LIMAL_LOGCONTROL_H
+#define LIMAL_LOGCONTROL_H
+
+#include <iosfwd>
+
+#include <limal/Logger.hpp>
+#include <limal/PtrTypes.hpp>
+#include <limal/PathName.hpp>
+
+///////////////////////////////////////////////////////////////////
+namespace ca_mgm
+{ /////////////////////////////////////////////////////////////////
+
+ ///////////////////////////////////////////////////////////////////
+ namespace log
+ { /////////////////////////////////////////////////////////////////
+
+ /** If you want to log the (formated) loglines by yourself,
+ * derive from this, and overload \c writeOut.
+ * Expect \a formated_r to be a formated log line without trailing \c NL.
+ * Ready to be written to the log.
+ */
+ struct LineWriter
+ {
+ virtual void writeOut( const std::string & /*formated_r*/ )
+ {}
+ virtual ~LineWriter()
+ {}
+ };
+
+ /** Base class for ostream based \ref LineWriter */
+ struct StreamLineWriter : public LineWriter
+ {
+ StreamLineWriter( std::ostream & str_r ) : _str( &str_r ) {}
+
+ virtual void writeOut( const std::string & formated_r )
+ { (*_str) << formated_r << std::endl; }
+
+ protected:
+ StreamLineWriter() : _str( 0 ) {}
+ std::ostream *_str;
+ };
+
+ /** \ref LineWriter to stdout. */
+ struct StdoutLineWriter : public StreamLineWriter
+ {
+ StdoutLineWriter();
+ };
+
+ /** \ref LineWriter to stderr. */
+ struct StderrLineWriter : public StreamLineWriter
+ {
+ StderrLineWriter();
+ };
+
+ /** \ref LineWriter to file.
+ * If \c mode_r is not \c 0, \c file_r persissions are changed
+ * accordingly. \c "-" logs to \c cerr.
+ */
+ struct FileLineWriter : public StreamLineWriter
+ {
+ FileLineWriter( const path::PathName & file_r, mode_t mode_r = 0 );
+ protected:
+ shared_ptr<void> _outs;
+ };
+
+ /////////////////////////////////////////////////////////////////
+ } // namespace log
+ ///////////////////////////////////////////////////////////////////
+
+
+
+ ///////////////////////////////////////////////////////////////////
+ //
+ // CLASS NAME : LogControl
+ //
+ /** Maintain logfile related options.
+ * \note A Singleton using a Singleton implementation class,
+ * that's why there is no _pimpl like in other classes.
+ */
+ class LogControl
+ {
+ friend std::ostream & operator<<( std::ostream & str, const LogControl & obj );
+
+ public:
+ /** Singleton access. */
+ static LogControl instance()
+ { return LogControl(); }
+
+
+ /** \see \ref log::LineWriter */
+ typedef log::LineWriter LineWriter;
+
+ /** If you want to format loglines by yourself,
+ * derive from this, and overload \c format.
+ * Return a formated logline without trailing \c NL.
+ * Ready to be written to the log.
+ */
+ struct LineFormater
+ {
+ virtual std::string format( const std::string & /*group_r*/,
+ logger::LogLevel /*level_r*/,
+ const char * /*file_r*/,
+ const char * /*func_r*/,
+ int /*line_r*/,
+ const std::string & /*message_r*/ );
+ virtual ~LineFormater() {}
+ };
+
+ public:
+ /** Assign a LineFormater.
+ * If you want to format loglines by yourself. NULL installs the
+ * default formater.
+ */
+ void setLineFormater( const shared_ptr<LineFormater> & formater_r );
+
+ public:
+ /** Set path for the logfile.
+ * Permission for logfiles is set to 0640 unless an explicit mode_t
+ * value is given. An empty pathname turns off logging. <tt>"-"</tt>
+ * logs to std::err.
+ * \throw if \a logfile_r is not usable.
+ */
+ void logfile( const path::PathName & logfile_r );
+ void logfile( const path::PathName & logfile_r, mode_t mode_r );
+
+ /** Turn off logging. */
+ void logNothing();
+
+ /** Log to std::err. */
+ void logToStdErr();
+
+ /** return true is the level_r would be logged */
+ bool isEnabledFor( logger::LogLevel level_r );
+
+ /** set the new maximal log level */
+ void setLogLevel( logger::LogLevel level_r );
+
+ public:
+ /** Get the current LineWriter */
+ shared_ptr<LineWriter> getLineWriter() const;
+
+ /** Assign a LineWriter.
+ * If you want to log the (formated) loglines by yourself.
+ * NULL turns off logging (same as logNothing)
+ * \see \ref log::LineWriter
+ */
+ void setLineWriter( const shared_ptr<LineWriter> & writer_r );
+
+ private:
+ /** Default ctor: Singleton */
+ LogControl()
+ {}
+ };
+ ///////////////////////////////////////////////////////////////////
+
+ /** \relates LogControl Stream output */
+ std::ostream & operator<<( std::ostream & str, const LogControl & obj );
+
+ /////////////////////////////////////////////////////////////////
+} // namespace ca_mgm
+///////////////////////////////////////////////////////////////////
+#endif // LIMAL_LOGCONTROL_H
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/Logger.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/Logger.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/Logger.hpp Sat Jul 17 18:38:59 2010
@@ -1,591 +1,113 @@
/*---------------------------------------------------------------------\
+| ____ _ __ __ ___ |
+| |__ / \ / / . \ . \ |
+| / / \ V /| _/ _/ |
+| / /__ | | | | | | |
+| /_____||_| |_| |_| |
| |
-| _ _ _ _ __ _ |
-| | | | | | \_/ | / \ | | |
-| | | | | | |_| | / /\ \ | | |
-| | |__ | | | | | | / ____ \ | |__ |
-| |____||_| |_| |_|/ / \ \|____| |
-| |
-| core library |
-| |
-| (C) SUSE Linux Products GmbH |
-\----------------------------------------------------------------------/
-
- File: Logger.hpp
-
- Author: Marius Tomaschewski
- Maintainer: Marius Tomaschewski
-
-/-*/
-/**
- * @file Logger.hpp
- * @brief LiMaL logging utilities.
- *
- * The LiMaL extensions to the BloCxx logging framework.
- */
-#ifndef LIMAL_LOGGER_HPP
-#define LIMAL_LOGGER_HPP
-
-#include <blocxx/Array.hpp>
-#include <blocxx/String.hpp>
-#include <blocxx/StringStream.hpp>
-#include <blocxx/LogConfig.hpp>
-#include <blocxx/Logger.hpp>
-#include <blocxx/CommonFwd.hpp>
-#include <blocxx/LogAppender.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <limal/ca-mgm/config.h>
-#include <stdint.h>
-
-
-/**
- * @brief Generic logging macro LIMAL_LOG
- *
- * This macro write a log message with the given level.
+\---------------------------------------------------------------------*/
+/** \file zypp/base/Logger.h
*
- * @param logger a Logger object
- * @param level a log level
- * @param message a log message
- *
- * @code
- * ca_mgm::Logger lg("MyComponentName");
- * LIMAL_LOG(lg, DEBUG, "the log message");
- * LIMAL_LOG(lg, DEBUG, blocxx::Format("log message nr %1", 2));
- * @endcode
- */
-#define LIMAL_LOG(logger, level, message) \
-do \
-{ \
- int err = errno; \
- if( (logger).isEnabledFor(level)) \
- { \
- (logger).logMessage((level), (message), \
- __FILE__, __LINE__, \
- BLOCXX_LOGGER_PRETTY_FUNCTION); \
- } \
- errno = err; \
-} while(0) // note the missing semicolon
-
-
-/**
- * @brief Generic logging macro LIMAL_SLOG allowing
- * formating using a stream output operator <<.
- *
- * This macro write a log message with the given level.
- *
- * @param logger a Logger object
- * @param level a log level
- * @param message a log message
- *
- * @code
- * ca_mgm::Logger lg("MyComponentName");
- * LIMAL_SLOG(lg, DEBUG, "log message nr " << 3);
- * @endcode
- */
-#define LIMAL_SLOG(logger, level, message) \
-do \
-{ \
- int err = errno; \
- if( (logger).isEnabledFor(level)) \
- { \
- blocxx::OStringStream _buf; \
- _buf << message; \
- (logger).logMessage((level), _buf.toString(), \
- __FILE__, __LINE__, \
- BLOCXX_LOGGER_PRETTY_FUNCTION); \
- } \
- errno = err; \
-} while(0) // note the missing semicolon
-
-
-/**
- * @brief Logging macro LIMAL_LOG_FATAL.
- *
- * This macro write a log message with the log level FATAL.
- *
- * @param logger a Logger object
- * @param logMessage the log message
- *
- * @code
- * ca_mgm::Logger lg("MyComponentName");
- * LIMAL_LOG_FATAL(lg, "the log message");
- * LIMAL_SLOG_FATAL(lg, "log message " << 42);
- * @endcode
- */
-#define LIMAL_LOG_FATAL(logger, logMessage) \
- LIMAL_LOG(logger, blocxx::E_FATAL_ERROR_LEVEL, logMessage)
-
-#define LIMAL_SLOG_FATAL(logger, logMessage) \
- LIMAL_SLOG(logger, blocxx::E_FATAL_ERROR_LEVEL, logMessage)
-
-
-/**
- * @brief Logging macro LIMAL_LOG_ERROR
- *
- * This macro write a log message with the log level ERROR
- *
- * @param logger a Logger object
- * @param logMessage the log message
- *
- * @code
- * ca_mgm::Logger lg("MyComponentName");
- * LIMAL_LOG_ERROR(lg, "the log message");
- * LIMAL_SLOG_ERROR(lg, "log message " << 42);
- * @endcode
- */
-#define LIMAL_LOG_ERROR(logger, logMessage) \
- LIMAL_LOG(logger, blocxx::E_ERROR_LEVEL, logMessage)
-
-#define LIMAL_SLOG_ERROR(logger, logMessage) \
- LIMAL_SLOG(logger, blocxx::E_ERROR_LEVEL, logMessage)
-
-
-/**
- * @brief Logging macro LIMAL_LOG_INFO
- *
- * This macro write a log message with the log level INFO
- *
- * @param logger a Logger object
- * @param logMessage the log message
- *
- * @code
- * ca_mgm::Logger lg("MyComponentName");
- * LIMAL_LOG_INFO(lg, "the log message");
- * LIMAL_SLOG_INFO(lg, "log message " << 42);
- * @endcode
- */
-#define LIMAL_LOG_INFO(logger, logMessage) \
- LIMAL_LOG(logger, blocxx::E_INFO_LEVEL, logMessage)
-
-#define LIMAL_SLOG_INFO(logger, logMessage) \
- LIMAL_SLOG(logger, blocxx::E_INFO_LEVEL, logMessage)
-
-
-/**
- * @brief Logging macro LIMAL_LOG_DEBUG
- *
- * This macro write a log message with the log level DEBUG
- *
- * @param logger a Logger object
- * @param logMessage the log message
- *
- * @code
- * ca_mgm::Logger lg("MyComponentName");
- * LIMAL_LOG_DEBUG(lg, "the log message");
- * LIMAL_SLOG_DEBUG(lg, "log message " << 42);
- * @endcode
- */
-#define LIMAL_LOG_DEBUG(logger, logMessage) \
- LIMAL_LOG(logger, blocxx::E_DEBUG_LEVEL, logMessage)
-
-#define LIMAL_SLOG_DEBUG(logger, logMessage) \
- LIMAL_SLOG(logger, blocxx::E_DEBUG_LEVEL, logMessage)
-
-
-namespace LIMAL_NAMESPACE
-{
-
-/**
- * @brief LiMaL library logger class.
- *
- * The LiMaL logger class provides several static functions allowing to
- * create standard logger types (file, cerr, syslog), to set them as the
- * global/default or per thread logger in the blocxx library as well as
- * to retrieve them.
- *
- * Each instance of the LiMaL logger contains a optional local component
- * name, that is passed with every log message to the current logger and
- * used instead of the default component name, that is set in the logger.
- *
- * This allows to use different component names at different places of
- * the application and/or library, e.g. each plugin logs messages using
- * own component name.
- *
- * The LiMaL logger instance can be used directly or with the LIMAL_LOG(),
- * LIMAL_SLOG() and derived macros.
- *
- * @par BloCxx Log Message Format
- *
- * BloCxx supports configuration of the log message format using printf()
- * style conversion specifiers.
- *
- * Available conversion specifiers:
- * @li @c %%c The component (e.g. myapp)
- * @li @c %%d The date. May be followed by a date format specifier enclosed
- * between braces. Examples:
- * @code
- * "%d{%H:%M:%S}"
- * "%d{%d %b %Y %H:%M:%S}"
- * @endcode
- * If no date format specifier is given then ISO8601 format is
- * assumed. For more information of the date format specifiers,
- * lookup the documentation for the strftime() function found
- * in the \<ctime\> header.
- * The only addition is %%Q, which is the number of milliseconds.
- * @li @c %%F The file name
- * @li @c %%l The filename and line number. e.g. file.cpp(100)
- * @li @c %%L The line number
- * @li @c %%M The method name where the logging request was issued
- * (only works on C++ compilers which support
- * @c __PRETTY_FUNCTION__ or C99's @c __func__)
- * @li @c %%m The message
- * @li @c %%e The message as XML CDATA. This includes the @c "<![CDATA["
- * and ending @c "]]>"
- * @li @c %%n The platform dependent line separator character (\\n) or
- * characters (\\r\\n)
- * @li @c %%P The process id
- * @li @c %%p Category, aka level, aka priority
- * @li @c %%r The number of milliseconds elapsed since the start of the
- * application until the creation of the logging event
- * @li @c %%t The thread id
- * @li @c %%%% The \% character.
- * @li @c \\n The newline character
- * @li @c \\t The tab character
- * @li @c \\r The linefeed character
- * @li @c \\\\ The \\ character
- * @li @c \\x<hexDigits> The character represented in hexadecimal.
- *
- * It is possible to change the minimum field width, the maximum field width
- * and justification. The optional format modifier is placed between the
- * percent sign and the conversion character.
- *
- * The first optional format modifier is the left justification flag which is
- * the minus (-) character. The optional minimum field width modifier follows.
- * It is an integer that represents the minimum number of characters to output.
- * If the data item requires fewer characters, it is padded with spaces on
- * either the left or the right, according to the justification flag. If the
- * data item is larger than the minimum field width, the field is expanded to
- * accommodate the data.
- *
- * The maximum field width modifier is designated by a period followed by a
- * decimal constant. If the data item is longer than the maximum field, then
- * the extra characters are removed from the beginning of the data item (by
- * default), or from the end if the left justification flag was specified.
- *
- * Examples:
- *
- * Log4j TTCC layout:
- * @code "%r [%t] %-5p %c - %m" @endcode
- *
- * Similar to TTCC, but with some fixed size fields:
- * @code "%-6r [%15.15t] %-5p %30.30c - %m" @endcode
- *
- * The TTCC message format is defined in the
- * @c blocxx::LogAppender::STR_TTCC_MESSAGE_FORMAT constant.
- */
-class Logger
-{
-public:
- /**
- * @brief Log level constants.
- *
- * Possible category names and their corresponding log levels are:
- *
- * @li @code "FATAL" blocxx::E_FATAL_ERROR_LEVEL @endcode
- * @li @code "ERROR" blocxx::E_ERROR_LEVEL @endcode
- * @li @code "INFO" blocxx::E_INFO_LEVEL @endcode
- * @li @code "DEBUG" blocxx::E_DEBUG_LEVEL @endcode
- */
- typedef blocxx::ELogLevel ELogLevel;
-
- /**
- * @brief Create a new logger reference to a CerrLogger object.
- *
- * A application can use this function to create a logger reference
- * pointing to a CerrLogger. The resulting reference object can be
- * passed to the setDefaultLogger() or setThreadLogger() methods.
- *
- * @code
- * std::vector<blocxx::String> components;
- * components.push_back("*");
- *
- * std::vector<blocxx::String> categories;
- * categories.push_back("*");
- *
- * blocxx::LoggerRef l = ca_mgm::Logger::createCerrLogger(
- * "main", components, categories,
- * "%r [%d] %p %c - %m"
- * );
- *
- * ca_mgm::Logger::setDefaultLogger(l);
- * @endcode
- *
- * @param component The default component name (application name).
- * @param components A filter list with component names that should
- * be logged or "*" to log all components.
- * @param categories A filter list with category names that should
- * be logged or "*" for all categories. Category
- * names are "FATAL", "ERROR", "INFO", "DEBUG".
- * @param messageFormat A log message format string or empty string
- * for default format defined by the logger.
- * @return return A logger reference pointing to the CerrLogger.
- */
- static blocxx::LoggerRef createCerrLogger(
- const blocxx::String &component,
- const blocxx::StringArray &components,
- const blocxx::StringArray &categories,
- const blocxx::String &messageFormat
- );
-
- /**
- * @brief Create a new logger reference to a SyslogLogger object.
- *
- * A application can use this function to create a logger reference
- * pointing to a SyslogLogger. The resulting reference object can be
- * passed to the setDefaultLogger() or setThreadLogger() methods.
- *
- * @code
- * std::vector<blocxx::String> components(1, "*");
- * std::vector<blocxx::String> categories(1, "*");
- *
- * blocxx::LoggerRef l = ca_mgm::Logger::createSyslogLogger(
- * "main", components, categories,
- * "%r [%d] %p %c - %m", "myApp", "user"
- * );
- *
- * ca_mgm::Logger::setDefaultLogger(l);
- * @endcode
- *
- * @param component The default component name (application name).
- * @param components A filter list with component names that should
- * be logged or "*" to log all components.
- * @param categories A filter list with category names that should
- * be logged or "*" for all categories. Category
- * names are "FATAL", "ERROR", "INFO", "DEBUG".
- * @param messageFormat A log message format string or empty string
- * for default format defined by the logger.
- * @param identity The syslog identity string.
- * @param facility The syslog facility to use ("user", "daemon", ...)
- * @return return A logger reference pointing to the SyslogLogger.
- */
- static blocxx::LoggerRef createSyslogLogger(
- const blocxx::String &component,
- const blocxx::StringArray &components,
- const blocxx::StringArray &categories,
- const blocxx::String &messageFormat,
- const blocxx::String &identity,
- const blocxx::String &facility
- );
-
-
- /**
- * @brief Create a new logger reference to a FileLogger object.
- *
- * A application can use this function to create a logger reference
- * pointing to a FileLogger. The resulting reference object can be
- * passed to the setDefaultLogger() or setThreadLogger() methods.
- *
- * @code
- * std::vector<blocxx::String> components(1, "*");
- * std::vector<blocxx::String> categories(1, "*");
- *
- * blocxx::LoggerRef l = ca_mgm::Logger::createFileLogger(
- * "main", components, categories,
- * "%r [%d] %p %c - %m",
- * "/var/log/limal.log", 1024, 2
- * );
- *
- * ca_mgm::Logger::setDefaultLogger(l);
- * @endcode
- *
- * @param component The default component name (application name).
- * @param components A filter list with component names that should
- * be logged or "*" to log all components.
- * @param categories A filter list with category names that should
- * be logged or "*" for all categories. Category
- * names are "FATAL", "ERROR", "INFO", "DEBUG".
- * @param messageFormat A log message format string or empty string
- * for default format defined by the logger.
- * @param filename The name of the log file.
- * @param maxLogFileSize The maximal file size in kb. 0 disables
- * automatic log file rotation.
- * @param maxBackupIndex Maximal count of backup log files.
- * @return return A logger reference pointing to the FileLogger.
- */
- static blocxx::LoggerRef createFileLogger(
- const blocxx::String &component,
- const blocxx::StringArray &components,
- const blocxx::StringArray &categories,
- const blocxx::String &messageFormat,
- const blocxx::String &filename,
- uint64_t maxLogFileSize = 0,
- uint32_t maxBackupIndex = 0
- );
-
- /**
- * @brief Create a new logger reference to a NullLogger object.
- *
- * A application can use this function to create a logger reference
- * pointing to a NullLogger. The resulting reference object can be
- * passed to the setDefaultLogger() or setThreadLogger() methods.
- *
- * @code
- * std::vector<blocxx::String> components(1, "*");
- * std::vector<blocxx::String> categories(1, "*");
- *
- * blocxx::LoggerRef l = ca_mgm::Logger::createNullLogger(
- * "main", components, categories,
- * "%r [%d] %p %c - %m"
- * );
- *
- * ca_mgm::Logger::setDefaultLogger(l);
- * @endcode
- *
- * @param component The default component name (application name).
- * @param components A filter list with component names that should
- * be logged or "*" to log all components.
- * @param categories A filter list with category names that should
- * be logged or "*" for all categories. Category
- * names are "FATAL", "ERROR", "INFO", "DEBUG".
- * @param messageFormat A log message format string or empty string
- * for default format defined by the logger.
- * @return return A logger reference pointing to the NullLogger.
- */
- static blocxx::LoggerRef createNullLogger(
- const blocxx::String &component,
- const blocxx::StringArray &components,
- const blocxx::StringArray &categories,
- const blocxx::String &messageFormat
- );
-
- /**
- * Create a new Logger instance.
- *
- * If no instance component is specified, then the default
- * component of the registered logger is used instead.
- *
- * @param component instance local component name
- */
- Logger(const blocxx::String &component = "");
-
-
- /**
- * Destroy a Logger instance
- */
- ~Logger();
-
-
- /**
- * Set the default logger.
- *
- * @param ref Reference to the new logger
- * @returns true if the logger was successfully set,
- * false if ref doesn't contain any logger.
- */
- inline static bool
- setDefaultLogger(const blocxx::LoggerRef &ref)
- {
- return Logger::setDefaultFromLoggerRef(ref);
- }
-
- /**
- * Set a per thread logger that overrides the default one.
- *
- * @param ref Reference to the new logger
- * @returns true if the logger was successfully set,
- * false if ref doesn't contain any logger.
- * @throws AssertException if try to put the logger
- * into a thread local storage area failed.
- */
- inline static bool
- setThreadLogger(const blocxx::LoggerRef &ref)
- {
- return Logger::setThreadFromLoggerRef(ref);
- }
-
- /**
- * Returns a copy of default logger (LoggerRef).
- * @returns a LoggerRef to the default logger
- */
- inline static blocxx::LoggerRef getDefaultLogger()
- {
- return Logger::getDefaultAsLoggerRef();
- }
-
- /**
- * Get a copy of the per thread logger (LoggerRef)
- * or if not set, the default one.
- *
- * @returns a LoggerRef to the current logger
- */
- inline static blocxx::LoggerRef getCurrentLogger()
- {
- return Logger::getCurrentAsLoggerRef();
- }
-
- /**
- * log a message with the specified level inclusive
- * the component name associated with the instance
- * if not empty.
- *
- * @param level a log level
- * @param message a log message
- * @param filename a file name (__FILE__)
- * @param fileline a line number (__LINE__)
- * @param methodname method name (__func__)
- */
- void
- logMessage(ELogLevel level,
- const blocxx::String &message,
- const char *filename = 0,
- int fileline = -1,
- const char *methodname = 0) const;
-
-
- /**
- * log a message using the specified category (a log
- * level name) inclusive component name associated
- * with the instance if not empty.
- *
- * @param category a log category
- * @param message a log message
- * @param filename a file name (__FILE__)
- * @param fileline a line number (__LINE__)
- * @param methodname method name (__func__)
- */
- void
- logMessage(const blocxx::String &category,
- const blocxx::String &message,
- const char *filename = 0,
- int fileline = -1,
- const char *methodname = 0) const;
-
-
- /**
- * Check if the logger is enabled for given level.
- *
- * @param level a log level
- * @return true if enabled or false
- */
- bool
- isEnabledFor(const ELogLevel level) const;
-
-
- /**
- * Check if the logger is enabled for given category
- * (named LogLevel, but not limited to).
- *
- * @param category a log category
- * @return true if enabled or false
- */
- bool
- isEnabledFor(const blocxx::String &category) const;
-
-
-private:
- static bool setDefaultFromLoggerRef(const blocxx::LoggerRef &ref);
- static bool setThreadFromLoggerRef(const blocxx::LoggerRef &ref);
- static blocxx::LoggerRef getDefaultAsLoggerRef();
- static blocxx::LoggerRef getCurrentAsLoggerRef();
-
- blocxx::String m_component;
-
-};
-
-
-} // LIMAL_NAMESPACE
-
-
-#endif // LIMAL_LOGGER_HPP
-/* vim: set ts=8 sts=8 sw=8 ai noet: */
-
+*/
+#ifndef LIMAL_LOGGER_H
+#define LIMAL_LOGGER_H
+
+#include <iosfwd>
+#include <cstring>
+#include <limal/String.hpp>
+
+/** \defgroup LIMAL_LOGGER_MACROS LIMAL_LOGGER_MACROS
+ * Convenience macros for logging.
+ *
+ * The macros finaly call @ref getStream, providing appropriate arguments,
+ * to return the log stream.
+ *
+ * @code
+ * _DBG("foo") << ....
+ * @endcode
+ * Logs a debug message for group @a "foo".
+ *
+ * @code
+ * #undef LIMAL_LOGGER_LOGGROUP
+ * #define LIMAL_LOGGER_LOGGROUP "foo"
+ *
+ * DBG << ....
+ * @endcode
+ * Defines group @a "foo" as default for log messages and logs a
+ * debug message.
+ */
+/*@{*/
+
+#ifndef LIMAL_LOGGER_LOGGROUP
+/** Default log group is ca_mgm. */
+#define LIMAL_LOGGER_LOGGROUP "ca_mgm"
+#endif
+
+#define DBG _DBG( LIMAL_LOGGER_LOGGROUP )
+#define INF _INF( LIMAL_LOGGER_LOGGROUP )
+#define WAR _WAR( LIMAL_LOGGER_LOGGROUP )
+#define ERR _ERR( LIMAL_LOGGER_LOGGROUP )
+#define FAT _FAT( LIMAL_LOGGER_LOGGROUP )
+
+#define _DBG(GROUP) LIMAL_LOGGER_LOG( GROUP, ca_mgm::logger::E_DEBUG )
+#define _INF(GROUP) LIMAL_LOGGER_LOG( GROUP, ca_mgm::logger::E_INFO )
+#define _WAR(GROUP) LIMAL_LOGGER_LOG( GROUP, ca_mgm::logger::E_WARN )
+#define _ERR(GROUP) LIMAL_LOGGER_LOG( GROUP, ca_mgm::logger::E_ERROR )
+#define _FAT(GROUP) LIMAL_LOGGER_LOG( GROUP, ca_mgm::logger::E_FATAL )
+
+#define _BASEFILE ( *__FILE__ == '/' ? strrchr( __FILE__, '/' ) + 1 : __FILE__ )
+
+/** Actual call to @ref getStream. */
+#define LIMAL_LOGGER_LOG(GROUP,LEVEL) \
+ ca_mgm::logger::getStream( GROUP, LEVEL, _BASEFILE, __FUNCTION__, __LINE__ )
+
+/*@}*/
+
+///////////////////////////////////////////////////////////////////
+namespace ca_mgm
+{ /////////////////////////////////////////////////////////////////
+
+ ///////////////////////////////////////////////////////////////////
+ namespace logger
+ { /////////////////////////////////////////////////////////////////
+
+ /** Definition of log levels.
+ *
+ * @see getStream
+ */
+ enum LogLevel {
+ E_FATAL = 1,
+ E_ERROR = 2,
+ E_WARN = 3,
+ E_INFO = 4,
+ E_DEBUG = 5
+ };
+ extern std::string logLevelToString( LogLevel level_r );
+
+ /** Return a log stream to write on.
+ *
+ * The returned log stream is determined by @a group_r and
+ * @a level_r. The remaining arguments @a file_r, @a func_r
+ * and @a line_r are expected to denote the location in the
+ * source code that issued the message.
+ *
+ * @note You won't call @ref getStream directly, but use the
+ * @ref LIMAL_LOGGER_MACROS.
+ */
+ extern std::ostream & getStream( const char * group_r,
+ LogLevel level_r,
+ const char * file_r,
+ const char * func_r,
+ const int line_r );
+ extern bool isEnabledFor( LogLevel level_r );
+
+ extern void setLogLevel( LogLevel level_r );
+
+ /////////////////////////////////////////////////////////////////
+ } // namespace logger
+ ///////////////////////////////////////////////////////////////////
+
+ /////////////////////////////////////////////////////////////////
+} // namespace ca_mgm
+///////////////////////////////////////////////////////////////////
+#endif // LIMAL_LOGGER_H
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/Makefile.am
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/Makefile.am (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/Makefile.am Sat Jul 17 18:38:59 2010
@@ -14,6 +14,7 @@
CallbackBase.hpp \
Exception.hpp \
Logger.hpp \
+ LogControl.hpp \
PathName.hpp \
PathInfo.hpp \
PathUtils.hpp \
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA1.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA1.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA1.cc Sat Jul 17 18:38:59 2010
@@ -1,17 +1,15 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
+#include <limal/LogControl.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
#include <limal/Logger.hpp>
#include <limal/ca-mgm/CA.hpp>
+#include <limal/Exception.hpp>
#include <iostream>
#include <fstream>
#include <unistd.h>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -24,20 +22,13 @@
{
cout << "START" << endl;
- StringArray comp;
- comp.push_back("ca-mgm");
- comp.push_back("limal");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "CA1",
- comp,
- LogAppender::ALL_CATEGORIES,
- "%-5p %c - %m"
- );
-
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_DEBUG );
+ logger.logToStdErr();
CA ca("ca1_test", "system", "./TestRepos/");
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA2.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA2.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA2.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
+#include <limal/LogControl.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
@@ -14,8 +10,7 @@
// FIXME: need to be removed
#include <Utils.hpp>
-
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -30,13 +25,11 @@
}
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "CA2",
- LogAppender::ALL_COMPONENTS,
- LogAppender::ALL_CATEGORIES,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_DEBUG );
+ logger.logToStdErr();
std::string file = argv[ 1 ];
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA3.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA3.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA3.cc Sat Jul 17 18:38:59 2010
@@ -1,7 +1,4 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
+#include <limal/LogControl.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
#include <limal/Logger.hpp>
@@ -13,8 +10,7 @@
// FIXME: need to be removed
#include <Utils.hpp>
-
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -29,13 +25,11 @@
}
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "CA3",
- LogAppender::ALL_COMPONENTS,
- LogAppender::ALL_CATEGORIES,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_DEBUG );
+ logger.logToStdErr();
std::string file = argv[ 1 ];
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA4.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA4.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA4.cc Sat Jul 17 18:38:59 2010
@@ -1,7 +1,4 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
+#include <limal/LogControl.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
#include <limal/Logger.hpp>
@@ -12,7 +9,7 @@
#include <fstream>
#include <unistd.h>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -26,13 +23,11 @@
}
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "CA4",
- LogAppender::ALL_COMPONENTS,
- LogAppender::ALL_CATEGORIES,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_DEBUG );
+ logger.logToStdErr();
std::string file = argv[ 1 ];
cout << "START" << endl;
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
+#include <limal/LogControl.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <iostream>
@@ -14,7 +10,7 @@
// FIXME: need to be removed
#include <Utils.hpp>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -28,18 +24,12 @@
exit( 1 );
}
- StringArray comp;
- comp.push_back("ca-mgm");
- comp.push_back("limal");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "CA5",
- comp,
- LogAppender::ALL_CATEGORIES,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_DEBUG );
+ logger.logToStdErr();
std::string file = argv[ 1 ];
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5/testcase1.err
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5/testcase1.err (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5/testcase1.err Sat Jul 17 18:38:59 2010
@@ -30,19 +30,31 @@
DEBUG ca-mgm - ExtensionBase::setPresent(): false
DEBUG ca-mgm - type2Section: type=2 result=req_ca
DEBUG ca-mgm - type2Section: type=2 result=req_ca
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - type2Section: type=2 result=req_ca
DEBUG ca-mgm - type2Section: type=2 result=req_ca
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - type2Section: type=2 result=v3_req_ca
+DEBUG IniParser - Can not delete nsSslServerName Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=2 result=v3_req_ca
+DEBUG IniParser - Can not delete nsComment Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=2 result=v3_req_ca
DEBUG ca-mgm - type2Section: type=2 result=v3_req_ca
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - type2Section: type=2 result=v3_req_ca
DEBUG ca-mgm - type2Section: type=2 result=v3_req_ca
+DEBUG IniParser - Can not delete extendedKeyUsage Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=2 result=v3_req_ca
+DEBUG IniParser - Can not delete subjectKeyIdentifier Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=2 result=v3_req_ca
+DEBUG IniParser - Can not delete subjectAltName Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=2 result=req_ca
DEBUG ca-mgm - type2Section: type=2 result=req_ca
DEBUG ca-mgm - type2Section: type=2 result=v3_req_ca
@@ -78,6 +90,8 @@
DEBUG ca-mgm - DNObject::verify()(1/1):Value() is too small. Value has to be a minimal length of 2
DEBUG ca-mgm - RequestGenerationData::verify()(1/1):Value() is too small. Value has to be a minimal length of 2
DEBUG ca-mgm - removeFile ./TestRepos/ca1_test/openssl.cnf
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf.tmpl did not change. Not saving.
DEBUG ca-mgm - Command: /usr/bin/openssl rsa -noout -in ./TestRepos//ca2_test/cacert.key -passin env:PASSWORD
DEBUG ca-mgm - type2Section: type=2 result=req_ca
DEBUG ca-mgm - type2Section: type=2 result=req_ca
@@ -112,19 +126,31 @@
DEBUG ca-mgm - ExtensionBase::setPresent(): false
DEBUG ca-mgm - type2Section: type=2 result=req_ca
DEBUG ca-mgm - type2Section: type=2 result=req_ca
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - type2Section: type=2 result=req_ca
DEBUG ca-mgm - type2Section: type=2 result=req_ca
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - type2Section: type=2 result=v3_req_ca
+DEBUG IniParser - Can not delete nsSslServerName Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=2 result=v3_req_ca
+DEBUG IniParser - Can not delete nsComment Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=2 result=v3_req_ca
DEBUG ca-mgm - type2Section: type=2 result=v3_req_ca
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - type2Section: type=2 result=v3_req_ca
DEBUG ca-mgm - type2Section: type=2 result=v3_req_ca
+DEBUG IniParser - Can not delete extendedKeyUsage Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=2 result=v3_req_ca
+DEBUG IniParser - Can not delete subjectKeyIdentifier Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=2 result=v3_req_ca
+DEBUG IniParser - Can not delete subjectAltName Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=2 result=req_ca
DEBUG ca-mgm - type2Section: type=2 result=req_ca
DEBUG ca-mgm - type2Section: type=2 result=v3_req_ca
@@ -162,3 +188,5 @@
DEBUG ca-mgm - DNObject::verify()(1/1):Value() is too small. Value has to be a minimal length of 2
DEBUG ca-mgm - RequestGenerationData::verify()(1/1):Value() is too small. Value has to be a minimal length of 2
DEBUG ca-mgm - removeFile ./TestRepos/ca2_test/openssl.cnf
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf.tmpl did not change. Not saving.
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5/testcase2.err
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5/testcase2.err (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5/testcase2.err Sat Jul 17 18:38:59 2010
@@ -30,19 +30,31 @@
DEBUG ca-mgm - ExtensionBase::setPresent(): false
DEBUG ca-mgm - type2Section: type=0 result=req_client
DEBUG ca-mgm - type2Section: type=0 result=req_client
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - type2Section: type=0 result=req_client
DEBUG ca-mgm - type2Section: type=0 result=req_client
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - type2Section: type=0 result=v3_req_client
+DEBUG IniParser - Can not delete nsSslServerName Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=0 result=v3_req_client
+DEBUG IniParser - Can not delete nsComment Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=0 result=v3_req_client
DEBUG ca-mgm - type2Section: type=0 result=v3_req_client
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - type2Section: type=0 result=v3_req_client
DEBUG ca-mgm - type2Section: type=0 result=v3_req_client
+DEBUG IniParser - Can not delete extendedKeyUsage Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=0 result=v3_req_client
+DEBUG IniParser - Can not delete subjectKeyIdentifier Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=0 result=v3_req_client
+DEBUG IniParser - Can not delete subjectAltName Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=0 result=req_client
DEBUG ca-mgm - type2Section: type=0 result=req_client
DEBUG ca-mgm - type2Section: type=0 result=v3_req_client
@@ -78,6 +90,8 @@
DEBUG ca-mgm - DNObject::verify()(1/1):Value() is too small. Value has to be a minimal length of 2
DEBUG ca-mgm - RequestGenerationData::verify()(1/1):Value() is too small. Value has to be a minimal length of 2
DEBUG ca-mgm - removeFile ./TestRepos/ca1_test/openssl.cnf
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf.tmpl did not change. Not saving.
DEBUG ca-mgm - Command: /usr/bin/openssl rsa -noout -in ./TestRepos//ca2_test/cacert.key -passin env:PASSWORD
DEBUG ca-mgm - type2Section: type=0 result=req_client
DEBUG ca-mgm - type2Section: type=0 result=req_client
@@ -108,19 +122,33 @@
DEBUG ca-mgm - ExtensionBase::setPresent(): false
DEBUG ca-mgm - type2Section: type=0 result=req_client
DEBUG ca-mgm - type2Section: type=0 result=req_client
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - type2Section: type=0 result=req_client
DEBUG ca-mgm - type2Section: type=0 result=req_client
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - type2Section: type=0 result=v3_req_client
+DEBUG IniParser - Can not delete nsSslServerName Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=0 result=v3_req_client
+DEBUG IniParser - Can not delete nsComment Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=0 result=v3_req_client
DEBUG ca-mgm - type2Section: type=0 result=v3_req_client
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - type2Section: type=0 result=v3_req_client
+DEBUG IniParser - Can not delete basicConstraints Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=0 result=v3_req_client
+DEBUG IniParser - Can not delete extendedKeyUsage Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=0 result=v3_req_client
+DEBUG IniParser - Can not delete subjectKeyIdentifier Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=0 result=v3_req_client
+DEBUG IniParser - Can not delete subjectAltName Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=0 result=req_client
DEBUG ca-mgm - type2Section: type=0 result=req_client
DEBUG ca-mgm - type2Section: type=0 result=v3_req_client
@@ -154,3 +182,5 @@
DEBUG ca-mgm - DNObject::verify()(1/1):Value() is too small. Value has to be a minimal length of 2
DEBUG ca-mgm - RequestGenerationData::verify()(1/1):Value() is too small. Value has to be a minimal length of 2
DEBUG ca-mgm - removeFile ./TestRepos/ca2_test/openssl.cnf
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf.tmpl did not change. Not saving.
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5/testcase3.err
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5/testcase3.err (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5/testcase3.err Sat Jul 17 18:38:59 2010
@@ -30,19 +30,31 @@
DEBUG ca-mgm - ExtensionBase::setPresent(): false
DEBUG ca-mgm - type2Section: type=1 result=req_server
DEBUG ca-mgm - type2Section: type=1 result=req_server
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - type2Section: type=1 result=req_server
DEBUG ca-mgm - type2Section: type=1 result=req_server
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - type2Section: type=1 result=v3_req_server
+DEBUG IniParser - Can not delete nsSslServerName Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=1 result=v3_req_server
+DEBUG IniParser - Can not delete nsComment Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=1 result=v3_req_server
DEBUG ca-mgm - type2Section: type=1 result=v3_req_server
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - type2Section: type=1 result=v3_req_server
DEBUG ca-mgm - type2Section: type=1 result=v3_req_server
+DEBUG IniParser - Can not delete extendedKeyUsage Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=1 result=v3_req_server
+DEBUG IniParser - Can not delete subjectKeyIdentifier Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=1 result=v3_req_server
+DEBUG IniParser - Can not delete subjectAltName Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=1 result=req_server
DEBUG ca-mgm - type2Section: type=1 result=req_server
DEBUG ca-mgm - type2Section: type=1 result=v3_req_server
@@ -78,6 +90,8 @@
DEBUG ca-mgm - DNObject::verify()(1/1):Value() is too small. Value has to be a minimal length of 2
DEBUG ca-mgm - RequestGenerationData::verify()(1/1):Value() is too small. Value has to be a minimal length of 2
DEBUG ca-mgm - removeFile ./TestRepos/ca1_test/openssl.cnf
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf.tmpl did not change. Not saving.
DEBUG ca-mgm - Command: /usr/bin/openssl rsa -noout -in ./TestRepos//ca2_test/cacert.key -passin env:PASSWORD
DEBUG ca-mgm - type2Section: type=1 result=req_server
DEBUG ca-mgm - type2Section: type=1 result=req_server
@@ -112,19 +126,31 @@
DEBUG ca-mgm - ExtensionBase::setPresent(): false
DEBUG ca-mgm - type2Section: type=1 result=req_server
DEBUG ca-mgm - type2Section: type=1 result=req_server
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - type2Section: type=1 result=req_server
DEBUG ca-mgm - type2Section: type=1 result=req_server
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - type2Section: type=1 result=v3_req_server
+DEBUG IniParser - Can not delete nsSslServerName Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=1 result=v3_req_server
+DEBUG IniParser - Can not delete nsComment Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=1 result=v3_req_server
DEBUG ca-mgm - type2Section: type=1 result=v3_req_server
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - type2Section: type=1 result=v3_req_server
DEBUG ca-mgm - type2Section: type=1 result=v3_req_server
+DEBUG IniParser - Can not delete extendedKeyUsage Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=1 result=v3_req_server
+DEBUG IniParser - Can not delete subjectKeyIdentifier Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=1 result=v3_req_server
+DEBUG IniParser - Can not delete subjectAltName Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=1 result=req_server
DEBUG ca-mgm - type2Section: type=1 result=req_server
DEBUG ca-mgm - type2Section: type=1 result=v3_req_server
@@ -162,3 +188,5 @@
DEBUG ca-mgm - DNObject::verify()(1/1):Value() is too small. Value has to be a minimal length of 2
DEBUG ca-mgm - RequestGenerationData::verify()(1/1):Value() is too small. Value has to be a minimal length of 2
DEBUG ca-mgm - removeFile ./TestRepos/ca2_test/openssl.cnf
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf.tmpl did not change. Not saving.
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
+#include <limal/LogControl.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <iostream>
@@ -14,7 +10,7 @@
// FIXME: need to be removed
#include <Utils.hpp>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -27,18 +23,12 @@
exit( 1 );
}
- StringArray comp;
- comp.push_back("ca-mgm");
- comp.push_back("limal");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "CA6",
- comp,
- LogAppender::ALL_CATEGORIES,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_DEBUG );
+ logger.logToStdErr();
std::string file = argv[ 1 ];
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6/testcase1.err
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6/testcase1.err (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6/testcase1.err Sat Jul 17 18:38:59 2010
@@ -55,6 +55,7 @@
DEBUG ca-mgm - ExtensionBase::setPresent(): false
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
DEBUG ca-mgm - ExtensionBase::setPresent(): false
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - return AuthorityKeyIdentifierGenerateExt::valid() is true
DEBUG ca-mgm - return IssuerAlternativeNameExt::valid() is true
@@ -68,17 +69,31 @@
DEBUG ca-mgm - return AuthorityInfoAccessExt::valid() is true
DEBUG ca-mgm - return CRLDistributionPointsExt::valid() is true
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
+DEBUG IniParser - Can not delete nsBaseUrl Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
+DEBUG IniParser - Can not delete nsRevocationUrl Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
+DEBUG IniParser - Can not delete nsCaRevocationUrl Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
+DEBUG IniParser - Can not delete nsRenewalUrl Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
+DEBUG IniParser - Can not delete nsCaPolicyUrl Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
+DEBUG IniParser - Can not delete nsSslServerName Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
+DEBUG IniParser - Can not delete extendedKeyUsage Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
DEBUG ca-mgm - return AuthorityKeyIdentifierGenerateExt::valid() is true
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
@@ -87,9 +102,16 @@
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
DEBUG ca-mgm - return AuthorityInfoAccessExt::valid() is true
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
+DEBUG IniParser - Can not delete authorityInfoAccess Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - return CRLDistributionPointsExt::valid() is true
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
+DEBUG IniParser - Can not delete crlDistributionPoints Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
+DEBUG IniParser - Can not delete certificatePolicies Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=5 result=ca
DEBUG ca-mgm - type2Section: type=5 result=ca
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
@@ -147,6 +169,8 @@
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
DEBUG ca-mgm - ExtensionBase::setPresent(): false
DEBUG ca-mgm - removeFile ./TestRepos/ca1_test/openssl.cnf
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf.tmpl did not change. Not saving.
DEBUG ca-mgm - Command: /usr/bin/openssl rsa -noout -in ./TestRepos//ca2_test/cacert.key -passin env:PASSWORD
DEBUG ca-mgm - type2Section: type=5 result=ca
DEBUG ca-mgm - type2Section: type=5 result=ca
@@ -214,6 +238,7 @@
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
DEBUG ca-mgm - ExtensionBase::setPresent(): true
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - return AuthorityKeyIdentifierGenerateExt::valid() is true
DEBUG ca-mgm - return IssuerAlternativeNameExt::valid() is true
@@ -251,6 +276,7 @@
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=5 result=ca
DEBUG ca-mgm - type2Section: type=5 result=ca
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
@@ -318,3 +344,5 @@
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
DEBUG ca-mgm - ExtensionBase::setPresent(): true
DEBUG ca-mgm - removeFile ./TestRepos/ca2_test/openssl.cnf
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf.tmpl did not change. Not saving.
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6/testcase2.err
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6/testcase2.err (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6/testcase2.err Sat Jul 17 18:38:59 2010
@@ -53,6 +53,7 @@
DEBUG ca-mgm - ExtensionBase::setPresent(): false
DEBUG ca-mgm - type2Section: type=3 result=v3_client
DEBUG ca-mgm - ExtensionBase::setPresent(): false
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - return AuthorityKeyIdentifierGenerateExt::valid() is true
DEBUG ca-mgm - return IssuerAlternativeNameExt::valid() is true
@@ -66,17 +67,31 @@
DEBUG ca-mgm - return AuthorityInfoAccessExt::valid() is true
DEBUG ca-mgm - return CRLDistributionPointsExt::valid() is true
DEBUG ca-mgm - type2Section: type=3 result=v3_client
+DEBUG IniParser - Can not delete nsBaseUrl Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=3 result=v3_client
+DEBUG IniParser - Can not delete nsRevocationUrl Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=3 result=v3_client
+DEBUG IniParser - Can not delete nsCaRevocationUrl Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=3 result=v3_client
+DEBUG IniParser - Can not delete nsRenewalUrl Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=3 result=v3_client
+DEBUG IniParser - Can not delete nsCaPolicyUrl Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=3 result=v3_client
+DEBUG IniParser - Can not delete nsSslServerName Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=3 result=v3_client
DEBUG ca-mgm - type2Section: type=3 result=v3_client
DEBUG ca-mgm - type2Section: type=3 result=v3_client
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - type2Section: type=3 result=v3_client
DEBUG ca-mgm - type2Section: type=3 result=v3_client
+DEBUG IniParser - Can not delete extendedKeyUsage Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=3 result=v3_client
DEBUG ca-mgm - return AuthorityKeyIdentifierGenerateExt::valid() is true
DEBUG ca-mgm - type2Section: type=3 result=v3_client
@@ -85,9 +100,16 @@
DEBUG ca-mgm - type2Section: type=3 result=v3_client
DEBUG ca-mgm - return AuthorityInfoAccessExt::valid() is true
DEBUG ca-mgm - type2Section: type=3 result=v3_client
+DEBUG IniParser - Can not delete authorityInfoAccess Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - return CRLDistributionPointsExt::valid() is true
DEBUG ca-mgm - type2Section: type=3 result=v3_client
+DEBUG IniParser - Can not delete crlDistributionPoints Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=3 result=v3_client
+DEBUG IniParser - Can not delete certificatePolicies Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=3 result=client_cert
DEBUG ca-mgm - type2Section: type=3 result=client_cert
DEBUG ca-mgm - type2Section: type=3 result=v3_client
@@ -143,6 +165,8 @@
DEBUG ca-mgm - type2Section: type=3 result=v3_client
DEBUG ca-mgm - ExtensionBase::setPresent(): false
DEBUG ca-mgm - removeFile ./TestRepos/ca1_test/openssl.cnf
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf.tmpl did not change. Not saving.
DEBUG ca-mgm - Command: /usr/bin/openssl rsa -noout -in ./TestRepos//ca2_test/cacert.key -passin env:PASSWORD
DEBUG ca-mgm - type2Section: type=3 result=client_cert
DEBUG ca-mgm - type2Section: type=3 result=client_cert
@@ -197,6 +221,7 @@
DEBUG ca-mgm - ExtensionBase::setPresent(): false
DEBUG ca-mgm - type2Section: type=3 result=v3_client
DEBUG ca-mgm - ExtensionBase::setPresent(): false
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - return AuthorityKeyIdentifierGenerateExt::valid() is true
DEBUG ca-mgm - return IssuerAlternativeNameExt::valid() is true
@@ -212,17 +237,33 @@
DEBUG ca-mgm - return AuthorityInfoAccessExt::valid() is true
DEBUG ca-mgm - return CRLDistributionPointsExt::valid() is true
DEBUG ca-mgm - type2Section: type=3 result=v3_client
+DEBUG IniParser - Can not delete nsBaseUrl Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=3 result=v3_client
+DEBUG IniParser - Can not delete nsRevocationUrl Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=3 result=v3_client
+DEBUG IniParser - Can not delete nsCaRevocationUrl Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=3 result=v3_client
+DEBUG IniParser - Can not delete nsRenewalUrl Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=3 result=v3_client
+DEBUG IniParser - Can not delete nsCaPolicyUrl Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=3 result=v3_client
+DEBUG IniParser - Can not delete nsSslServerName Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=3 result=v3_client
DEBUG ca-mgm - type2Section: type=3 result=v3_client
DEBUG ca-mgm - type2Section: type=3 result=v3_client
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - type2Section: type=3 result=v3_client
+DEBUG IniParser - Can not delete basicConstraints Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=3 result=v3_client
+DEBUG IniParser - Can not delete extendedKeyUsage Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=3 result=v3_client
DEBUG ca-mgm - return AuthorityKeyIdentifierGenerateExt::valid() is true
DEBUG ca-mgm - type2Section: type=3 result=v3_client
@@ -234,7 +275,12 @@
DEBUG ca-mgm - type2Section: type=3 result=v3_client
DEBUG ca-mgm - return CRLDistributionPointsExt::valid() is true
DEBUG ca-mgm - type2Section: type=3 result=v3_client
+DEBUG IniParser - Can not delete crlDistributionPoints Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=3 result=v3_client
+DEBUG IniParser - Can not delete certificatePolicies Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=3 result=client_cert
DEBUG ca-mgm - type2Section: type=3 result=client_cert
DEBUG ca-mgm - type2Section: type=3 result=v3_client
@@ -289,3 +335,5 @@
DEBUG ca-mgm - type2Section: type=3 result=v3_client
DEBUG ca-mgm - ExtensionBase::setPresent(): false
DEBUG ca-mgm - removeFile ./TestRepos/ca2_test/openssl.cnf
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf.tmpl did not change. Not saving.
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6/testcase3.err
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6/testcase3.err (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6/testcase3.err Sat Jul 17 18:38:59 2010
@@ -53,6 +53,7 @@
DEBUG ca-mgm - ExtensionBase::setPresent(): false
DEBUG ca-mgm - type2Section: type=4 result=v3_server
DEBUG ca-mgm - ExtensionBase::setPresent(): false
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - return AuthorityKeyIdentifierGenerateExt::valid() is true
DEBUG ca-mgm - return IssuerAlternativeNameExt::valid() is true
@@ -66,17 +67,31 @@
DEBUG ca-mgm - return AuthorityInfoAccessExt::valid() is true
DEBUG ca-mgm - return CRLDistributionPointsExt::valid() is true
DEBUG ca-mgm - type2Section: type=4 result=v3_server
+DEBUG IniParser - Can not delete nsBaseUrl Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=4 result=v3_server
+DEBUG IniParser - Can not delete nsRevocationUrl Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=4 result=v3_server
+DEBUG IniParser - Can not delete nsCaRevocationUrl Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=4 result=v3_server
+DEBUG IniParser - Can not delete nsRenewalUrl Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=4 result=v3_server
+DEBUG IniParser - Can not delete nsCaPolicyUrl Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=4 result=v3_server
+DEBUG IniParser - Can not delete nsSslServerName Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=4 result=v3_server
DEBUG ca-mgm - type2Section: type=4 result=v3_server
DEBUG ca-mgm - type2Section: type=4 result=v3_server
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - type2Section: type=4 result=v3_server
DEBUG ca-mgm - type2Section: type=4 result=v3_server
+DEBUG IniParser - Can not delete extendedKeyUsage Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=4 result=v3_server
DEBUG ca-mgm - return AuthorityKeyIdentifierGenerateExt::valid() is true
DEBUG ca-mgm - type2Section: type=4 result=v3_server
@@ -85,9 +100,16 @@
DEBUG ca-mgm - type2Section: type=4 result=v3_server
DEBUG ca-mgm - return AuthorityInfoAccessExt::valid() is true
DEBUG ca-mgm - type2Section: type=4 result=v3_server
+DEBUG IniParser - Can not delete authorityInfoAccess Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - return CRLDistributionPointsExt::valid() is true
DEBUG ca-mgm - type2Section: type=4 result=v3_server
+DEBUG IniParser - Can not delete crlDistributionPoints Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=4 result=v3_server
+DEBUG IniParser - Can not delete certificatePolicies Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=4 result=server_cert
DEBUG ca-mgm - type2Section: type=4 result=server_cert
DEBUG ca-mgm - type2Section: type=4 result=v3_server
@@ -143,6 +165,8 @@
DEBUG ca-mgm - type2Section: type=4 result=v3_server
DEBUG ca-mgm - ExtensionBase::setPresent(): false
DEBUG ca-mgm - removeFile ./TestRepos/ca1_test/openssl.cnf
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf.tmpl did not change. Not saving.
DEBUG ca-mgm - Command: /usr/bin/openssl rsa -noout -in ./TestRepos//ca2_test/cacert.key -passin env:PASSWORD
DEBUG ca-mgm - type2Section: type=4 result=server_cert
DEBUG ca-mgm - type2Section: type=4 result=server_cert
@@ -197,6 +221,7 @@
DEBUG ca-mgm - ExtensionBase::setPresent(): false
DEBUG ca-mgm - type2Section: type=4 result=v3_server
DEBUG ca-mgm - ExtensionBase::setPresent(): false
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - return AuthorityKeyIdentifierGenerateExt::valid() is true
DEBUG ca-mgm - return IssuerAlternativeNameExt::valid() is true
@@ -212,17 +237,33 @@
DEBUG ca-mgm - return AuthorityInfoAccessExt::valid() is true
DEBUG ca-mgm - return CRLDistributionPointsExt::valid() is true
DEBUG ca-mgm - type2Section: type=4 result=v3_server
+DEBUG IniParser - Can not delete nsBaseUrl Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=4 result=v3_server
+DEBUG IniParser - Can not delete nsRevocationUrl Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=4 result=v3_server
+DEBUG IniParser - Can not delete nsCaRevocationUrl Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=4 result=v3_server
+DEBUG IniParser - Can not delete nsRenewalUrl Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=4 result=v3_server
+DEBUG IniParser - Can not delete nsCaPolicyUrl Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=4 result=v3_server
+DEBUG IniParser - Can not delete nsSslServerName Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=4 result=v3_server
DEBUG ca-mgm - type2Section: type=4 result=v3_server
DEBUG ca-mgm - type2Section: type=4 result=v3_server
DEBUG ca-mgm - return BasicConstraintsExt::valid() is true
DEBUG ca-mgm - type2Section: type=4 result=v3_server
+DEBUG IniParser - Can not delete basicConstraints Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=4 result=v3_server
+DEBUG IniParser - Can not delete extendedKeyUsage Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=4 result=v3_server
DEBUG ca-mgm - return AuthorityKeyIdentifierGenerateExt::valid() is true
DEBUG ca-mgm - type2Section: type=4 result=v3_server
@@ -234,7 +275,12 @@
DEBUG ca-mgm - type2Section: type=4 result=v3_server
DEBUG ca-mgm - return CRLDistributionPointsExt::valid() is true
DEBUG ca-mgm - type2Section: type=4 result=v3_server
+DEBUG IniParser - Can not delete crlDistributionPoints Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=4 result=v3_server
+DEBUG IniParser - Can not delete certificatePolicies Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=4 result=server_cert
DEBUG ca-mgm - type2Section: type=4 result=server_cert
DEBUG ca-mgm - type2Section: type=4 result=v3_server
@@ -289,3 +335,5 @@
DEBUG ca-mgm - type2Section: type=4 result=v3_server
DEBUG ca-mgm - ExtensionBase::setPresent(): false
DEBUG ca-mgm - removeFile ./TestRepos/ca2_test/openssl.cnf
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf.tmpl did not change. Not saving.
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA7.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA7.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA7.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <iostream>
@@ -14,7 +10,7 @@
// FIXME: need to be removed
#include <Utils.hpp>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -27,18 +23,12 @@
exit( 1 );
}
- StringArray comp;
- comp.push_back("ca-mgm");
- comp.push_back("limal");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "CA7",
- comp,
- LogAppender::ALL_CATEGORIES,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_DEBUG );
+ logger.logToStdErr();
std::string file = argv[ 1 ];
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA7/testcase1.err
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA7/testcase1.err (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA7/testcase1.err Sat Jul 17 18:38:59 2010
@@ -5,6 +5,7 @@
DEBUG ca-mgm - type2Section: type=6 result=v3_crl
DEBUG ca-mgm - ExtensionBase::setPresent(): false
DEBUG ca-mgm - type2Section: type=6 result=ca
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - return AuthorityKeyIdentifierGenerateExt::valid() is true
DEBUG ca-mgm - return IssuerAlternativeNameExt::valid() is true
DEBUG ca-mgm - type2Section: type=6 result=ca
@@ -14,6 +15,9 @@
DEBUG ca-mgm - type2Section: type=6 result=v3_crl
DEBUG ca-mgm - return IssuerAlternativeNameExt::valid() is true
DEBUG ca-mgm - type2Section: type=6 result=v3_crl
+DEBUG IniParser - Can not delete issuerAltName Key does not exist.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=6 result=v3_crl
DEBUG ca-mgm - type2Section: type=6 result=v3_crl
DEBUG ca-mgm - ExtensionBase::setPresent(): true
@@ -21,6 +25,8 @@
DEBUG ca-mgm - ExtensionBase::setPresent(): false
DEBUG ca-mgm - type2Section: type=6 result=ca
DEBUG ca-mgm - removeFile ./TestRepos/ca1_test/openssl.cnf
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf.tmpl did not change. Not saving.
DEBUG ca-mgm - Command: /usr/bin/openssl rsa -noout -in ./TestRepos//ca2_test/cacert.key -passin env:PASSWORD
DEBUG ca-mgm - type2Section: type=6 result=v3_crl
DEBUG ca-mgm - type2Section: type=6 result=v3_crl
@@ -29,6 +35,7 @@
DEBUG ca-mgm - type2Section: type=6 result=v3_crl
DEBUG ca-mgm - ExtensionBase::setPresent(): true
DEBUG ca-mgm - type2Section: type=6 result=ca
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - return AuthorityKeyIdentifierGenerateExt::valid() is true
DEBUG ca-mgm - return IssuerAlternativeNameExt::valid() is true
DEBUG ca-mgm - type2Section: type=6 result=ca
@@ -38,6 +45,7 @@
DEBUG ca-mgm - type2Section: type=6 result=v3_crl
DEBUG ca-mgm - return IssuerAlternativeNameExt::valid() is true
DEBUG ca-mgm - type2Section: type=6 result=v3_crl
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=6 result=v3_crl
DEBUG ca-mgm - type2Section: type=6 result=v3_crl
DEBUG ca-mgm - ExtensionBase::setPresent(): true
@@ -46,3 +54,5 @@
DEBUG ca-mgm - ExtensionBase::setPresent(): true
DEBUG ca-mgm - type2Section: type=6 result=ca
DEBUG ca-mgm - removeFile ./TestRepos/ca2_test/openssl.cnf
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca2_test/openssl.cnf.tmpl did not change. Not saving.
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA8.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA8.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA8.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
@@ -13,7 +9,7 @@
#include <fstream>
#include <unistd.h>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -24,21 +20,12 @@
{
cout << "START" << endl;
- StringArray cat;
- cat.push_back("FATAL");
- cat.push_back("ERROR");
- cat.push_back("INFO");
- //cat.push_back("DEBUG");
-
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "CA8",
- LogAppender::ALL_COMPONENTS,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_INFO );
+ logger.logToStdErr();
RequestGenerationData rgd = CA::getRootCARequestDefaults("./TestRepos/");
CertificateIssueData cid = CA::getRootCAIssueDefaults("./TestRepos/");
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA9.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA9.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA9.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
@@ -13,7 +9,7 @@
#include <fstream>
#include <unistd.h>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -27,13 +23,11 @@
cout << "START" << endl;
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "CA9",
- LogAppender::ALL_COMPONENTS,
- LogAppender::ALL_CATEGORIES,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_DEBUG );
+ logger.logToStdErr();
cout << "=================== start CA List ======================" << endl;
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CAConfig.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CAConfig.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CAConfig.cc Sat Jul 17 18:38:59 2010
@@ -1,17 +1,13 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/ca-mgm/CAConfig.hpp>
#include <iostream>
#include <fstream>
#include <unistd.h>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -21,19 +17,17 @@
cout << "START" << endl;
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "CAConfig",
- LogAppender::ALL_COMPONENTS,
- LogAppender::ALL_CATEGORIES,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_DEBUG );
+ logger.logToStdErr();
CAConfig *config = new CAConfig("openssl.cnf.tmpl");
CAConfig *configNew = config->clone("openssl.cnf.tmpl.test");
- LIMAL_SLOG(ca_mgm::Logger("ca-mgm"),
- "DEBUG", "file openssl.cnf.tmpl.test parsed.");
+ _DBG("ca-mgm") << "file openssl.cnf.tmpl.test parsed.";
configNew->setValue ("v3_req_server", "basicConstraints", "CA:TRUE");
configNew->deleteValue ("v3_req_server", "keyUsage");
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CRLTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CRLTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CRLTest.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,7 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
+#include <limal/Exception.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
@@ -12,7 +9,7 @@
#include <fstream>
#include <unistd.h>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -23,20 +20,12 @@
{
cout << "START" << endl;
- StringArray cat;
- cat.push_back("FATAL");
- cat.push_back("ERROR");
- cat.push_back("INFO");
- //cat.push_back("DEBUG");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "CRLTest",
- LogAppender::ALL_COMPONENTS,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_INFO );
+ logger.logToStdErr();
CA ca("Test_CA1", "system", "./TestRepos/");
CRLGenerationData cgd = ca.getCRLDefaults();
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
@@ -13,7 +9,7 @@
#include <fstream>
#include <unistd.h>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -24,20 +20,12 @@
{
cout << "START" << endl;
- StringArray cat;
- cat.push_back("FATAL");
- cat.push_back("ERROR");
- cat.push_back("INFO");
- //cat.push_back("DEBUG");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "CertificateTest",
- LogAppender::ALL_COMPONENTS,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_INFO );
+ logger.logToStdErr();
CA ca("Test_CA1", "system", "./TestRepos/");
RequestGenerationData rgd = ca.getRequestDefaults(E_Client_Req);
@@ -78,7 +66,7 @@
path::PathInfo pi("./TestRepos/Test_CA1/newcerts/" + c + ".pem");
- cout << "Certificate exists: " << Bool(pi.exists()) << endl;
+ cout << "Certificate exists: " << str::toString(pi.exists()) << endl;
cout << "DONE" << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest2.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest2.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest2.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
@@ -13,7 +9,7 @@
#include <fstream>
#include <unistd.h>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -24,20 +20,12 @@
{
cout << "START" << endl;
- StringArray cat;
- cat.push_back("FATAL");
- cat.push_back("ERROR");
- cat.push_back("INFO");
- //cat.push_back("DEBUG");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "CertificateTest2",
- LogAppender::ALL_COMPONENTS,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_INFO );
+ logger.logToStdErr();
CA ca("Test_CA1", "system", "./TestRepos/");
RequestGenerationData rgd = ca.getRequestDefaults(E_Server_Req);
@@ -73,7 +61,7 @@
path::PathInfo pi("./TestRepos/Test_CA1/newcerts/" + c + ".pem");
- cout << "Certificate exists: " << Bool(pi.exists()) << endl;
+ cout << "Certificate exists: " << str::toString(pi.exists()) << endl;
cout << "DONE" << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest3.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest3.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest3.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
@@ -13,7 +9,7 @@
#include <fstream>
#include <unistd.h>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -24,20 +20,12 @@
{
cout << "START" << endl;
- StringArray cat;
- cat.push_back("FATAL");
- cat.push_back("ERROR");
- cat.push_back("INFO");
- //cat.push_back("DEBUG");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "CertificateTest3",
- LogAppender::ALL_COMPONENTS,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_INFO );
+ logger.logToStdErr();
CA ca("Test_CA1", "system", "./TestRepos/");
RequestGenerationData rgd = ca.getRequestDefaults(E_Client_Req);
@@ -163,7 +151,7 @@
slp.push_back("http://www2.my-company.com/");
p2.setCpsURI(slp);
- std::list<Int32> num;
+ std::list<int32_t> num;
num.push_back(1);
num.push_back(5);
num.push_back(8);
@@ -214,7 +202,7 @@
path::PathInfo pi("./TestRepos/Test_CA1/newcerts/" + c + ".pem");
- cout << "Certificate exists: " << Bool(pi.exists()) << endl;
+ cout << "Certificate exists: " << str::toString(pi.exists()) << endl;
cout << "DONE" << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest4.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest4.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest4.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
@@ -16,7 +12,7 @@
// FIXME: need to be removed
#include <Utils.hpp>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -28,20 +24,12 @@
{
cout << "START" << endl;
- StringArray cat;
- cat.push_back("FATAL");
- cat.push_back("ERROR");
- cat.push_back("INFO");
- //cat.push_back("DEBUG");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "CertificateTest4",
- LogAppender::ALL_COMPONENTS,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_INFO );
+ logger.logToStdErr();
CA ca("Test_CA1", "system", "./TestRepos/");
RequestGenerationData rgd = ca.getRequestDefaults(E_Client_Req);
@@ -165,7 +153,7 @@
slp.push_back("http://www2.my-company.com/");
p2.setCpsURI(slp);
- std::list<Int32> num;
+ std::list<int32_t> num;
num.push_back(1);
num.push_back(5);
num.push_back(8);
@@ -189,7 +177,7 @@
path::PathInfo pi("./TestRepos/Test_CA1/newcerts/" + c + ".pem");
- cout << "Certificate exists: " << Bool(pi.exists()) << endl;
+ cout << "Certificate exists: " << str::toString(pi.exists()) << endl;
CertificateData cd = ca.getCertificate(c);
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest5.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest5.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest5.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
@@ -13,7 +9,7 @@
#include <fstream>
#include <unistd.h>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -25,20 +21,12 @@
{
cout << "START" << endl;
- StringArray cat;
- cat.push_back("FATAL");
- cat.push_back("ERROR");
- cat.push_back("INFO");
- //cat.push_back("DEBUG");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "CertificateTest5",
- LogAppender::ALL_COMPONENTS,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_INFO );
+ logger.logToStdErr();
CA ca("Test_CA1", "system", "./TestRepos/");
RequestGenerationData rgd = ca.getRequestDefaults(E_Client_Req);
@@ -116,7 +104,7 @@
path::PathInfo pi("./TestRepos/Test_CA1/newcerts/" + c + ".pem");
- cout << "Certificate exists: " << Bool(pi.exists()) << endl;
+ cout << "Certificate exists: " << str::toString(pi.exists()) << endl;
CertificateData cd = ca.getCertificate(c);
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest6.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest6.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest6.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
@@ -13,7 +9,7 @@
#include <fstream>
#include <unistd.h>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -25,20 +21,12 @@
{
cout << "START" << endl;
- StringArray cat;
- cat.push_back("FATAL");
- cat.push_back("ERROR");
- cat.push_back("INFO");
- //cat.push_back("DEBUG");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "CertificateTest6",
- LogAppender::ALL_COMPONENTS,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_INFO );
+ logger.logToStdErr();
CA ca("Test_CA1", "system", "./TestRepos/");
RequestGenerationData rgd = ca.getRequestDefaults(E_Client_Req);
@@ -116,7 +104,7 @@
path::PathInfo pi("./TestRepos/Test_CA1/newcerts/" + c + ".pem");
- cout << "Certificate exists: " << Bool(pi.exists()) << endl;
+ cout << "Certificate exists: " << str::toString(pi.exists()) << endl;
CertificateData cd = ca.getCertificate(c);
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ConvertTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ConvertTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ConvertTest.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/PathUtils.hpp>
#include <limal/Exception.hpp>
@@ -17,7 +13,7 @@
#include <fstream>
#include <unistd.h>
-using namespace blocxx;
+#include "TestLineFormater2.hpp"
using namespace ca_mgm;
using namespace std;
@@ -30,21 +26,15 @@
{
cout << "START" << endl;
- StringArray cat;
- cat.push_back("FATAL");
- // do not log errors because the openssl errors include a pid which changes everytime
- //cat.push_back("ERROR");
- cat.push_back("INFO");
- //cat.push_back("DEBUG");
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "ConvertTest",
- LogAppender::ALL_COMPONENTS,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater2());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ // TestLineFormater2 do not log errors because the openssl errors include
+ // a pid which changes everytime
+ logger.setLogLevel( logger::E_INFO );
+ logger.logToStdErr();
cout << "===================== Test x509Convert =====================" << endl;
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/DeleteCATest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/DeleteCATest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/DeleteCATest.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/PathUtils.hpp>
#include <limal/Exception.hpp>
@@ -14,7 +10,7 @@
#include <fstream>
#include <unistd.h>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -26,13 +22,11 @@
cout << "START" << endl;
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "DeleteCATest",
- LogAppender::ALL_COMPONENTS,
- LogAppender::ALL_CATEGORIES,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_DEBUG );
+ logger.logToStdErr();
// fake the index.txt
path::copyFile("./TestRepos/Test_CA1/index.txt",
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ExportTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ExportTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ExportTest.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/PathUtils.hpp>
#include <limal/Exception.hpp>
@@ -16,7 +12,7 @@
#include <fstream>
#include <unistd.h>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -29,21 +25,12 @@
{
cout << "START" << endl;
- StringArray cat;
- cat.push_back("FATAL");
- cat.push_back("ERROR");
- cat.push_back("INFO");
- //cat.push_back("DEBUG");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "ExportTest",
- LogAppender::ALL_COMPONENTS,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
-
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_INFO );
+ logger.logToStdErr();
CA ca("SUSEIPsecCA", "system", "./TestRepos3/");
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/IPv6CheckTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/IPv6CheckTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/IPv6CheckTest.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
@@ -15,7 +11,7 @@
#include <fstream>
#include <unistd.h>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -26,20 +22,12 @@
{
cout << "START" << endl;
- StringArray cat;
- cat.push_back("FATAL");
- cat.push_back("ERROR");
- cat.push_back("INFO");
- //cat.push_back("DEBUG");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "IPv6CheckTest",
- LogAppender::ALL_COMPONENTS,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_INFO );
+ logger.logToStdErr();
cout << "=================== start Test ======================" << endl;
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCATest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCATest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCATest.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/PathUtils.hpp>
#include <limal/Exception.hpp>
@@ -15,7 +11,7 @@
#include <fstream>
#include <unistd.h>
-using namespace blocxx;
+#include "TestLineFormater2.hpp"
using namespace ca_mgm;
using namespace std;
@@ -26,20 +22,13 @@
{
cout << "START" << endl;
- StringArray cat;
- cat.push_back("FATAL");
- //cat.push_back("ERROR");
- cat.push_back("INFO");
- //cat.push_back("DEBUG");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "ImportCATest",
- LogAppender::ALL_COMPONENTS,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater2());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ // TestLineFormater2.hpp do not log errors
+ logger.setLogLevel( logger::E_INFO );
+ logger.logToStdErr();
try
{
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCommonCertificateTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCommonCertificateTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCommonCertificateTest.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/PathUtils.hpp>
#include <limal/Exception.hpp>
@@ -16,7 +12,7 @@
#include <fstream>
#include <unistd.h>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -27,20 +23,12 @@
{
cout << "START" << endl;
- StringArray cat;
- cat.push_back("FATAL");
- cat.push_back("ERROR");
- cat.push_back("INFO");
- //cat.push_back("DEBUG");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "ImportCommonCertificateTest",
- LogAppender::ALL_COMPONENTS,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_INFO );
+ logger.logToStdErr();
CA ca2("SUSEUserCA", "system", "./TestRepos3/");
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportRequestTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportRequestTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportRequestTest.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
@@ -13,7 +9,7 @@
#include <fstream>
#include <unistd.h>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -24,20 +20,12 @@
{
cout << "START" << endl;
- StringArray cat;
- cat.push_back("FATAL");
- cat.push_back("ERROR");
- cat.push_back("INFO");
- //cat.push_back("DEBUG");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "ImportRequestTest",
- LogAppender::ALL_COMPONENTS,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_INFO );
+ logger.logToStdErr();
cout << "=================== start ImportRequestTest ======================" << endl;
{
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ListCATreeTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ListCATreeTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ListCATreeTest.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
@@ -13,7 +9,7 @@
#include <fstream>
#include <unistd.h>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -25,13 +21,11 @@
cout << "START" << endl;
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "ListCATreeTest",
- LogAppender::ALL_COMPONENTS,
- LogAppender::ALL_CATEGORIES,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_DEBUG );
+ logger.logToStdErr();
cout << "=================== start CA Tree List ======================" << endl;
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ListTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ListTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ListTest.cc Sat Jul 17 18:38:59 2010
@@ -1,11 +1,7 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/Date.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
@@ -17,7 +13,7 @@
// FIXME: need to be removed
#include <Utils.hpp>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -28,20 +24,12 @@
{
cout << "START" << endl;
- StringArray cat;
- cat.push_back("FATAL");
- cat.push_back("ERROR");
- cat.push_back("INFO");
- cat.push_back("DEBUG");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "ListTest",
- LogAppender::ALL_COMPONENTS,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_DEBUG );
+ logger.logToStdErr();
cout << "=================== start getRequestList ======================" << endl;
{
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCATest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCATest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCATest.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
@@ -13,7 +9,7 @@
#include <fstream>
#include <unistd.h>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -24,20 +20,12 @@
{
cout << "START" << endl;
- StringArray cat;
- cat.push_back("FATAL");
- cat.push_back("ERROR");
- cat.push_back("INFO");
- cat.push_back("DEBUG");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "ParseCATest",
- LogAppender::ALL_COMPONENTS,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_DEBUG );
+ logger.logToStdErr();
cout << "=================== start ParseCATest ======================" << endl;
{
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCRLTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCRLTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCRLTest.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
@@ -15,7 +11,7 @@
// FIXME: need to be removed
#include <Utils.hpp>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -30,13 +26,11 @@
}
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "ParseCRLTest",
- LogAppender::ALL_COMPONENTS,
- LogAppender::ALL_CATEGORIES,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_DEBUG );
+ logger.logToStdErr();
std::string file = argv[ 1 ];
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCertificateTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCertificateTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCertificateTest.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
@@ -15,7 +11,7 @@
// FIXME: need to be removed
#include <Utils.hpp>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -30,13 +26,11 @@
}
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "ParseCertificateTest",
- LogAppender::ALL_COMPONENTS,
- LogAppender::ALL_CATEGORIES,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_DEBUG );
+ logger.logToStdErr();
std::string file = argv[ 1 ];
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCertificateTest2.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCertificateTest2.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCertificateTest2.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/ca-mgm/LocalManagement.hpp>
#include <limal/Exception.hpp>
@@ -16,7 +12,7 @@
// FIXME: need to be removed
#include <Utils.hpp>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -31,13 +27,11 @@
}
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "ParseCertificateTest2",
- LogAppender::ALL_COMPONENTS,
- LogAppender::ALL_CATEGORIES,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_DEBUG );
+ logger.logToStdErr();
std::string file = argv[ 1 ];
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseRequestTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseRequestTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseRequestTest.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
@@ -15,7 +11,7 @@
// FIXME: need to be removed
#include <Utils.hpp>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -30,13 +26,11 @@
}
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "ParseRequestTest",
- LogAppender::ALL_COMPONENTS,
- LogAppender::ALL_CATEGORIES,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_DEBUG );
+ logger.logToStdErr();
std::string file = argv[ 1 ];
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/RemoveCertificateTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/RemoveCertificateTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/RemoveCertificateTest.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
@@ -16,7 +12,7 @@
// FIXME: need to be removed
#include <Utils.hpp>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -27,20 +23,12 @@
{
cout << "START" << endl;
- StringArray cat;
- cat.push_back("FATAL");
- cat.push_back("ERROR");
- cat.push_back("INFO");
- //cat.push_back("DEBUG");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "RemoveCertificateTest",
- LogAppender::ALL_COMPONENTS,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_INFO );
+ logger.logToStdErr();
cout << "=================== start ======================" << endl;
{
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/RemoveRequestTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/RemoveRequestTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/RemoveRequestTest.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
@@ -13,7 +9,7 @@
#include <fstream>
#include <unistd.h>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -24,20 +20,12 @@
{
cout << "START" << endl;
- StringArray cat;
- cat.push_back("FATAL");
- cat.push_back("ERROR");
- cat.push_back("INFO");
- //cat.push_back("DEBUG");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "RemoveRequestTest",
- LogAppender::ALL_COMPONENTS,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_INFO );
+ logger.logToStdErr();
cout << "=================== start ======================" << endl;
{
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/RequestTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/RequestTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/RequestTest.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
@@ -16,31 +12,23 @@
// FIXME: need to be removed
#include <Utils.hpp>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
int main()
{
- try
- {
- cout << "START" << endl;
-
- StringArray cat;
- cat.push_back("FATAL");
- cat.push_back("ERROR");
- cat.push_back("INFO");
- //cat.push_back("DEBUG");
-
- // Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "RequestTest",
- LogAppender::ALL_COMPONENTS,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ try
+ {
+ cout << "START" << endl;
+
+ // Logging
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_INFO );
+ logger.logToStdErr();
CA ca("Test_CA1", "system", "./TestRepos/");
RequestGenerationData rgd = ca.getRequestDefaults(E_Server_Req);
@@ -102,7 +90,7 @@
path::PathInfo pi("./TestRepos/Test_CA1/req/" + r + ".req");
- cout << "Request exists: " << Bool(pi.exists()) << endl;
+ cout << "Request exists: " << str::toString(pi.exists()) << endl;
RequestData rd = ca.getRequest(r);
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
@@ -16,7 +12,7 @@
// FIXME: need to be removed
#include <Utils.hpp>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -27,20 +23,12 @@
{
cout << "START" << endl;
- StringArray cat;
- cat.push_back("FATAL");
- cat.push_back("ERROR");
- cat.push_back("INFO");
- //cat.push_back("DEBUG");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "RevokeTest",
- LogAppender::ALL_COMPONENTS,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_INFO );
+ logger.logToStdErr();
CA ca("Test_CA1", "system", "./TestRepos/");
RequestGenerationData rgd = ca.getRequestDefaults(E_Server_Req);
@@ -76,7 +64,7 @@
path::PathInfo pi("./TestRepos/Test_CA1/newcerts/" + c + ".pem");
- cout << "Certificate exists: " << Bool(pi.exists()) << endl;
+ cout << "Certificate exists: " << str::toString(pi.exists()) << endl;
cout << "Try to revoke it" << endl;
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest2.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest2.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest2.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/ca-mgm/CRLReason.hpp>
@@ -17,7 +13,7 @@
// FIXME: need to be removed
#include <Utils.hpp>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -28,20 +24,12 @@
{
cout << "START" << endl;
- StringArray cat;
- cat.push_back("FATAL");
- cat.push_back("ERROR");
- cat.push_back("INFO");
- //cat.push_back("DEBUG");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "RevokeTest2",
- LogAppender::ALL_COMPONENTS,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_INFO );
+ logger.logToStdErr();
CA ca("Test_CA1", "system", "./TestRepos/");
RequestGenerationData rgd = ca.getRequestDefaults(E_Server_Req);
@@ -78,7 +66,7 @@
path::PathInfo pi("./TestRepos/Test_CA1/newcerts/" + c + ".pem");
- cout << "Certificate exists: " << Bool(pi.exists()) << endl;
+ cout << "Certificate exists: " << str::toString(pi.exists()) << endl;
cout << "Try to revoke it" << endl;
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest3.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest3.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest3.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/ca-mgm/CRLReason.hpp>
@@ -17,7 +13,7 @@
// FIXME: need to be removed
#include <Utils.hpp>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -28,20 +24,12 @@
{
cout << "START" << endl;
- StringArray cat;
- cat.push_back("FATAL");
- cat.push_back("ERROR");
- cat.push_back("INFO");
- //cat.push_back("DEBUG");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "RevokeTest3",
- LogAppender::ALL_COMPONENTS,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_INFO );
+ logger.logToStdErr();
CA ca("Test_CA1", "system", "./TestRepos/");
RequestGenerationData rgd = ca.getRequestDefaults(E_Server_Req);
@@ -78,7 +66,7 @@
path::PathInfo pi("./TestRepos/Test_CA1/newcerts/" + c + ".pem");
- cout << "Certificate exists: " << Bool(pi.exists()) << endl;
+ cout << "Certificate exists: " << str::toString(pi.exists()) << endl;
cout << "Try to revoke it" << endl;
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest4.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest4.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest4.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/ca-mgm/CRLReason.hpp>
@@ -17,7 +13,7 @@
// FIXME: need to be removed
#include <Utils.hpp>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -28,20 +24,12 @@
{
cout << "START" << endl;
- StringArray cat;
- cat.push_back("FATAL");
- cat.push_back("ERROR");
- cat.push_back("INFO");
- //cat.push_back("DEBUG");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "RevokeTest4",
- LogAppender::ALL_COMPONENTS,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_INFO );
+ logger.logToStdErr();
CA ca("Test_CA1", "system", "./TestRepos/");
RequestGenerationData rgd = ca.getRequestDefaults(E_Server_Req);
@@ -78,7 +66,7 @@
path::PathInfo pi("./TestRepos/Test_CA1/newcerts/" + c + ".pem");
- cout << "Certificate exists: " << Bool(pi.exists()) << endl;
+ cout << "Certificate exists: " << str::toString(pi.exists()) << endl;
cout << "Try to revoke it" << endl;
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest5.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest5.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest5.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/ca-mgm/CRLReason.hpp>
@@ -17,7 +13,7 @@
// FIXME: need to be removed
#include <Utils.hpp>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -28,20 +24,12 @@
{
cout << "START" << endl;
- StringArray cat;
- cat.push_back("FATAL");
- cat.push_back("ERROR");
- cat.push_back("INFO");
- //cat.push_back("DEBUG");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "RevokeTest5",
- LogAppender::ALL_COMPONENTS,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_INFO );
+ logger.logToStdErr();
CA ca("Test_CA1", "system", "./TestRepos/");
RequestGenerationData rgd = ca.getRequestDefaults(E_Server_Req);
@@ -78,7 +66,7 @@
path::PathInfo pi("./TestRepos/Test_CA1/newcerts/" + c + ".pem");
- cout << "Certificate exists: " << Bool(pi.exists()) << endl;
+ cout << "Certificate exists: " << str::toString(pi.exists()) << endl;
cout << "Try to revoke it" << endl;
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/SubCATest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/SubCATest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/SubCATest.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
@@ -13,7 +9,7 @@
#include <fstream>
#include <unistd.h>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -24,20 +20,12 @@
{
cout << "START" << endl;
- StringArray cat;
- cat.push_back("FATAL");
- cat.push_back("ERROR");
- cat.push_back("INFO");
- //cat.push_back("DEBUG");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "SubCATest",
- LogAppender::ALL_COMPONENTS,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_INFO );
+ logger.logToStdErr();
CA ca("Test_CA1", "system", "./TestRepos/");
RequestGenerationData rgd = ca.getRequestDefaults(E_CA_Req);
@@ -76,7 +64,7 @@
path::PathInfo pi2("./TestRepos/SubCA_Test/cacert.pem");
- cout << "Sub CA exists: " << Bool(pi2.exists()) << endl;
+ cout << "Sub CA exists: " << str::toString(pi2.exists()) << endl;
cout << "DONE" << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt Sat Jul 17 18:38:59 2010
@@ -1,14 +1,14 @@
-d12f85f32848ae7f9f1d8064813aaa53-1278837926 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-68b3a1b7290aadfd42361b1b3c14e69a-1278837929 /C=DE/CN=Test Server Certificate\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1278837933 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1278837937 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1278837940 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-d12f85f32848ae7f9f1d8064813aaa53-1278837949 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-c293624b6a877f401407ce8f8f1f327e-1278837950 /C=DE/L=Nuremberg/O=SUSE Linux GmbH/OU=IT/CN=SUSE User CA/emailAddress=security-team(a)suse.de
-d12f85f32848ae7f9f1d8064813aaa53-1278837952 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-c1943ae4b9bd7320fae3e29f217483e3-1278837952 /C=DE/CN=Test Request/emailAddress=suse(a)suse.de
-d816690a832b0e52becd255d3a62e975-1278837955 /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse(a)suse.de
-9198f6798d9da70d7cbfb67b610633f5-1278837957 /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse(a)suse.de
-3e248858337c2b46dc67a0f9389376dd-1278837958 /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse(a)suse.de
-bf04fdd95062554800c1556085f47063-1278837960 /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse(a)suse.de
-9797ac11af29f94b82c1e5b0499ab5f2-1278837962 /C=DE/CN=Test Sub CA/emailAddress=suse(a)suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1279384536 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
+68b3a1b7290aadfd42361b1b3c14e69a-1279384539 /C=DE/CN=Test Server Certificate\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1279384543 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1279384546 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1279384550 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1279384559 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
+c293624b6a877f401407ce8f8f1f327e-1279384560 /C=DE/L=Nuremberg/O=SUSE Linux GmbH/OU=IT/CN=SUSE User CA/emailAddress=security-team(a)suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1279384562 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
+c1943ae4b9bd7320fae3e29f217483e3-1279384563 /C=DE/CN=Test Request/emailAddress=suse(a)suse.de
+d816690a832b0e52becd255d3a62e975-1279384566 /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse(a)suse.de
+9198f6798d9da70d7cbfb67b610633f5-1279384567 /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse(a)suse.de
+3e248858337c2b46dc67a0f9389376dd-1279384569 /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse(a)suse.de
+bf04fdd95062554800c1556085f47063-1279384571 /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse(a)suse.de
+9797ac11af29f94b82c1e5b0499ab5f2-1279384574 /C=DE/CN=Test Sub CA/emailAddress=suse(a)suse.de
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt Sat Jul 17 18:38:59 2010
@@ -1,11 +1,11 @@
-V 110711084528Z 01 unknown /C=DE/CN=Test CA/SUSE Inc.\Gmbh/emailAddress=suse(a)suse.de
-V 110711084529Z 02 unknown /C=DE/CN=Test Server Certificate/SUSE Inc.\Gmbh/emailAddress=suse(a)suse.de
-V 110711084530Z 03 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-V 110711084534Z 04 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-V 110711084537Z 05 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-R 110711084554Z 100711084555Z 06 unknown /C=DE/CN=Test Certificate for revocation/emailAddress=suse(a)suse.de
-R 110711084555Z 100711084556Z,holdInstruction,holdInstructionCallIssuer 07 unknown /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse(a)suse.de
-R 110711084556Z 100711084558Z,keyTime,20100711082918Z 08 unknown /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse(a)suse.de
-R 110711084558Z 100711084559Z,CAkeyTime,20100711082919Z 09 unknown /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse(a)suse.de
-R 110711084600Z 100711084601Z,holdInstruction,1.6.21.43 0A unknown /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse(a)suse.de
-V 120710084602Z 0B unknown /C=DE/CN=Test Sub CA/emailAddress=suse(a)suse.de
+V 110717163538Z 01 unknown /C=DE/CN=Test CA/SUSE Inc.\Gmbh/emailAddress=suse(a)suse.de
+V 110717163539Z 02 unknown /C=DE/CN=Test Server Certificate/SUSE Inc.\Gmbh/emailAddress=suse(a)suse.de
+V 110717163541Z 03 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+V 110717163544Z 04 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+V 110717163547Z 05 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+R 110717163604Z 100717163605Z 06 unknown /C=DE/CN=Test Certificate for revocation/emailAddress=suse(a)suse.de
+R 110717163606Z 100717163607Z,holdInstruction,holdInstructionCallIssuer 07 unknown /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse(a)suse.de
+R 110717163607Z 100717163608Z,keyTime,20100717161928Z 08 unknown /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse(a)suse.de
+R 110717163609Z 100717163611Z,CAkeyTime,20100717161931Z 09 unknown /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse(a)suse.de
+R 110717163611Z 100717163613Z,holdInstruction,1.6.21.43 0A unknown /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse(a)suse.de
+V 120716163614Z 0B unknown /C=DE/CN=Test Sub CA/emailAddress=suse(a)suse.de
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/.rand
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
Binary files - no diff available.
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem Sat Jul 17 18:38:59 2010
@@ -1,7 +1,7 @@
-----BEGIN X509 CRL-----
MIIC+TCCAeECAQEwDQYJKoZIhvcNAQEFBQAwQzELMAkGA1UEBhMCREUxFzAVBgNV
BAMTDlN0YXRpYyBUZXN0IENBMRswGQYJKoZIhvcNAQkBFgxzdXNlQHN1c2UuZGUX
-DTEwMDcxMTA4NDYwNVoXDTEwMDcxMjA4NDYwNVowgfAwEgIBAxcNMDUwODE4MTQx
+DTEwMDcxNzE2MzYxNloXDTEwMDcxODE2MzYxNlowgfAwEgIBAxcNMDUwODE4MTQx
MzIzWjAyAgEEFw0wNTA4MTgxNDEzMjVaMB4wCgYDVR0VBAMKAQYwEAYDVR0XBAkG
ByqGSM44AgIwOgIBBRcNMDUwODE4MTQxMzI2WjAmMAoGA1UdFQQDCgEBMBgGA1Ud
GAQRGA8yMDA1MDgxODE1NTY0NlowOgIBBhcNMDUwODE4MTQxMzI4WjAmMAoGA1Ud
@@ -9,10 +9,10 @@
ODE4WjAaMAoGA1UdFQQDCgEGMAwGA1UdFwQFBgMuFSugdzB1MHMGA1UdIwRsMGqA
FDIAwASkKojCPsrVvdhM01KIIH87oUekRTBDMQswCQYDVQQGEwJERTEXMBUGA1UE
AxMOU3RhdGljIFRlc3QgQ0ExGzAZBgkqhkiG9w0BCQEWDHN1c2VAc3VzZS5kZYIJ
-AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQCfKPuSKHex8PLKu36xEejHCTvu
-cW1Ou06MHdimacq8qR6tFyjnbTu6kONPxFhDEy6WTy4np2z9aaeoEHEwbgG/+FXk
-4Q8qKD9qDXt0hMJsINTk61XVWProI1zB2n0Um4vmlggGpxJrgOhzZiDey+PY+iOx
-R+VoP0dCDRkNfAnQ1Pe1cG4J1ap57K0y9l5OwhioZDZr7iQOaqMmr1c/QTsTxl2Y
-4gCGqEliFJWwCHG6UuYjJrZcBkksI/VyUo8TXeBKNCgUKCuVu+hMakTiJo8fpzDe
-n8BBFFMluOjCrIboDU9R1wXmGhc8O177zlyEDCGtiELPULtR7lzZ3z21Rvxs
+AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQBRgzzcV4mcVj5oCUOSCVXI6XlS
+8A1bw5j8lcMgZ1hybzXxi2ZnuzDySFVZ67StiVA+5xWzuZ1iEpaO4peYmamHZsQ8
+qaCrxbg3TJQCR5pleaDXMTQbMneh9bKCyzCOHetI52kgly0x0zwx8lrdVFnOKHhH
+qyzBasu/J/DVnCG73kSmbZJnYWMSFI4V09Z5G03H1R0yWDf+V/rFHf4j9vYphcE1
+csZdnZq81nMpL7/m1DfoYTAF/Y2rwn/upmzqJm6Hf137GVnfDmL2C1hnQbhC4VoA
+ai/P3xXiifSzWkAWZocg1Niv5Zqr8C0wsfdOr+cQXjAHmmsTjlDDs9ha9kRZ
-----END X509 CRL-----
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/UpdateDBTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/UpdateDBTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/UpdateDBTest.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
@@ -13,7 +9,7 @@
#include <fstream>
#include <unistd.h>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -24,20 +20,12 @@
{
cout << "START" << endl;
- StringArray cat;
- cat.push_back("FATAL");
- cat.push_back("ERROR");
- cat.push_back("INFO");
- //cat.push_back("DEBUG");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "UpdateDBTest",
- LogAppender::ALL_COMPONENTS,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_INFO );
+ logger.logToStdErr();
cout << "=================== start Update DB ======================" << endl;
{
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/VerifyTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/VerifyTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/VerifyTest.cc Sat Jul 17 18:38:59 2010
@@ -1,10 +1,6 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
#include <limal/String.hpp>
#include <limal/PerlRegEx.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
@@ -13,7 +9,7 @@
#include <fstream>
#include <unistd.h>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm;
using namespace std;
@@ -24,24 +20,12 @@
{
cout << "START" << endl;
- StringArray cat;
- cat.push_back("FATAL");
- cat.push_back("ERROR");
- cat.push_back("INFO");
- cat.push_back("DEBUG");
-
- StringArray comp;
- comp.push_back("ca-mgm");
- comp.push_back("limal");
-
// Logging
- LoggerRef l = ca_mgm::Logger::createCerrLogger(
- "VerifyTest",
- comp,
- cat,
- "%-5p %c - %m"
- );
- ca_mgm::Logger::setDefaultLogger(l);
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_DEBUG );
+ logger.logToStdErr();
cout << "=================== start Verify Test ======================" << endl;
{
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser.cc Sat Jul 17 18:38:59 2010
@@ -1,9 +1,8 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
+
+#define LIMAL_LOGGER_LOGGROUP "parser"
+
#include <limal/String.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include "INIParser/INIParser.hpp"
#include <limal/Exception.hpp>
@@ -11,405 +10,389 @@
#include <fstream>
#include <unistd.h>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
using namespace ca_mgm::INI;
using namespace ca_mgm;
-ca_mgm::Logger logger("parser");
-
void addEntries(Section descSection, Section section)
{
- // Adding entries
- EntryMap eMap= descSection.getEntries();
- for (EntryMap::iterator i = eMap.begin(); i != eMap.end(); i++)
- {
- Entry entry = i->second;
+ // Adding entries
+ EntryMap eMap= descSection.getEntries();
+ for (EntryMap::iterator i = eMap.begin(); i != eMap.end(); i++)
+ {
+ Entry entry = i->second;
- if (!section.addEntry (i->first, entry.getValue(), entry.getComment()))
- {
- LIMAL_SLOG(logger, "ERROR",
- "Adding " << i->first
- << " : " << entry.getValue());
- }
+ if (!section.addEntry (i->first, entry.getValue(), entry.getComment()))
+ {
+ ERR << "Adding " << i->first << " : " << entry.getValue() << std::endl;
}
+ }
- // Adding Entries and SubSections
+ // Adding Entries and SubSections
- SectionMap sMap = descSection.getSections();
- for (SectionMap::iterator i = sMap.begin(); i != sMap.end(); i++)
+ SectionMap sMap = descSection.getSections();
+ for (SectionMap::iterator i = sMap.begin(); i != sMap.end(); i++)
+ {
+ Section sec = i->second;
+
+ // evaluate source section
+ if (section.contains (i->first) != SECTION &&
+ section.contains (i->first) !=VALUEandSECTION )
{
- Section sec = i->second;
+ INF << "Creating Subsection " << i->first << std::endl;
- // evaluate source section
- if (section.contains (i->first) != SECTION &&
- section.contains (i->first) !=VALUEandSECTION )
- {
- LIMAL_SLOG_INFO(logger, "Creating Subsection " << i->first);
-
- Section newSection(i->first,section);
- newSection.setComment (sec.getComment ());
-
- addEntries (sec, newSection );
- }
- else
- {
- (section.getSection (i->first)).setComment (sec.getComment ());
- addEntries (sec, section.getSection (i->first));
- }
+ Section newSection(i->first,section);
+ newSection.setComment (sec.getComment ());
+
+ addEntries (sec, newSection );
+ }
+ else
+ {
+ (section.getSection (i->first)).setComment (sec.getComment ());
+ addEntries (sec, section.getSection (i->first));
}
+ }
}
void deleteEntries(Section descSection, Section section)
{
- // Deleting entries
+ // Deleting entries
- EntryMap eMap= descSection.getEntries();
- for (EntryMap::iterator i = eMap.begin(); i != eMap.end(); i++)
- {
- Entry entry = i->second;
- LIMAL_SLOG_INFO(logger, "Deleting Entry: " << i->first);
+ EntryMap eMap= descSection.getEntries();
+ for (EntryMap::iterator i = eMap.begin(); i != eMap.end(); i++)
+ {
+ Entry entry = i->second;
+ INF << "Deleting Entry: " << i->first << std::endl;
- if (!section.delEntry (i->first))
- {
- LIMAL_SLOG(logger, "ERROR",
- "Deleting entry " << i->first);
- }
+ if (!section.delEntry (i->first))
+ {
+ ERR << "Deleting entry " << i->first << std::endl;
}
+ }
- // Deleting sections if it has no entry
+ // Deleting sections if it has no entry
- SectionMap sMap = descSection.getSections();
- for (SectionMap::iterator i = sMap.begin(); i != sMap.end(); i++)
+ SectionMap sMap = descSection.getSections();
+ for (SectionMap::iterator i = sMap.begin(); i != sMap.end(); i++)
+ {
+ Section sec = i->second;
+ if ( sec.sectionSize() <= 0
+ && sec.entrySize() <= 0)
+ {
+ // This section has no enties, so it will be deleted
+ INF << "Deleting Section: " << i->first << std::endl;
+ if (!section.delSection (i->first))
+ {
+ ERR << "Deleting section " << i->first << std::endl;
+ }
+ }
+ else
{
- Section sec = i->second;
- if ( sec.sectionSize() <= 0
- && sec.entrySize() <= 0)
- {
- // This section has no enties, so it will be deleted
- LIMAL_SLOG_INFO(logger, "Deleting Section: " << i->first);
- if (!section.delSection (i->first))
- {
- LIMAL_SLOG(logger, "ERROR",
- "Deleting section " << i->first);
- }
- }
- else
- {
- // It has entries. So we look forward
- deleteEntries (sec, section.getSection (i->first));
- }
+ // It has entries. So we look forward
+ deleteEntries (sec, section.getSection (i->first));
}
+ }
}
void searchEntries(Section descSection, Section section)
{
- // searching entries
+ // searching entries
- EntryMap eMap= descSection.getEntries();
- for (EntryMap::iterator i = eMap.begin(); i != eMap.end(); i++)
+ EntryMap eMap= descSection.getEntries();
+ for (EntryMap::iterator i = eMap.begin(); i != eMap.end(); i++)
+ {
+ Entry entry = i->second;
+ INF << "Searching for Entry: " << i->first << " Ignore case : " << entry.getValue() << std::endl;
+ EntryMap eMap = section.selectEntries (i->first,
+ entry.getValue() == "true" ? true : false);
+ for (EntryMap::iterator i = eMap.begin();
+ i != eMap.end(); i++)
{
- Entry entry = i->second;
- LIMAL_SLOG_INFO(logger, "Searching for Entry: " << i->first
- << " Ignore case : " << entry.getValue());
- EntryMap eMap = section.selectEntries (i->first,
- entry.getValue() == "true" ? true : false);
- for (EntryMap::iterator i = eMap.begin();
- i != eMap.end(); i++)
- {
- Entry entry = i->second;
- LIMAL_SLOG_INFO(logger, " found " << i->first << " : "
- << entry.getValue());
- }
+ Entry entry = i->second;
+ INF << " found " << i->first << " : "
+ << entry.getValue() << std::endl;
}
+ }
}
-
void searchSections(Section descSection, Section section)
{
- // searching sections
+ // searching sections
- EntryMap eMap= descSection.getEntries();
- for (EntryMap::iterator i = eMap.begin(); i != eMap.end(); i++)
+ EntryMap eMap= descSection.getEntries();
+ for (EntryMap::iterator i = eMap.begin(); i != eMap.end(); i++)
+ {
+ Entry entry = i->second;
+ INF << "Searching for Section: " << i->first
+ << " Ignore case : " << entry.getValue() << std::endl;
+ SectionMap eMap = section.selectSections (i->first,
+ entry.getValue()
+ == "true" ? true : false);
+ for (SectionMap::iterator i = eMap.begin();
+ i != eMap.end(); i++)
{
- Entry entry = i->second;
- LIMAL_SLOG_INFO(logger, "Searching for Section: " << i->first
- << " Ignore case : " << entry.getValue());
- SectionMap eMap = section.selectSections (i->first,
- entry.getValue()
- == "true" ? true : false);
- for (SectionMap::iterator i = eMap.begin();
- i != eMap.end(); i++)
- {
- LIMAL_SLOG_INFO(logger, " found " << i->first);
- }
+ INF << " found " << i->first << std::endl;
}
+ }
}
void dumpTree(Section *section, int level = 0)
{
- std::string tab = "";
- for (int i = 0; i <= level; i++) tab += " ";
+ std::string tab = "";
+ for (int i = 0; i <= level; i++) tab += " ";
- if (level == 0)
- LIMAL_SLOG_INFO(logger, tab);
+ if (level == 0)
+ INF << tab << std::endl;
- LIMAL_SLOG_INFO(logger, tab <<
- "SectionComment " << section->getComment());
+ INF << tab <<
+ "SectionComment " << section->getComment() << std::endl;
- EntryMap eMap= section->getEntries();
- for (EntryMap::iterator i = eMap.begin(); i != eMap.end(); i++)
- {
- Entry entry = i->second;
- LIMAL_SLOG_INFO(logger, tab <<
- "Comment " << i->first << " : " << entry.getComment());
- LIMAL_SLOG_INFO(logger, tab <<
- "Entry " << i->first << " : " << entry.getValue());
- }
-
- SectionMap sMap = section->getSections();
- for (SectionMap::iterator i = sMap.begin(); i != sMap.end(); i++)
- {
- Section sec = i->second;
- LIMAL_SLOG_INFO(logger, tab <<
- "Section " << i->first);
- dumpTree (&sec, ++level);
- }
+ EntryMap eMap= section->getEntries();
+ for (EntryMap::iterator i = eMap.begin(); i != eMap.end(); i++)
+ {
+ Entry entry = i->second;
+ INF << tab <<
+ "Comment " << i->first << " : " << entry.getComment() << std::endl;
+ INF <<tab <<
+ "Entry " << i->first << " : " << entry.getValue() << std::endl;
+ }
+
+ SectionMap sMap = section->getSections();
+ for (SectionMap::iterator i = sMap.begin(); i != sMap.end(); i++)
+ {
+ Section sec = i->second;
+ INF << tab << "Section " << i->first << std::endl;
+ dumpTree (&sec, ++level);
+ }
}
int main(int argc, char **argv)
{
- std::cout << "START" << std::endl;
- if ( argc != 2 )
- {
- std::cerr << "Usage: iniParser <filepath>" << std::endl;
- std::cout << "DONE" << std::endl;
- exit( 1 );
- }
-
- // Logging
- blocxx::LogAppenderRef logAppender(new CerrAppender(
- LogAppender::ALL_COMPONENTS,
- LogAppender::ALL_CATEGORIES,
- // category component - message
- "%-5p %c - %m"
- ));
- blocxx::LoggerRef appLogger(new AppenderLogger(
- "parser_test",
- E_ALL_LEVEL,
- logAppender
- ));
- ca_mgm::Logger::setDefaultLogger(appLogger);
-
- // Loading description file
- INIParser descParser;
- std::vector<Options> options;
- std::vector<std::string> commentsDescr;
- std::vector<SectionDescr> sectionDescr;
- std::vector<EntryDescr> entryDescr;
- std::vector<IoPatternDescr> rewrites;
- std::string file = argv[ 1 ];
- std::cout << "== loading file : " << file << std::endl;
-
- descParser.initFiles (file);
- options.push_back (GLOBAL_VALUES);
- IoPatternDescr pattern = {"^[ \t]*([^=]*[^ \t=])[ \t]*=[ \t]*(.*[^ \t]|)[ \t]*$" ,"%s=%s"};
- EntryDescr eDescr = {pattern, "", "" ,false};
- entryDescr.push_back (eDescr);
- commentsDescr.push_back(std::string("^[ \t]*;.*"));
-
- IoPatternDescr patternBegin = {"[ \t]*\\+([A-Za-z0-9_]+)[ \t]*", "+%s"};
- IoPatternDescr patternEnd = {"[ \t]*\\-([A-Za-z0-9_]+)[ \t]*", "-%s"};
- SectionDescr sDescr = {patternBegin, patternEnd , true };
- sectionDescr.push_back (sDescr);
-
- if (!descParser.initMachine (options, commentsDescr, sectionDescr,
- entryDescr, rewrites, " "))
- {
- LIMAL_SLOG(logger, "ERROR", "Cannot initialize parser for configuration file " << file);
- exit (1);
- }
-
- if (!descParser.parse ())
- {
- LIMAL_SLOG(logger, "ERROR", "Cannot parse configuration file " << file);
- exit (1);
- }
-
-
- LIMAL_SLOG(logger, "DEBUG", "Configuration file " << file << " parsed.");
- dumpTree(&(descParser.iniFile));
-
- // Initialize parser for testfile
- INIParser parser;
-
- options.clear();
- commentsDescr.clear();
- sectionDescr.clear();
- entryDescr.clear();
- rewrites.clear();
-
- int counter = 1;
- Key key;
- Value value;
-
- key = "option1";
- while (descParser.iniFile.contains (key) == VALUE)
- {
- value = descParser.iniFile.getValue (key);
-#define COMPARE_OPTION(X) if (value == #X) options.push_back(X); else
- COMPARE_OPTION(IGNOMR_CASE_REGEXPS);
- COMPARE_OPTION(IGNORE_CASE);
- COMPARE_OPTION(FIRST_UPPER);
- COMPARE_OPTION(PREFER_UPPERCASE);
- COMPARE_OPTION(LINE_CAN_CONTINUE);
- COMPARE_OPTION(NO_NESTED_SECTIONS);
- COMPARE_OPTION(GLOBAL_VALUES);
- COMPARE_OPTION(REPEAT_NAMES);
- COMPARE_OPTION(COMMENTS_LAST);
- COMPARE_OPTION(JOIN_MULTILINE);
- COMPARE_OPTION(NO_FINALCOMMENT_KILL);
- COMPARE_OPTION(READ_ONLY);
-
- key = "option";
- key += str::numstring(++counter);
- }
-
- counter = 1;
- key = "comment1";
- while (descParser.iniFile.contains (key) == VALUE)
- {
- commentsDescr.push_back (descParser.iniFile.getValue (key));
- key = "comment";
- key += str::numstring(++counter);
- }
-
- counter = 1;
- key = "match1";
- while (descParser.iniFile.contains (key) == VALUE)
- {
- std::string keyWrite = "write" + str::numstring(counter);
- IoPatternDescr pattern = {descParser.iniFile.getValue (key) ,
- descParser.iniFile.getValue (keyWrite)};
- EntryDescr eDescr = {pattern, "", "" ,false};
- entryDescr.push_back (eDescr);
- key = "match";
- key += str::numstring(++counter);
- }
-
- counter = 1;
- key = "secBeginReg1";
- while (descParser.iniFile.contains (key) == VALUE)
- {
- std::string keyWrite = "secBeginWrite" + str::numstring(counter);
- IoPatternDescr patternBegin = {descParser.iniFile.getValue (key) ,
- descParser.iniFile.getValue (keyWrite)};
- key = "secEndReg" + str::numstring(counter);
- keyWrite = "secEndWrite" + str::numstring(counter);
- IoPatternDescr patternEnd = {descParser.iniFile.getValue (key),
- descParser.iniFile.getValue (keyWrite)};
- SectionDescr sDescr = {patternBegin, patternEnd ,
- descParser.iniFile.contains (key) == VALUE };
- sectionDescr.push_back (sDescr);
- key = "secBeginReg";
- key += str::numstring(++counter);
- }
-
- // Parsing input file
-
- std::string srcFile = file + std::string("i.test");
- std::string command = "/bin/cp " + file + "i " + srcFile;
- system(command.c_str());
- parser.initFiles (srcFile);
-
- if (!parser.initMachine (options, commentsDescr, sectionDescr,
- entryDescr, rewrites, " "))
- {
- LIMAL_SLOG(logger, "ERROR", "Cannot initialize parser for file " << srcFile);
- exit (1);
- }
-
- if (!parser.parse ())
- {
- LIMAL_SLOG(logger, "ERROR", "Cannot parse file " << srcFile);
- exit (1);
- }
-
- LIMAL_SLOG(logger, "DEBUG", "file " << srcFile << " parsed.");
- dumpTree(&(parser.iniFile));
-
- // Changing entries
- counter = 1;
- key = "add1";
- while (descParser.iniFile.contains (key) == SECTION)
- {
- Section section = descParser.iniFile.getSection (key);
- addEntries (section, parser.iniFile);
- key = "add";
- key += str::numstring(++counter);
- }
-
- // Deleting entries
- counter = 1;
- key = "delete1";
- while (descParser.iniFile.contains (key) == SECTION)
- {
- Section section = descParser.iniFile.getSection (key);
- deleteEntries (section, parser.iniFile);
- key = "delete";
- key += str::numstring(++counter);
- }
-
- // Searching entries
- counter = 1;
- key = "searchEntry1";
- while (descParser.iniFile.contains (key) == SECTION)
- {
- Section section = descParser.iniFile.getSection (key);
- searchEntries (section, parser.iniFile);
- key = "searchEntry";
- key += str::numstring(++counter);
- }
-
- // Searching sections
- counter = 1;
- key = "searchSection1";
- while (descParser.iniFile.contains (key) == SECTION)
- {
- Section section = descParser.iniFile.getSection (key);
- searchSections (section, parser.iniFile);
- key = "searchSection";
- key += str::numstring(++counter);
- }
-
-
- parser.write();
-
- // Re-reading testfile
- INIParser testparser;
- testparser.initFiles (srcFile);
-
- if (!testparser.initMachine (options, commentsDescr, sectionDescr,
- entryDescr, rewrites, " "))
- {
- LIMAL_SLOG(logger, "ERROR", "Cannot initialize parser for file " << srcFile);
- exit (1);
- }
-
- if (!testparser.parse ())
- {
- LIMAL_SLOG(logger, "ERROR", "Cannot parse file " << srcFile);
- exit (1);
- }
+ std::cout << "START" << std::endl;
+ if ( argc != 2 )
+ {
+ std::cerr << "Usage: iniParser <filepath>" << std::endl;
+ std::cout << "DONE" << std::endl;
+ exit( 1 );
+ }
+
+ // Logging
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_DEBUG );
+ logger.logToStdErr();
+
+ // Loading description file
+ INIParser descParser;
+ std::vector<Options> options;
+ std::vector<std::string> commentsDescr;
+ std::vector<SectionDescr> sectionDescr;
+ std::vector<EntryDescr> entryDescr;
+ std::vector<IoPatternDescr> rewrites;
+ std::string file = argv[ 1 ];
+ std::cout << "== loading file : " << file << std::endl;
+
+ descParser.initFiles (file);
+ options.push_back (GLOBAL_VALUES);
+ IoPatternDescr pattern = {"^[ \t]*([^=]*[^ \t=])[ \t]*=[ \t]*(.*[^ \t]|)[ \t]*$" ,"%s=%s"};
+ EntryDescr eDescr = {pattern, "", "" ,false};
+ entryDescr.push_back (eDescr);
+ commentsDescr.push_back(std::string("^[ \t]*;.*"));
+
+ IoPatternDescr patternBegin = {"[ \t]*\\+([A-Za-z0-9_]+)[ \t]*", "+%s"};
+ IoPatternDescr patternEnd = {"[ \t]*\\-([A-Za-z0-9_]+)[ \t]*", "-%s"};
+ SectionDescr sDescr = {patternBegin, patternEnd , true };
+ sectionDescr.push_back (sDescr);
+
+ if (!descParser.initMachine (options, commentsDescr, sectionDescr,
+ entryDescr, rewrites, " "))
+ {
+ ERR << "Cannot initialize parser for configuration file " << file << std::endl;
+ exit (1);
+ }
+
+ if (!descParser.parse ())
+ {
+ ERR << "Cannot parse configuration file " << file << std::endl;
+ exit (1);
+ }
+
+
+ DBG << "Configuration file " << file << " parsed." << std::endl;
+ dumpTree(&(descParser.iniFile));
+
+ // Initialize parser for testfile
+ INIParser parser;
+
+ options.clear();
+ commentsDescr.clear();
+ sectionDescr.clear();
+ entryDescr.clear();
+ rewrites.clear();
+
+ int counter = 1;
+ Key key;
+ Value value;
+
+ key = "option1";
+ while (descParser.iniFile.contains (key) == VALUE)
+ {
+ value = descParser.iniFile.getValue (key);
+ #define COMPARE_OPTION(X) if (value == #X) options.push_back(X); else
+ COMPARE_OPTION(IGNOMR_CASE_REGEXPS);
+ COMPARE_OPTION(IGNORE_CASE);
+ COMPARE_OPTION(FIRST_UPPER);
+ COMPARE_OPTION(PREFER_UPPERCASE);
+ COMPARE_OPTION(LINE_CAN_CONTINUE);
+ COMPARE_OPTION(NO_NESTED_SECTIONS);
+ COMPARE_OPTION(GLOBAL_VALUES);
+ COMPARE_OPTION(REPEAT_NAMES);
+ COMPARE_OPTION(COMMENTS_LAST);
+ COMPARE_OPTION(JOIN_MULTILINE);
+ COMPARE_OPTION(NO_FINALCOMMENT_KILL);
+ COMPARE_OPTION(READ_ONLY);
+
+ key = "option";
+ key += str::numstring(++counter);
+ }
+
+ counter = 1;
+ key = "comment1";
+ while (descParser.iniFile.contains (key) == VALUE)
+ {
+ commentsDescr.push_back (descParser.iniFile.getValue (key));
+ key = "comment";
+ key += str::numstring(++counter);
+ }
+
+ counter = 1;
+ key = "match1";
+ while (descParser.iniFile.contains (key) == VALUE)
+ {
+ std::string keyWrite = "write" + str::numstring(counter);
+ IoPatternDescr pattern = {descParser.iniFile.getValue (key) ,
+ descParser.iniFile.getValue (keyWrite)};
+ EntryDescr eDescr = {pattern, "", "" ,false};
+ entryDescr.push_back (eDescr);
+ key = "match";
+ key += str::numstring(++counter);
+ }
+
+ counter = 1;
+ key = "secBeginReg1";
+ while (descParser.iniFile.contains (key) == VALUE)
+ {
+ std::string keyWrite = "secBeginWrite" + str::numstring(counter);
+ IoPatternDescr patternBegin = {descParser.iniFile.getValue (key) ,
+ descParser.iniFile.getValue (keyWrite)};
+ key = "secEndReg" + str::numstring(counter);
+ keyWrite = "secEndWrite" + str::numstring(counter);
+ IoPatternDescr patternEnd = {descParser.iniFile.getValue (key),
+ descParser.iniFile.getValue (keyWrite)};
+ SectionDescr sDescr = {patternBegin, patternEnd ,
+ descParser.iniFile.contains (key) == VALUE };
+ sectionDescr.push_back (sDescr);
+ key = "secBeginReg";
+ key += str::numstring(++counter);
+ }
+
+ // Parsing input file
+
+ std::string srcFile = file + std::string("i.test");
+ std::string command = "/bin/cp " + file + "i " + srcFile;
+ system(command.c_str());
+ parser.initFiles (srcFile);
+
+ if (!parser.initMachine (options, commentsDescr, sectionDescr,
+ entryDescr, rewrites, " "))
+ {
+ ERR << "Cannot initialize parser for file " << srcFile << std::endl;
+ exit (1);
+ }
+
+ if (!parser.parse ())
+ {
+ ERR << "Cannot parse file " << srcFile << std::endl;
+ exit (1);
+ }
+
+ DBG << "file " << srcFile << " parsed." << std::endl;
+ dumpTree(&(parser.iniFile));
+
+ // Changing entries
+ counter = 1;
+ key = "add1";
+ while (descParser.iniFile.contains (key) == SECTION)
+ {
+ Section section = descParser.iniFile.getSection (key);
+ addEntries (section, parser.iniFile);
+ key = "add";
+ key += str::numstring(++counter);
+ }
+
+ // Deleting entries
+ counter = 1;
+ key = "delete1";
+ while (descParser.iniFile.contains (key) == SECTION)
+ {
+ Section section = descParser.iniFile.getSection (key);
+ deleteEntries (section, parser.iniFile);
+ key = "delete";
+ key += str::numstring(++counter);
+ }
+
+ // Searching entries
+ counter = 1;
+ key = "searchEntry1";
+ while (descParser.iniFile.contains (key) == SECTION)
+ {
+ Section section = descParser.iniFile.getSection (key);
+ searchEntries (section, parser.iniFile);
+ key = "searchEntry";
+ key += str::numstring(++counter);
+ }
+
+ // Searching sections
+ counter = 1;
+ key = "searchSection1";
+ while (descParser.iniFile.contains (key) == SECTION)
+ {
+ Section section = descParser.iniFile.getSection (key);
+ searchSections (section, parser.iniFile);
+ key = "searchSection";
+ key += str::numstring(++counter);
+ }
+
+
+ parser.write();
+
+ // Re-reading testfile
+ INIParser testparser;
+ testparser.initFiles (srcFile);
+
+ if (!testparser.initMachine (options, commentsDescr, sectionDescr,
+ entryDescr, rewrites, " "))
+ {
+ ERR << "Cannot initialize parser for file " << srcFile << std::endl;
+ exit (1);
+ }
+
+ if (!testparser.parse ())
+ {
+ ERR << "Cannot parse file " << srcFile << std::endl;
+ exit (1);
+ }
- LIMAL_SLOG(logger, "DEBUG", "file " << srcFile << " parsed AGAIN.");
- dumpTree(&(testparser.iniFile));
+ DBG << "file " << srcFile << " parsed AGAIN." << std::endl;
+ dumpTree(&(testparser.iniFile));
- std::cout << "DONE" << std::endl;
- return 0;
+ std::cout << "DONE" << std::endl;
+ return 0;
}
/* vim: set ts=8 sts=8 sw=8 ai noet: */
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/chg1.err
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/chg1.err (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/chg1.err Sat Jul 17 18:38:59 2010
@@ -4,7 +4,7 @@
INFO parser -
INFO parser - SectionComment
INFO parser - Comment comment1 : ; comment description
-
+INFO parser -
INFO parser - Entry comment1 : ^[ \t]*;.*
INFO parser - Comment comment2 :
INFO parser - Entry comment2 : ^[ \t]*$
@@ -13,10 +13,10 @@
INFO parser - Comment comment4 :
INFO parser - Entry comment4 : \{[^}]*\}
INFO parser - Comment match1 : ; entry READ description
-
+INFO parser -
INFO parser - Entry match1 : ^[ \t]*([^=]*[^ \t=])[ \t]*=[ \t]*(.*[^ \t]|)[ \t]*$
INFO parser - Comment option1 : ; options
-
+INFO parser -
INFO parser - Entry option1 : GLOBAL_VALUES
INFO parser - Comment secBeginReg1 :
INFO parser - Entry secBeginReg1 : [ \t]*\+([A-z0-9_]+)[ \t]*
@@ -27,7 +27,7 @@
INFO parser - Comment secEndWrite1 :
INFO parser - Entry secEndWrite1 : -%s
INFO parser - Comment write1 : ; entry WRITE description
-
+INFO parser -
INFO parser - Entry write1 : %s=%s
DEBUG parser - file iniParser/chg1.ini.test parsed.
INFO parser -
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/comment.err
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/comment.err (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/comment.err Sat Jul 17 18:38:59 2010
@@ -4,7 +4,7 @@
INFO parser -
INFO parser - SectionComment
INFO parser - Comment comment1 : ; comment description
-
+INFO parser -
INFO parser - Entry comment1 : ^[ \t]*;.*
INFO parser - Comment comment2 :
INFO parser - Entry comment2 : ^[ \t]*$
@@ -13,10 +13,10 @@
INFO parser - Comment comment4 :
INFO parser - Entry comment4 : \{[^}]*\}
INFO parser - Comment match1 : ; entry READ description
-
+INFO parser -
INFO parser - Entry match1 : ^[ \t]*([^=]*[^ \t=])[ \t]*=[ \t]*(.*[^ \t]|)[ \t]*$
INFO parser - Comment option1 : ; options
-
+INFO parser -
INFO parser - Entry option1 : GLOBAL_VALUES
INFO parser - Comment secBeginReg1 :
INFO parser - Entry secBeginReg1 : [ \t]*\+([A-z0-9_]+)[ \t]*
@@ -27,25 +27,25 @@
INFO parser - Comment secEndWrite1 :
INFO parser - Entry secEndWrite1 : -%s
INFO parser - Comment write1 : ; entry WRITE description
-
+INFO parser -
INFO parser - Entry write1 : %s=%s
INFO parser - Section add1
INFO parser - SectionComment ; write command
-
+INFO parser -
INFO parser - Comment level : ; comment for level
-
+INFO parser -
INFO parser - Entry level : value_toplevel
INFO parser - Section section_foo
INFO parser - SectionComment ; comment for section_foo
-
+INFO parser -
INFO parser - Comment foo_key : ; comment for foo_key
-
+INFO parser -
INFO parser - Entry foo_key : foo_value
INFO parser - Section add2
INFO parser - SectionComment
INFO parser - Section Main
INFO parser - SectionComment ; comemnt for main
-
+INFO parser -
DEBUG parser - file iniParser/comment.ini.test parsed.
INFO parser -
INFO parser - SectionComment
@@ -69,11 +69,11 @@
INFO parser -
INFO parser - SectionComment
INFO parser - Comment level : ; comment for level
-
+INFO parser -
INFO parser - Entry level : value_toplevel
INFO parser - Section Main
INFO parser - SectionComment ; comemnt for main
-
+INFO parser -
INFO parser - Comment Key :
INFO parser - Entry Key : Val
INFO parser - Section Sub
@@ -86,9 +86,9 @@
INFO parser - Entry Key : Val
INFO parser - Section section_foo
INFO parser - SectionComment ; comment for section_foo
-
+INFO parser -
INFO parser - Comment foo_key : ; comment for foo_key
-
+INFO parser -
INFO parser - Entry foo_key : foo_value
DEBUG IniParser - File iniParser/comment.ini.test did not change. Not saving.
DEBUG IniParser - File iniParser/comment.ini.test did not change. Not saving.
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/delete.err
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/delete.err (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/delete.err Sat Jul 17 18:38:59 2010
@@ -4,7 +4,7 @@
INFO parser -
INFO parser - SectionComment
INFO parser - Comment comment1 : ; comment description
-
+INFO parser -
INFO parser - Entry comment1 : ^[ \t]*;.*
INFO parser - Comment comment2 :
INFO parser - Entry comment2 : ^[ \t]*$
@@ -13,10 +13,10 @@
INFO parser - Comment comment4 :
INFO parser - Entry comment4 : \{[^}]*\}
INFO parser - Comment match1 : ; entry READ description
-
+INFO parser -
INFO parser - Entry match1 : ^[ \t]*([^=]*[^ \t=])[ \t]*=[ \t]*(.*[^ \t]|)[ \t]*$
INFO parser - Comment option1 : ; options
-
+INFO parser -
INFO parser - Entry option1 : GLOBAL_VALUES
INFO parser - Comment secBeginReg1 :
INFO parser - Entry secBeginReg1 : [ \t]*\+([A-z0-9_]+)[ \t]*
@@ -27,16 +27,16 @@
INFO parser - Comment secEndWrite1 :
INFO parser - Entry secEndWrite1 : -%s
INFO parser - Comment write1 : ; entry WRITE description
-
+INFO parser -
INFO parser - Entry write1 : %s=%s
INFO parser - Section delete1
INFO parser - SectionComment ; delete key level on toplevel
-
+INFO parser -
INFO parser - Comment level :
INFO parser - Entry level : ""
INFO parser - Section delete2
INFO parser - SectionComment ; delete Val2 in Section1.Section1
-
+INFO parser -
INFO parser - Section Section1
INFO parser - SectionComment
INFO parser - Section Section1
@@ -45,15 +45,15 @@
INFO parser - Entry Val2 : ""
INFO parser - Section delete3
INFO parser - SectionComment ; delete Section2
-
+INFO parser -
INFO parser - Section Section2
INFO parser - SectionComment
DEBUG parser - file iniParser/delete.ini.test parsed.
INFO parser -
INFO parser - SectionComment
INFO parser - Comment level : ; first line comment
-; second line comment
-
+INFO parser - ; second line comment
+INFO parser -
INFO parser - Entry level : value
INFO parser - Section Section1
INFO parser - SectionComment
@@ -71,7 +71,7 @@
INFO parser - Entry Val2 : value 222
INFO parser - Section Section2
INFO parser - SectionComment
-
+INFO parser -
INFO parser - Comment Val1 :
INFO parser - Entry Val1 : value21
INFO parser - Comment Val2 :
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/read1.err
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/read1.err (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/read1.err Sat Jul 17 18:38:59 2010
@@ -4,7 +4,7 @@
INFO parser -
INFO parser - SectionComment
INFO parser - Comment comment1 : ; comment description
-
+INFO parser -
INFO parser - Entry comment1 : ^[ \t]*;.*
INFO parser - Comment comment2 :
INFO parser - Entry comment2 : ^[ \t]*$
@@ -13,10 +13,10 @@
INFO parser - Comment comment4 :
INFO parser - Entry comment4 : \{[^}]*\}
INFO parser - Comment match1 : ; entry READ description
-
+INFO parser -
INFO parser - Entry match1 : ^[ \t]*([^=]*[^ \t=])[ \t]*=[ \t]*(.*[^ \t]|)[ \t]*$
INFO parser - Comment option1 : ; options
-
+INFO parser -
INFO parser - Entry option1 : GLOBAL_VALUES
INFO parser - Comment secBeginReg1 :
INFO parser - Entry secBeginReg1 : [ \t]*\+([A-z0-9_]+)[ \t]*
@@ -27,15 +27,15 @@
INFO parser - Comment secEndWrite1 :
INFO parser - Entry secEndWrite1 : -%s
INFO parser - Comment write1 : ; entry WRITE description
-
+INFO parser -
INFO parser - Entry write1 : %s=%s
DEBUG parser - file iniParser/read1.ini.test parsed.
INFO parser -
INFO parser - SectionComment
INFO parser - Section Section1
INFO parser - SectionComment ; first line comment
-; second line comment
-
+INFO parser - ; second line comment
+INFO parser -
INFO parser - Comment Val1 :
INFO parser - Entry Val1 : value11
INFO parser - Comment Val2 :
@@ -50,7 +50,7 @@
INFO parser - Entry Val2 : value 222
INFO parser - Section Section2
INFO parser - SectionComment
-
+INFO parser -
INFO parser - Comment Val1 :
INFO parser - Entry Val1 : value21
INFO parser - Comment Val2 :
@@ -63,8 +63,8 @@
INFO parser - SectionComment
INFO parser - Section Section1
INFO parser - SectionComment ; first line comment
-; second line comment
-
+INFO parser - ; second line comment
+INFO parser -
INFO parser - Comment Val1 :
INFO parser - Entry Val1 : value11
INFO parser - Comment Val2 :
@@ -79,7 +79,7 @@
INFO parser - Entry Val2 : value 222
INFO parser - Section Section2
INFO parser - SectionComment
-
+INFO parser -
INFO parser - Comment Val1 :
INFO parser - Entry Val1 : value21
INFO parser - Comment Val2 :
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/select1.err
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/select1.err (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/select1.err Sat Jul 17 18:38:59 2010
@@ -4,7 +4,7 @@
INFO parser -
INFO parser - SectionComment
INFO parser - Comment comment1 : ; comment description
-
+INFO parser -
INFO parser - Entry comment1 : ^[ \t]*;.*
INFO parser - Comment comment2 :
INFO parser - Entry comment2 : ^[ \t]*$
@@ -13,10 +13,10 @@
INFO parser - Comment comment4 :
INFO parser - Entry comment4 : \{[^}]*\}
INFO parser - Comment match1 : ; entry READ description
-
+INFO parser -
INFO parser - Entry match1 : ^[ \t]*([^=]*[^ \t=])[ \t]*=[ \t]*(.*[^ \t]|)[ \t]*$
INFO parser - Comment option1 : ; options
-
+INFO parser -
INFO parser - Entry option1 : GLOBAL_VALUES
INFO parser - Comment secBeginReg1 :
INFO parser - Entry secBeginReg1 : [ \t]*\+([A-z0-9_]+)[ \t]*
@@ -27,7 +27,7 @@
INFO parser - Comment secEndWrite1 :
INFO parser - Entry secEndWrite1 : -%s
INFO parser - Comment write1 : ; entry WRITE description
-
+INFO parser -
INFO parser - Entry write1 : %s=%s
INFO parser - Section searchEntry1
INFO parser - SectionComment
@@ -47,7 +47,7 @@
INFO parser -
INFO parser - SectionComment
INFO parser - Comment Val1 :
-
+INFO parser -
INFO parser - Entry Val1 : value21top
INFO parser - Comment Val2 :
INFO parser - Entry Val2 : value22top
@@ -55,8 +55,8 @@
INFO parser - Entry Val3 : value23top
INFO parser - Section Section1
INFO parser - SectionComment ; first line comment
-; second line comment
-
+INFO parser - ; second line comment
+INFO parser -
INFO parser - Comment Val1 :
INFO parser - Entry Val1 : value11
INFO parser - Comment Val2 :
@@ -71,7 +71,7 @@
INFO parser - Entry Val2 : value 222
INFO parser - Section Section2
INFO parser - SectionComment
-
+INFO parser -
INFO parser - Comment Val1 :
INFO parser - Entry Val1 : value21
INFO parser - Comment Val2 :
@@ -95,7 +95,7 @@
INFO parser -
INFO parser - SectionComment
INFO parser - Comment Val1 :
-
+INFO parser -
INFO parser - Entry Val1 : value21top
INFO parser - Comment Val2 :
INFO parser - Entry Val2 : value22top
@@ -103,8 +103,8 @@
INFO parser - Entry Val3 : value23top
INFO parser - Section Section1
INFO parser - SectionComment ; first line comment
-; second line comment
-
+INFO parser - ; second line comment
+INFO parser -
INFO parser - Comment Val1 :
INFO parser - Entry Val1 : value11
INFO parser - Comment Val2 :
@@ -119,7 +119,7 @@
INFO parser - Entry Val2 : value 222
INFO parser - Section Section2
INFO parser - SectionComment
-
+INFO parser -
INFO parser - Comment Val1 :
INFO parser - Entry Val1 : value21
INFO parser - Comment Val2 :
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/wr_add.err
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/wr_add.err (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/wr_add.err Sat Jul 17 18:38:59 2010
@@ -4,7 +4,7 @@
INFO parser -
INFO parser - SectionComment
INFO parser - Comment comment1 : ; comment description
-
+INFO parser -
INFO parser - Entry comment1 : ^[ \t]*;.*
INFO parser - Comment comment2 :
INFO parser - Entry comment2 : ^[ \t]*$
@@ -13,10 +13,10 @@
INFO parser - Comment comment4 :
INFO parser - Entry comment4 : \{[^}]*\}
INFO parser - Comment match1 : ; entry READ description
-
+INFO parser -
INFO parser - Entry match1 : ^[ \t]*([^=]*[^ \t=])[ \t]*=[ \t]*(.*[^ \t]|)[ \t]*$
INFO parser - Comment option1 : ; options
-
+INFO parser -
INFO parser - Entry option1 : GLOBAL_VALUES
INFO parser - Comment secBeginReg1 :
INFO parser - Entry secBeginReg1 : [ \t]*\+([A-z0-9_]+)[ \t]*
@@ -27,11 +27,11 @@
INFO parser - Comment secEndWrite1 :
INFO parser - Entry secEndWrite1 : -%s
INFO parser - Comment write1 : ; entry WRITE description
-
+INFO parser -
INFO parser - Entry write1 : %s=%s
INFO parser - Section add1
INFO parser - SectionComment ; write command
-
+INFO parser -
INFO parser - Comment level :
INFO parser - Entry level : value_toplevel
INFO parser - Section section_foo
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/wr_chg.err
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/wr_chg.err (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser/wr_chg.err Sat Jul 17 18:38:59 2010
@@ -4,7 +4,7 @@
INFO parser -
INFO parser - SectionComment
INFO parser - Comment comment1 : ; comment description
-
+INFO parser -
INFO parser - Entry comment1 : ^[ \t]*;.*
INFO parser - Comment comment2 :
INFO parser - Entry comment2 : ^[ \t]*$
@@ -13,10 +13,10 @@
INFO parser - Comment comment4 :
INFO parser - Entry comment4 : \{[^}]*\}
INFO parser - Comment match1 : ; entry READ description
-
+INFO parser -
INFO parser - Entry match1 : ^[ \t]*([^=]*[^ \t=])[ \t]*=[ \t]*(.*[^ \t]|)[ \t]*$
INFO parser - Comment option1 : ; options
-
+INFO parser -
INFO parser - Entry option1 : GLOBAL_VALUES
INFO parser - Comment secBeginReg1 :
INFO parser - Entry secBeginReg1 : [ \t]*\+([A-z0-9_]+)[ \t]*
@@ -27,11 +27,11 @@
INFO parser - Comment secEndWrite1 :
INFO parser - Entry secEndWrite1 : -%s
INFO parser - Comment write1 : ; entry WRITE description
-
+INFO parser -
INFO parser - Entry write1 : %s=%s
INFO parser - Section add1
INFO parser - SectionComment ; change command
-
+INFO parser -
INFO parser - Section Main
INFO parser - SectionComment
INFO parser - Section Sub
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/CA1.err
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/CA1.err (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/CA1.err Sat Jul 17 18:38:59 2010
@@ -33,6 +33,7 @@
DEBUG ca-mgm - RDNObject::verify()(1/1):Value() is too small. Value has to be a minimal length of 2
DEBUG ca-mgm - DNObject::verify()(1/1):Value() is too small. Value has to be a minimal length of 2
DEBUG ca-mgm - RequestGenerationData::verify()(1/1):Value() is too small. Value has to be a minimal length of 2
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=5 result=ca
DEBUG ca-mgm - type2Section: type=5 result=ca
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
@@ -89,6 +90,7 @@
DEBUG ca-mgm - ExtensionBase::setPresent(): false
DEBUG ca-mgm - type2Section: type=5 result=v3_ca
DEBUG ca-mgm - ExtensionBase::setPresent(): false
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - type2Section: type=6 result=v3_crl
DEBUG ca-mgm - type2Section: type=6 result=v3_crl
DEBUG ca-mgm - ExtensionBase::setPresent(): true
@@ -96,3 +98,5 @@
DEBUG ca-mgm - ExtensionBase::setPresent(): false
DEBUG ca-mgm - type2Section: type=6 result=ca
DEBUG ca-mgm - removeFile ./TestRepos/ca1_test/openssl.cnf
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//ca1_test/openssl.cnf.tmpl did not change. Not saving.
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/CAConfig.err
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/CAConfig.err (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/CAConfig.err Sat Jul 17 18:38:59 2010
@@ -1,13 +1,12 @@
-DEBUG ca-mgm - file openssl.cnf.tmpl.test parsed.
INFO ca-mgm -
INFO ca-mgm - Section ca
INFO ca-mgm - SectionComment ###############################################
-# YaMC Template for CA Management
-#
-# !!! Never rename the sections !!!
-#
-###############################################
-
+INFO ca-mgm - # YaMC Template for CA Management
+INFO ca-mgm - #
+INFO ca-mgm - # !!! Never rename the sections !!!
+INFO ca-mgm - #
+INFO ca-mgm - ###############################################
+INFO ca-mgm -
INFO ca-mgm - Entry RANDFILE : $dir/.rand
INFO ca-mgm - Entry certificate : $dir/cacert.pem
INFO ca-mgm - Entry certopt : default_ca
@@ -31,9 +30,9 @@
INFO ca-mgm - Entry x509_extensions : v3_ca
INFO ca-mgm - Section client_cert
INFO ca-mgm - SectionComment
-#utf8 = yes
-# used to sign a client cert
-
+INFO ca-mgm - #utf8 = yes
+INFO ca-mgm - # used to sign a client cert
+INFO ca-mgm -
INFO ca-mgm - Entry RANDFILE : $dir/.rand
INFO ca-mgm - Entry certificate : $dir/cacert.pem
INFO ca-mgm - Entry certopt : default_ca
@@ -56,8 +55,8 @@
INFO ca-mgm - Entry x509_extensions : v3_client
INFO ca-mgm - Section policy_client
INFO ca-mgm - SectionComment
-#utf8 = yes
-
+INFO ca-mgm - #utf8 = yes
+INFO ca-mgm -
INFO ca-mgm - Entry commonName : supplied
INFO ca-mgm - Entry countryName : optional
INFO ca-mgm - Entry emailAddress : supplied
@@ -67,7 +66,7 @@
INFO ca-mgm - Entry stateOrProvinceName : optional
INFO ca-mgm - Section policy_server
INFO ca-mgm - SectionComment
-
+INFO ca-mgm -
INFO ca-mgm - Entry commonName : supplied
INFO ca-mgm - Entry countryName : optional
INFO ca-mgm - Entry emailAddress : optional
@@ -77,7 +76,7 @@
INFO ca-mgm - Entry stateOrProvinceName : optional
INFO ca-mgm - Section req_attributes
INFO ca-mgm - SectionComment
-
+INFO ca-mgm -
INFO ca-mgm - Entry challengePassword : A challenge password
INFO ca-mgm - Entry challengePassword_max : 20
INFO ca-mgm - Entry challengePassword_min : 4
@@ -102,7 +101,7 @@
INFO ca-mgm - Entry x509_extensions : v3_ca
INFO ca-mgm - Section req_distinguished_name
INFO ca-mgm - SectionComment
-
+INFO ca-mgm -
INFO ca-mgm - Entry commonName : Common Name (eg, YOUR name)
INFO ca-mgm - Entry commonName_max : 64
INFO ca-mgm - Entry countryName : Country Name (2 letter code)
@@ -125,9 +124,9 @@
INFO ca-mgm - Entry x509_extensions : v3_ca
INFO ca-mgm - Section server_cert
INFO ca-mgm - SectionComment
-#utf8 = yes
-# used to sign a server cert
-
+INFO ca-mgm - #utf8 = yes
+INFO ca-mgm - # used to sign a server cert
+INFO ca-mgm -
INFO ca-mgm - Entry RANDFILE : $dir/.rand
INFO ca-mgm - Entry certificate : $dir/cacert.pem
INFO ca-mgm - Entry certopt : default_ca
@@ -150,7 +149,7 @@
INFO ca-mgm - Entry x509_extensions : v3_server
INFO ca-mgm - Section v3_ca
INFO ca-mgm - SectionComment
-
+INFO ca-mgm -
INFO ca-mgm - Entry authorityKeyIdentifier : keyid:always,issuer:always
INFO ca-mgm - Entry basicConstraints : critical, CA:true
INFO ca-mgm - Entry issuerAltName : issuer:copy
@@ -161,8 +160,8 @@
INFO ca-mgm - Entry subjectKeyIdentifier : hash
INFO ca-mgm - Section v3_client
INFO ca-mgm - SectionComment
-# v3 extensions sections
-
+INFO ca-mgm - # v3 extensions sections
+INFO ca-mgm -
INFO ca-mgm - Entry authorityKeyIdentifier : keyid,issuer:always
INFO ca-mgm - Entry basicConstraints : CA:FALSE
INFO ca-mgm - Entry issuerAltName : issuer:copy
@@ -173,7 +172,7 @@
INFO ca-mgm - Entry subjectKeyIdentifier : hash
INFO ca-mgm - Section v3_crl
INFO ca-mgm - SectionComment
-
+INFO ca-mgm -
INFO ca-mgm - Entry authorityKeyIdentifier : keyid:always,issuer:always
INFO ca-mgm - Section v3_req_ca
INFO ca-mgm - Entry basicConstraints : CA:TRUE
@@ -185,7 +184,7 @@
INFO ca-mgm - Entry basicConstraints : CA:TRUE
INFO ca-mgm - Section v3_server
INFO ca-mgm - SectionComment
-
+INFO ca-mgm -
INFO ca-mgm - Entry authorityKeyIdentifier : keyid,issuer:always
INFO ca-mgm - Entry basicConstraints : CA:FALSE
INFO ca-mgm - Entry issuerAltName : issuer:copy
@@ -197,3 +196,4 @@
DEBUG IniParser - File openssl.cnf.tmpl did not change. Not saving.
DEBUG IniParser - File openssl.cnf.tmpl.test did not change. Not saving.
DEBUG IniParser - File openssl.cnf.tmpl.test did not change. Not saving.
+DEBUG ca-mgm - file openssl.cnf.tmpl.test parsed.
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/ConvertTest.err
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/ConvertTest.err (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/ConvertTest.err Sat Jul 17 18:38:59 2010
@@ -1,12 +1,20 @@
INFO ca-mgm - openssl status:1
+ERROR ca-mgm - not log openssl errors for testing
+ERROR ca-mgm - not log openssl errors for testing
+ERROR ca-mgm - not log openssl errors for testing
+ERROR ca-mgm - not log openssl errors for testing
Exception:
OpenSSLUtils.cpp: ValueException: -200: Invalid password.
END
INFO ca-mgm - openssl status:1
+ERROR ca-mgm - not log openssl errors for testing
+ERROR ca-mgm - not log openssl errors for testing
Exception:
OpenSSLUtils.cpp: ValueException: -200: Invalid password.
END
INFO ca-mgm - openssl status:1
+ERROR ca-mgm - not log openssl errors for testing
+ERROR ca-mgm - not log openssl errors for testing
Exception:
OpenSSLUtils.cpp: ValueException: -200: Invalid password.
END
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/ImportCATest.err
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/ImportCATest.err (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/ImportCATest.err Sat Jul 17 18:38:59 2010
@@ -1,3 +1,8 @@
+ERROR ca-mgm - not log openssl errors for testing
CA.cpp: ValueException: CA password is empty.
INFO ca-mgm - openssl status:1
+ERROR ca-mgm - not log openssl errors for testing
+ERROR ca-mgm - not log openssl errors for testing
+ERROR ca-mgm - not log openssl errors for testing
+ERROR ca-mgm - not log openssl errors for testing
OpenSSLUtils.cpp: ValueException: Invalid password.
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/ListTest.err
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/ListTest.err (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/ListTest.err Sat Jul 17 18:38:59 2010
@@ -4,7 +4,7 @@
DEBUG ca-mgm - Command: /usr/bin/openssl rsa -noout -in ./TestRepos//Test_CA2/cacert.key -passin env:PASSWORD
DEBUG ca-mgm - Command: /usr/bin/openssl ca -updatedb -config ./TestRepos//Test_CA2/openssl.cnf -keyfile ./TestRepos//Test_CA2/cacert.key -cert ./TestRepos//Test_CA2/cacert.pem -passin env:pass
DEBUG ca-mgm - openssl stderr:Using configuration from ./TestRepos//Test_CA2/openssl.cnf
-
+DEBUG ca-mgm -
DEBUG ca-mgm - readDir ./TestRepos/Test_CA2/newcerts
DEBUG ca-mgm - Append '/SUSE Inc.\Gmbh' to commonName
DEBUG ca-mgm - Append '/SUSE Inc.\Gmbh' to commonName
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/VerifyTest.err
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/VerifyTest.err (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/VerifyTest.err Sat Jul 17 18:38:59 2010
@@ -7,6 +7,7 @@
DEBUG ca-mgm - type2Section: type=6 result=ca
DEBUG ca-mgm - return AuthorityKeyIdentifierGenerateExt::valid() is true
DEBUG ca-mgm - return IssuerAlternativeNameExt::valid() is true
+DEBUG IniParser - File ./TestRepos//Test_CA2/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - return AuthorityKeyIdentifierGenerateExt::valid() is true
DEBUG ca-mgm - return IssuerAlternativeNameExt::valid() is true
DEBUG ca-mgm - type2Section: type=6 result=ca
@@ -16,32 +17,47 @@
DEBUG ca-mgm - type2Section: type=6 result=v3_crl
DEBUG ca-mgm - return IssuerAlternativeNameExt::valid() is true
DEBUG ca-mgm - type2Section: type=6 result=v3_crl
+DEBUG IniParser - Can not delete issuerAltName Key does not exist.
+DEBUG IniParser - File ./TestRepos//Test_CA2/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - Command: /usr/bin/openssl ca -gencrl -config ./TestRepos//Test_CA2/openssl.cnf -out ./TestRepos//Test_CA2/crl/crl.pem -keyfile ./TestRepos//Test_CA2/cacert.key -cert ./TestRepos//Test_CA2/cacert.pem -passin env:pass -crlhours 24 -crlexts v3_crl
DEBUG ca-mgm - openssl stderr:Using configuration from ./TestRepos//Test_CA2/openssl.cnf
-
+DEBUG ca-mgm -
DEBUG ca-mgm - copyFile ./TestRepos/Test_CA2/crl/crl.pem -> ./TestRepos/.cas/crl_Test_CA2.pem
+DEBUG IniParser - File ./TestRepos//Test_CA2/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - Command: /usr/bin/openssl ca -updatedb -config ./TestRepos//Test_CA2/openssl.cnf -keyfile ./TestRepos//Test_CA2/cacert.key -cert ./TestRepos//Test_CA2/cacert.pem -passin env:pass
DEBUG ca-mgm - openssl stderr:Using configuration from ./TestRepos//Test_CA2/openssl.cnf
-
+DEBUG ca-mgm -
DEBUG ca-mgm - readDir ./TestRepos/Test_CA2/newcerts
DEBUG ca-mgm - Append '/SUSE Inc.\Gmbh' to commonName
DEBUG ca-mgm - Append '/SUSE Inc.\Gmbh' to commonName
+DEBUG IniParser - File ./TestRepos//Test_CA2/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - Command: /usr/bin/openssl verify -CApath ./TestRepos//.cas/ -purpose any -crl_check_all ./TestRepos/Test_CA2/newcerts/01:b4d4e48e6de644c953290eb2854a6ced-1124374396.pem
ERROR ca-mgm - Certificate invalid! (certificate has expired / error 10 at 0 depth lookup:certificate has expired)
+DEBUG IniParser - File ./TestRepos//Test_CA2/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - Command: /usr/bin/openssl verify -CApath ./TestRepos//.cas/ -purpose any -crl_check_all ./TestRepos/Test_CA2/newcerts/02:bc5324c7f5c2a27492fb6795745b596b-1124374399.pem
ERROR ca-mgm - Certificate invalid! (certificate has expired / error 10 at 0 depth lookup:certificate has expired)
+DEBUG IniParser - File ./TestRepos//Test_CA2/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - Command: /usr/bin/openssl verify -CApath ./TestRepos//.cas/ -purpose any -crl_check_all ./TestRepos/Test_CA2/newcerts/03:3673cf466b7b97997f25f5cee5dafe40-1124374402.pem
ERROR ca-mgm - Certificate invalid! (certificate revoked / error 23 at 0 depth lookup:certificate revoked)
+DEBUG IniParser - File ./TestRepos//Test_CA2/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - Command: /usr/bin/openssl verify -CApath ./TestRepos//.cas/ -purpose any -crl_check_all ./TestRepos/Test_CA2/newcerts/04:d816690a832b0e52becd255d3a62e975-1124374403.pem
ERROR ca-mgm - Certificate invalid! (certificate revoked / error 23 at 0 depth lookup:certificate revoked)
+DEBUG IniParser - File ./TestRepos//Test_CA2/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - Command: /usr/bin/openssl verify -CApath ./TestRepos//.cas/ -purpose any -crl_check_all ./TestRepos/Test_CA2/newcerts/05:9198f6798d9da70d7cbfb67b610633f5-1124374406.pem
ERROR ca-mgm - Certificate invalid! (certificate revoked / error 23 at 0 depth lookup:certificate revoked)
+DEBUG IniParser - File ./TestRepos//Test_CA2/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - Command: /usr/bin/openssl verify -CApath ./TestRepos//.cas/ -purpose any -crl_check_all ./TestRepos/Test_CA2/newcerts/06:3e248858337c2b46dc67a0f9389376dd-1124374407.pem
ERROR ca-mgm - Certificate invalid! (certificate revoked / error 23 at 0 depth lookup:certificate revoked)
+DEBUG IniParser - File ./TestRepos//Test_CA2/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - Command: /usr/bin/openssl verify -CApath ./TestRepos//.cas/ -purpose any -crl_check_all ./TestRepos/Test_CA2/newcerts/07:9797ac11af29f94b82c1e5b0499ab5f2-1124374409.pem
+DEBUG IniParser - File ./TestRepos//Test_CA2/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - Command: /usr/bin/openssl verify -CApath ./TestRepos//.cas/ -purpose any -crl_check_all ./TestRepos/Test_CA2/newcerts/08:40717a16174dc4d516f6fa7ee8eeb18c-1124792802.pem
ERROR ca-mgm - Certificate invalid! (certificate has expired / error 10 at 0 depth lookup:certificate has expired)
+DEBUG IniParser - File ./TestRepos//Test_CA2/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - Command: /usr/bin/openssl verify -CApath ./TestRepos//.cas/ -purpose any -crl_check_all ./TestRepos/Test_CA2/newcerts/09:bf04fdd95062554800c1556085f47063-1125322097.pem
ERROR ca-mgm - Certificate invalid! (certificate revoked / error 23 at 0 depth lookup:certificate revoked)
+DEBUG IniParser - File ./TestRepos//Test_CA2/openssl.cnf did not change. Not saving.
DEBUG ca-mgm - Command: /usr/bin/openssl verify -CApath ./TestRepos//.cas/ -purpose any -crl_check_all ./TestRepos/Test_CA2/newcerts/0A:0d03287ae454fab8a0e905499d5132fd-1158057443.pem
DEBUG ca-mgm - removeFile ./TestRepos/Test_CA2/openssl.cnf
+DEBUG IniParser - File ./TestRepos//Test_CA2/openssl.cnf did not change. Not saving.
+DEBUG IniParser - File ./TestRepos//Test_CA2/openssl.cnf.tmpl did not change. Not saving.
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/sysConfig.err
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/sysConfig.err (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/sysConfig.err Sat Jul 17 18:38:59 2010
@@ -4,27 +4,27 @@
INFO parser - Comment ALSO :
INFO parser - Entry ALSO : ' apostrophes are allowed '
INFO parser - Comment DEFAULT_LANGUAGE : #
-# This language is used in YaST. This is also the default
-# for local users, if RC_LANG and RC_LC_ALL are not set. Root
-# uses this language if ROOT_USES_LANG is set to "YES"
-#
-
+INFO parser - # This language is used in YaST. This is also the default
+INFO parser - # for local users, if RC_LANG and RC_LC_ALL are not set. Root
+INFO parser - # uses this language if ROOT_USES_LANG is set to "YES"
+INFO parser - #
+INFO parser -
INFO parser - Entry DEFAULT_LANGUAGE : english
INFO parser - Comment ENABLE_SUSECONFIG : #
-# Some people don't want SuSEconfig to modify the system. With this
-# entry you can disable SuSEconfig completely.
-# Please don't contact our support if you have trouble configuring your
-# system after having disabled SuSEconfig. (yes/no)
-#
-
+INFO parser - # Some people don't want SuSEconfig to modify the system. With this
+INFO parser - # entry you can disable SuSEconfig completely.
+INFO parser - # Please don't contact our support if you have trouble configuring your
+INFO parser - # system after having disabled SuSEconfig. (yes/no)
+INFO parser - #
+INFO parser -
INFO parser - Entry ENABLE_SUSECONFIG : yes
INFO parser - Comment SEP2 :
INFO parser - Entry SEP2 : huhu \
- hoho \
- hehe
+INFO parser - hoho \
+INFO parser - hehe
INFO parser - Comment SEPARATED : #
-# ...
-
+INFO parser - # ...
+INFO parser -
INFO parser - Entry SEPARATED : abc abc abccba cba cba
DEBUG IniParser - Adding value .value.DEFAULT_LANGUAGE2=german
DEBUG parser - file iniParser/sysconfig.ini.test parsed AGAIN.
@@ -35,20 +35,20 @@
INFO parser - Comment DEFAULT_LANGUAGE2 :
INFO parser - Entry DEFAULT_LANGUAGE2 : german
INFO parser - Comment ENABLE_SUSECONFIG : #
-# Some people don't want SuSEconfig to modify the system. With this
-# entry you can disable SuSEconfig completely.
-# Please don't contact our support if you have trouble configuring your
-# system after having disabled SuSEconfig. (yes/no)
-#
-
+INFO parser - # Some people don't want SuSEconfig to modify the system. With this
+INFO parser - # entry you can disable SuSEconfig completely.
+INFO parser - # Please don't contact our support if you have trouble configuring your
+INFO parser - # system after having disabled SuSEconfig. (yes/no)
+INFO parser - #
+INFO parser -
INFO parser - Entry ENABLE_SUSECONFIG : no
INFO parser - Comment SEP2 :
INFO parser - Entry SEP2 : huhu \
- hoho \
- hehe
+INFO parser - hoho \
+INFO parser - hehe
INFO parser - Comment SEPARATED : #
-# ...
-
+INFO parser - # ...
+INFO parser -
INFO parser - Entry SEPARATED : abc abc abccba cba cba
DEBUG IniParser - File iniParser/sysconfig.ini.test did not change. Not saving.
DEBUG IniParser - File iniParser/sysconfig.ini.test did not change. Not saving.
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/sysConfig.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/sysConfig.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/sysConfig.cc Sat Jul 17 18:38:59 2010
@@ -1,123 +1,108 @@
-#include <blocxx/Logger.hpp>
-#include <blocxx/AppenderLogger.hpp>
-#include <blocxx/CerrLogger.hpp>
-#include <blocxx/CerrAppender.hpp>
+
+#define LIMAL_LOGGER_LOGGROUP "parser"
+
#include <limal/String.hpp>
-#include <limal/Logger.hpp>
+#include <limal/LogControl.hpp>
#include "INIParser/INIParser.hpp"
#include <iostream>
#include <fstream>
#include <unistd.h>
-using namespace blocxx;
+#include "TestLineFormater.hpp"
+using namespace ca_mgm;
using namespace ca_mgm::INI;
-ca_mgm::Logger logger("parser");
-
-
void dumpTree(Section *section, int level = 0)
{
- std::string tab = "";
- for (int i = 0; i <= level; i++) tab += " ";
+ std::string tab = "";
+ for (int i = 0; i <= level; i++) tab += " ";
- if (level == 0)
- LIMAL_SLOG_INFO(logger, tab);
+ if (level == 0)
+ INF << tab << std::endl;
- LIMAL_SLOG_INFO(logger, tab <<
- "SectionComment " << section->getComment());
+ INF << tab << "SectionComment " << section->getComment() << std::endl;
- EntryMap eMap= section->getEntries();
- for (EntryMap::iterator i = eMap.begin(); i != eMap.end(); i++)
- {
- Entry entry = i->second;
- LIMAL_SLOG_INFO(logger, tab <<
- "Comment " << i->first << " : " << entry.getComment());
- LIMAL_SLOG_INFO(logger, tab <<
- "Entry " << i->first << " : " << entry.getValue());
- }
-
- SectionMap sMap = section->getSections();
- for (SectionMap::iterator i = sMap.begin(); i != sMap.end(); i++)
- {
- Section sec = i->second;
- LIMAL_SLOG_INFO(logger, tab <<
- "Section " << i->first);
- dumpTree (&sec, ++level);
- }
+ EntryMap eMap= section->getEntries();
+ for (EntryMap::iterator i = eMap.begin(); i != eMap.end(); i++)
+ {
+ Entry entry = i->second;
+ INF << tab << "Comment " << i->first << " : " << entry.getComment() << std::endl;
+ INF << tab << "Entry " << i->first << " : " << entry.getValue() << std::endl;
+ }
+
+ SectionMap sMap = section->getSections();
+ for (SectionMap::iterator i = sMap.begin(); i != sMap.end(); i++)
+ {
+ Section sec = i->second;
+ INF << tab << "Section " << i->first << std::endl;
+ dumpTree (&sec, ++level);
+ }
}
-int main(int argc, char **argv)
+int main(int , char **)
{
- std::cout << "START" << std::endl;
+ std::cout << "START" << std::endl;
- // Logging
- blocxx::LogAppenderRef logAppender(new CerrAppender(
- LogAppender::ALL_COMPONENTS,
- LogAppender::ALL_CATEGORIES,
- // category component - message
- "%-5p %c - %m"
- ));
- blocxx::LoggerRef appLogger(new AppenderLogger(
- "parser_test",
- E_ALL_LEVEL,
- logAppender
- ));
- ca_mgm::Logger::setDefaultLogger(appLogger);
-
-
- // Initialize parser for testfile
- SysConfig parser;
-
- // Parsing input file
- std::string srcFile("iniParser/sysconfig.ini.test");
- std::string command = "/bin/cp iniParser/sysconfig.ini " + srcFile;
- system(command.c_str());
- parser.initFiles (srcFile);
-
- if (!parser.initMachine ())
- {
- LIMAL_SLOG(logger, "ERROR", "Cannot initialize parser for file " << srcFile);
- exit (1);
- }
-
- if (!parser.parse ())
- {
- LIMAL_SLOG(logger, "ERROR", "Cannot parse file " << srcFile);
- exit (1);
- }
-
- LIMAL_SLOG(logger, "DEBUG", "file " << srcFile << " parsed.");
- dumpTree(&(parser.iniFile));
-
- parser.iniFile.addValue ("DEFAULT_LANGUAGE2", "german");
- parser.iniFile.delEntry ("DEFAULT_LANGUAGE");
- parser.iniFile.setValue ("ENABLE_SUSECONFIG", "no");
-
- parser.write();
-
- // Re-reading testfile
- SysConfig testparser;
- testparser.initFiles (srcFile);
-
- if (!testparser.initMachine ())
- {
- LIMAL_SLOG(logger, "ERROR", "Cannot initialize parser for file " << srcFile);
- exit (1);
- }
-
- if (!testparser.parse ())
- {
- LIMAL_SLOG(logger, "ERROR", "Cannot parse file " << srcFile);
- exit (1);
- }
+ // Logging
+ shared_ptr<LogControl::LineFormater> formater(new TestLineFormater());
+ LogControl logger = LogControl::instance();
+ logger.setLineFormater( formater );
+ logger.setLogLevel( logger::E_DEBUG );
+ logger.logToStdErr();
+
+ // Initialize parser for testfile
+ SysConfig parser;
+
+ // Parsing input file
+ std::string srcFile("iniParser/sysconfig.ini.test");
+ std::string command = "/bin/cp iniParser/sysconfig.ini " + srcFile;
+ system(command.c_str());
+ parser.initFiles (srcFile);
+
+ if (!parser.initMachine ())
+ {
+ ERR << "Cannot initialize parser for file " << srcFile << std::endl;
+ exit (1);
+ }
+
+ if (!parser.parse ())
+ {
+ ERR << "Cannot parse file " << srcFile << std::endl;
+ exit (1);
+ }
+
+ DBG << "file " << srcFile << " parsed." << std::endl;
+ dumpTree(&(parser.iniFile));
+
+ parser.iniFile.addValue ("DEFAULT_LANGUAGE2", "german");
+ parser.iniFile.delEntry ("DEFAULT_LANGUAGE");
+ parser.iniFile.setValue ("ENABLE_SUSECONFIG", "no");
+
+ parser.write();
+
+ // Re-reading testfile
+ SysConfig testparser;
+ testparser.initFiles (srcFile);
+
+ if (!testparser.initMachine ())
+ {
+ ERR << "Cannot initialize parser for file " << srcFile << std::endl;
+ exit (1);
+ }
+
+ if (!testparser.parse ())
+ {
+ ERR << "Cannot parse file " << srcFile << std::endl;
+ exit (1);
+ }
- LIMAL_SLOG(logger, "DEBUG", "file " << srcFile << " parsed AGAIN.");
- dumpTree(&(testparser.iniFile));
+ DBG << "file " << srcFile << " parsed AGAIN." << std::endl;
+ dumpTree(&(testparser.iniFile));
- std::cout << "DONE" << std::endl;
- return 0;
+ std::cout << "DONE" << std::endl;
+ return 0;
}
/* vim: set ts=8 sts=8 sw=8 ai noet: */
--
To unsubscribe, e-mail: limal-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: limal-commit+help(a)opensuse.org
1
0
r2688 - in /limal-branches/mc-devel/limal-ca-mgm: src/ testsuite/TestRepos/Test_CA1/ testsuite/TestRepos/Test_CA2/ testsuite/TestRepos/Test_CA2/crl/
by mcalmer＠svn.opensuse.org 11 Jul '10
by mcalmer＠svn.opensuse.org 11 Jul '10
11 Jul '10
Author: mcalmer
Date: Sun Jul 11 10:47:16 2010
New Revision: 2688
URL: http://svn.opensuse.org/viewcvs/limal?rev=2688&view=rev
Log:
use pthread directly for init_once
Modified:
limal-branches/mc-devel/limal-ca-mgm/src/Utils.cpp
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/.rand
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem
Modified: limal-branches/mc-devel/limal-ca-mgm/src/Utils.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/Utils.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/Utils.cpp Sun Jul 11 10:47:16 2010
@@ -24,11 +24,11 @@
* text domain initializaton.
*/
#include <limal/ca-mgm/config.h>
-#include <blocxx/ThreadOnce.hpp>
#include "Utils.hpp"
#include <libintl.h>
#include <openssl/objects.h>
+#include <pthread.h>
// -------------------------------------------------------------------
namespace CA_MGM_NAMESPACE
@@ -36,7 +36,7 @@
namespace
{
// -----------------------------------------------------------
-blocxx::OnceFlag g_i18n_init_guard = BLOCXX_ONCE_INIT;
+pthread_once_t g_i18n_init_guard = PTHREAD_ONCE_INIT;
// -----------------------------------------------------------
@@ -51,7 +51,7 @@
// -------------------------------------------------------------------
const char * gettext (const char *msgid)
{
- blocxx::callOnce( g_i18n_init_guard, init_i18n_domain);
+ pthread_once(&g_i18n_init_guard, init_i18n_domain);
return ::dgettext(i18n_domain, msgid);
}
@@ -61,7 +61,7 @@
const char *plural,
unsigned long int n)
{
- blocxx::callOnce( g_i18n_init_guard, init_i18n_domain);
+ pthread_once(&g_i18n_init_guard, init_i18n_domain);
return ::dngettext(i18n_domain, msgid, plural, n);
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt Sun Jul 11 10:47:16 2010
@@ -1,14 +1,14 @@
-d12f85f32848ae7f9f1d8064813aaa53-1278781967 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-68b3a1b7290aadfd42361b1b3c14e69a-1278781968 /C=DE/CN=Test Server Certificate\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1278781973 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1278781976 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1278781979 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-d12f85f32848ae7f9f1d8064813aaa53-1278781988 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-c293624b6a877f401407ce8f8f1f327e-1278781989 /C=DE/L=Nuremberg/O=SUSE Linux GmbH/OU=IT/CN=SUSE User CA/emailAddress=security-team(a)suse.de
-d12f85f32848ae7f9f1d8064813aaa53-1278781990 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-c1943ae4b9bd7320fae3e29f217483e3-1278781991 /C=DE/CN=Test Request/emailAddress=suse(a)suse.de
-d816690a832b0e52becd255d3a62e975-1278781994 /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse(a)suse.de
-9198f6798d9da70d7cbfb67b610633f5-1278781995 /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse(a)suse.de
-3e248858337c2b46dc67a0f9389376dd-1278781996 /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse(a)suse.de
-bf04fdd95062554800c1556085f47063-1278782000 /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse(a)suse.de
-9797ac11af29f94b82c1e5b0499ab5f2-1278782002 /C=DE/CN=Test Sub CA/emailAddress=suse(a)suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1278837926 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
+68b3a1b7290aadfd42361b1b3c14e69a-1278837929 /C=DE/CN=Test Server Certificate\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1278837933 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1278837937 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1278837940 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1278837949 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
+c293624b6a877f401407ce8f8f1f327e-1278837950 /C=DE/L=Nuremberg/O=SUSE Linux GmbH/OU=IT/CN=SUSE User CA/emailAddress=security-team(a)suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1278837952 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
+c1943ae4b9bd7320fae3e29f217483e3-1278837952 /C=DE/CN=Test Request/emailAddress=suse(a)suse.de
+d816690a832b0e52becd255d3a62e975-1278837955 /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse(a)suse.de
+9198f6798d9da70d7cbfb67b610633f5-1278837957 /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse(a)suse.de
+3e248858337c2b46dc67a0f9389376dd-1278837958 /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse(a)suse.de
+bf04fdd95062554800c1556085f47063-1278837960 /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse(a)suse.de
+9797ac11af29f94b82c1e5b0499ab5f2-1278837962 /C=DE/CN=Test Sub CA/emailAddress=suse(a)suse.de
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt Sun Jul 11 10:47:16 2010
@@ -1,11 +1,11 @@
-V 110710171248Z 01 unknown /C=DE/CN=Test CA/SUSE Inc.\Gmbh/emailAddress=suse(a)suse.de
-V 110710171248Z 02 unknown /C=DE/CN=Test Server Certificate/SUSE Inc.\Gmbh/emailAddress=suse(a)suse.de
-V 110710171251Z 03 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-V 110710171254Z 04 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-V 110710171257Z 05 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-R 110710171312Z 100710171314Z 06 unknown /C=DE/CN=Test Certificate for revocation/emailAddress=suse(a)suse.de
-R 110710171314Z 100710171314Z,holdInstruction,holdInstructionCallIssuer 07 unknown /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse(a)suse.de
-R 110710171315Z 100710171316Z,keyTime,20100710165636Z 08 unknown /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse(a)suse.de
-R 110710171316Z 100710171319Z,CAkeyTime,20100710165639Z 09 unknown /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse(a)suse.de
-R 110710171320Z 100710171321Z,holdInstruction,1.6.21.43 0A unknown /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse(a)suse.de
-V 120709171322Z 0B unknown /C=DE/CN=Test Sub CA/emailAddress=suse(a)suse.de
+V 110711084528Z 01 unknown /C=DE/CN=Test CA/SUSE Inc.\Gmbh/emailAddress=suse(a)suse.de
+V 110711084529Z 02 unknown /C=DE/CN=Test Server Certificate/SUSE Inc.\Gmbh/emailAddress=suse(a)suse.de
+V 110711084530Z 03 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+V 110711084534Z 04 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+V 110711084537Z 05 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+R 110711084554Z 100711084555Z 06 unknown /C=DE/CN=Test Certificate for revocation/emailAddress=suse(a)suse.de
+R 110711084555Z 100711084556Z,holdInstruction,holdInstructionCallIssuer 07 unknown /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse(a)suse.de
+R 110711084556Z 100711084558Z,keyTime,20100711082918Z 08 unknown /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse(a)suse.de
+R 110711084558Z 100711084559Z,CAkeyTime,20100711082919Z 09 unknown /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse(a)suse.de
+R 110711084600Z 100711084601Z,holdInstruction,1.6.21.43 0A unknown /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse(a)suse.de
+V 120710084602Z 0B unknown /C=DE/CN=Test Sub CA/emailAddress=suse(a)suse.de
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/.rand
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
Binary files - no diff available.
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem Sun Jul 11 10:47:16 2010
@@ -1,7 +1,7 @@
-----BEGIN X509 CRL-----
MIIC+TCCAeECAQEwDQYJKoZIhvcNAQEFBQAwQzELMAkGA1UEBhMCREUxFzAVBgNV
BAMTDlN0YXRpYyBUZXN0IENBMRswGQYJKoZIhvcNAQkBFgxzdXNlQHN1c2UuZGUX
-DTEwMDcxMDE3MTMyNFoXDTEwMDcxMTE3MTMyNFowgfAwEgIBAxcNMDUwODE4MTQx
+DTEwMDcxMTA4NDYwNVoXDTEwMDcxMjA4NDYwNVowgfAwEgIBAxcNMDUwODE4MTQx
MzIzWjAyAgEEFw0wNTA4MTgxNDEzMjVaMB4wCgYDVR0VBAMKAQYwEAYDVR0XBAkG
ByqGSM44AgIwOgIBBRcNMDUwODE4MTQxMzI2WjAmMAoGA1UdFQQDCgEBMBgGA1Ud
GAQRGA8yMDA1MDgxODE1NTY0NlowOgIBBhcNMDUwODE4MTQxMzI4WjAmMAoGA1Ud
@@ -9,10 +9,10 @@
ODE4WjAaMAoGA1UdFQQDCgEGMAwGA1UdFwQFBgMuFSugdzB1MHMGA1UdIwRsMGqA
FDIAwASkKojCPsrVvdhM01KIIH87oUekRTBDMQswCQYDVQQGEwJERTEXMBUGA1UE
AxMOU3RhdGljIFRlc3QgQ0ExGzAZBgkqhkiG9w0BCQEWDHN1c2VAc3VzZS5kZYIJ
-AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQB4sIMHgeZPVkUM0Hf6gqbbgsoB
-0ZCbQm+6ejkWdHOEwPbScKR1TjizFpKRgZBlC8ueKC4vXHXdQ6WzJhhum+iEwbYV
-KSkai9C9CLEbUHib22lA05JxbuSTNb6wSlwFk34CGkVUKUAdyViTP4EwF+sAgtjf
-z1UPbW+nd8nZgCNmRZIip3zoYOgUdFPsJauntwZ8uhIFwgx7HetMqSAK5uU50x4L
-gJPWpstnwr4sPe5NuGo5qCV3VhQsSnpig6KxIRklv2XTVtNjnd8bXPXOiag9A0mX
-PFxoqUCXEXEwHD9jOZ+BwEn6F285Tk+20zPbllpQLacyCVmXQC+W8bF4w2ZB
+AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQCfKPuSKHex8PLKu36xEejHCTvu
+cW1Ou06MHdimacq8qR6tFyjnbTu6kONPxFhDEy6WTy4np2z9aaeoEHEwbgG/+FXk
+4Q8qKD9qDXt0hMJsINTk61XVWProI1zB2n0Um4vmlggGpxJrgOhzZiDey+PY+iOx
+R+VoP0dCDRkNfAnQ1Pe1cG4J1ap57K0y9l5OwhioZDZr7iQOaqMmr1c/QTsTxl2Y
+4gCGqEliFJWwCHG6UuYjJrZcBkksI/VyUo8TXeBKNCgUKCuVu+hMakTiJo8fpzDe
+n8BBFFMluOjCrIboDU9R1wXmGhc8O177zlyEDCGtiELPULtR7lzZ3z21Rvxs
-----END X509 CRL-----
--
To unsubscribe, e-mail: limal-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: limal-commit+help(a)opensuse.org
1
0
r2687 - /limal-branches/mc-devel/limal-ca-mgm/src/limal/Exception.hpp
by mcalmer＠svn.opensuse.org 10 Jul '10
by mcalmer＠svn.opensuse.org 10 Jul '10
10 Jul '10
Author: mcalmer
Date: Sat Jul 10 19:16:19 2010
New Revision: 2687
URL: http://svn.opensuse.org/viewcvs/limal?rev=2687&view=rev
Log:
more blocxx::Exception => ca_mgm::Exception
Modified:
limal-branches/mc-devel/limal-ca-mgm/src/limal/Exception.hpp
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/Exception.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/Exception.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/Exception.hpp Sat Jul 10 19:16:19 2010
@@ -28,15 +28,15 @@
* #include <limal/Exception.hpp>
*
*
- * BLOCXX_THROW_ERRNO_MSG(ca_mgm::SystemException,
+ * CA_MGM_THROW_ERRNO_MSG(ca_mgm::SystemException,
* "Can't do this and that");
*
* const int MY_INVALID_EMAIL_ERROR_NUMBER = 42;
- * BLOCXX_THROW_ERR(ca_mgm::ValueException,
+ * CA_MGM_THROW_ERR(ca_mgm::ValueException,
* "Argument is not a valid email",
* MY_INVALID_EMAIL_ERROR_NUMBER);
*
- * BLOCXX_THROW(ca_mgm::SyntaxException,
+ * CA_MGM_THROW(ca_mgm::SyntaxException,
* str::form("Syntax error in line %1", 42).c_str());
*
* try
@@ -45,7 +45,7 @@
* }
* catch(const blocxx::Exception &subex)
* {
- * BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException,
+ * CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException,
* "Bad things happened", subex);
* }
* @endcode
@@ -192,7 +192,7 @@
/**
* Throw an exception using __FILE__ and __LINE__. If applicable,
- * BLOCXX_THROW_ERR should be used instead of this macro.
+ * CA_MGM_THROW_ERR should be used instead of this macro.
*
* @param exType The type of the exception
* @param msg The exception message. A string that will be copied.
--
To unsubscribe, e-mail: limal-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: limal-commit+help(a)opensuse.org
1
0
r2686 - in /limal-branches/mc-devel/limal-ca-mgm: src/ src/limal/ src/limal/ca-mgm/ testsuite/TestRepos/Test_CA1/ testsuite/TestRepos/Test_CA2/ testsuite/TestRepos/Test_CA2/crl/
by mcalmer＠svn.opensuse.org 10 Jul '10
by mcalmer＠svn.opensuse.org 10 Jul '10
10 Jul '10
Author: mcalmer
Date: Sat Jul 10 19:13:35 2010
New Revision: 2686
URL: http://svn.opensuse.org/viewcvs/limal?rev=2686&view=rev
Log:
more blocxx::Exception => ca_mgm::Exception
Modified:
limal-branches/mc-devel/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CRLDistributionPointsExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/IssuerAlternativeNameExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/LDAPUrlImpl.hpp
limal-branches/mc-devel/limal-ca-mgm/src/PathUtils.cpp
limal-branches/mc-devel/limal-ca-mgm/src/SubjectAlternativeNameExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/Url.cpp
limal-branches/mc-devel/limal-ca-mgm/src/UrlByScheme.cpp
limal-branches/mc-devel/limal-ca-mgm/src/UrlByScheme.hpp
limal-branches/mc-devel/limal-ca-mgm/src/UrlUtils.cpp
limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/Exception.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/UrlBase.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/UrlUtils.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CommonData.hpp
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/.rand
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem
Modified: limal-branches/mc-devel/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp Sat Jul 10 19:13:35 2010
@@ -273,7 +273,7 @@
AuthorityInformation ai = AuthorityInformation(al[0], LiteralValue(al[1]));
m_impl->info.push_back(ai);
}
- catch(blocxx::Exception& e)
+ catch(ca_mgm::Exception& e)
{
LOGIT_ERROR("invalid value: " << *it << "(" << al[0] << "/" << al[1] << ")");
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CRLDistributionPointsExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CRLDistributionPointsExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CRLDistributionPointsExtension.cpp Sat Jul 10 19:13:35 2010
@@ -90,7 +90,7 @@
LiteralValue lv = LiteralValue(*it);
m_impl->altNameList.push_back(lv);
}
- catch(blocxx::Exception& e)
+ catch(Exception& e)
{
LOGIT_ERROR("invalid value: " << *it);
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/IssuerAlternativeNameExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/IssuerAlternativeNameExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/IssuerAlternativeNameExtension.cpp Sat Jul 10 19:13:35 2010
@@ -116,7 +116,7 @@
LiteralValue lv = LiteralValue(*it);
m_impl->altNameList.push_back(lv);
}
- catch(blocxx::Exception& e)
+ catch(ca_mgm::Exception& e)
{
LOGIT_ERROR("invalid value: " << *it);
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/LDAPUrlImpl.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/LDAPUrlImpl.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/LDAPUrlImpl.hpp Sat Jul 10 19:13:35 2010
@@ -27,9 +27,6 @@
namespace url
{
-using namespace blocxx;
-
-
// ---------------------------------------------------------------
class LDAPUrlImpl: public UrlBase
{
Modified: limal-branches/mc-devel/limal-ca-mgm/src/PathUtils.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/PathUtils.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/PathUtils.cpp Sat Jul 10 19:13:35 2010
@@ -158,7 +158,7 @@
cmd, stdOutput, errOutput, EnvVars()
);
}
- catch(const blocxx::Exception &e) {
+ catch(const ca_mgm::Exception &e) {
LOGIT_ERROR( "removeDirRecursive exception: " << e);
}
if(status != 0) {
@@ -216,7 +216,7 @@
cmd, stdOutput, errOutput, EnvVars()
);
}
- catch(const blocxx::Exception &e) {
+ catch(const ca_mgm::Exception &e) {
LOGIT_ERROR( "copyDir exception: " << e);
}
if(status != 0) {
@@ -354,7 +354,7 @@
cmd, stdOutput, errOutput, EnvVars()
);
}
- catch(const blocxx::Exception &e) {
+ catch(const ca_mgm::Exception &e) {
LOGIT_ERROR( "copyFile exception: " << e);
}
if(status != 0) {
Modified: limal-branches/mc-devel/limal-ca-mgm/src/SubjectAlternativeNameExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/SubjectAlternativeNameExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/SubjectAlternativeNameExtension.cpp Sat Jul 10 19:13:35 2010
@@ -104,7 +104,7 @@
LiteralValue lv = LiteralValue(*it);
m_impl->altNameList.push_back(lv);
}
- catch(blocxx::Exception& e)
+ catch(ca_mgm::Exception& e)
{
LOGIT_ERROR("invalid value: " << *it << "\n" <<e);
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/Url.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/Url.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/Url.cpp Sat Jul 10 19:13:35 2010
@@ -20,6 +20,7 @@
#include <limal/Url.hpp>
#include <limal/PosixRegEx.hpp>
#include <limal/String.hpp>
+#include <limal/Exception.hpp>
#include "UrlByScheme.hpp"
#include "Utils.hpp"
@@ -31,8 +32,6 @@
namespace url
{
-using namespace blocxx;
-
// -----------------------------------------------------------------
Url::~Url()
@@ -117,7 +116,7 @@
return url;
}
- catch(const blocxx::Exception &e)
+ catch(const ca_mgm::Exception &e)
{
CA_MGM_THROW_SUBEX(url::UrlParsingException,
str::form(__("Unable to parse url string '%s'."),
Modified: limal-branches/mc-devel/limal-ca-mgm/src/UrlByScheme.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/UrlByScheme.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/UrlByScheme.cpp Sat Jul 10 19:13:35 2010
@@ -31,9 +31,6 @@
namespace url
{
-using namespace blocxx;
-
-
// -------------------------------------------------------------------
namespace
{
@@ -179,7 +176,7 @@
if( scheme == ptr->scheme && ptr->initfn != NULL)
{
return ptr->initfn();
- }
+ }
}
return ca_mgm::url::UrlRef();
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/UrlByScheme.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/UrlByScheme.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/UrlByScheme.hpp Sat Jul 10 19:13:35 2010
@@ -32,9 +32,6 @@
namespace url
{
-using namespace blocxx;
-
-
// -------------------------------------------------------------------
ca_mgm::url::UrlRef
getUrlByScheme(const std::string &scheme);
Modified: limal-branches/mc-devel/limal-ca-mgm/src/UrlUtils.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/UrlUtils.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/UrlUtils.cpp Sat Jul 10 19:13:35 2010
@@ -53,12 +53,12 @@
// -------------------------------------------------------------------
-BLOCXX_DEFINE_EXCEPTION (Url);
-BLOCXX_DEFINE_EXCEPTION2(UrlParsing, UrlException);
-BLOCXX_DEFINE_EXCEPTION2(UrlDecoding, UrlException);
-BLOCXX_DEFINE_EXCEPTION2(UrlBadComponent, UrlException);
-BLOCXX_DEFINE_EXCEPTION2(UrlNotAllowed, UrlException);
-BLOCXX_DEFINE_EXCEPTION2(UrlNotSupported, UrlException);
+CA_MGM_DEFINE_EXCEPTION (Url);
+CA_MGM_DEFINE_EXCEPTION2(UrlParsing, UrlException);
+CA_MGM_DEFINE_EXCEPTION2(UrlDecoding, UrlException);
+CA_MGM_DEFINE_EXCEPTION2(UrlBadComponent, UrlException);
+CA_MGM_DEFINE_EXCEPTION2(UrlNotAllowed, UrlException);
+CA_MGM_DEFINE_EXCEPTION2(UrlNotSupported, UrlException);
// -------------------------------------------------------------------
Modified: limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp Sat Jul 10 19:13:35 2010
@@ -273,7 +273,7 @@
status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput,
errOutput, env);
}
- catch(blocxx::Exception& e)
+ catch(ca_mgm::Exception& e)
{
LOGIT_INFO( "c_rehash exception:" << e);
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/Exception.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/Exception.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/Exception.hpp Sat Jul 10 19:13:35 2010
@@ -149,8 +149,8 @@
* @param NAME The name of the new class (Exception will be postfixed)
* @param BASE The base class.
*/
-#define CA_MGM_DECLARE_EXCEPTION(NAME) \
-class NAME##Exception : public ca_mgm::Exception \
+#define CA_MGM_DECLARE_EXCEPTION2(NAME, BASE) \
+class NAME##Exception : public BASE \
{ \
public: \
NAME##Exception(const char* file, int line, const char* msg, int errorCode = 0, const ca_mgm::Exception* otherException = 0); \
@@ -159,6 +159,14 @@
};
/**
+ * Declare a new exception class named \<NAME\>Exception that derives from Exception
+ * This macro is typically used in a header file.
+ *
+ * @param NAME The name of the new class (Exception will be postfixed)
+ */
+#define CA_MGM_DECLARE_EXCEPTION(NAME) CA_MGM_DECLARE_EXCEPTION2(NAME, ca_mgm::Exception)
+
+/**
* Define a new exception class named \<NAME\>Exception that derives from \<BASE\>.
* The new class will use UNKNOWN_SUBCLASS_ID for the subclass id.
* This macro is typically used in a cpp file.
@@ -166,12 +174,21 @@
* @param NAME The name of the new class (Exception will be postfixed)
* @param BASE The base class.
*/
-#define CA_MGM_DEFINE_EXCEPTION(NAME) \
+#define CA_MGM_DEFINE_EXCEPTION2(NAME, BASE) \
NAME##Exception::NAME##Exception(const char* file, int line, const char* msg, int errorCode, const ::ca_mgm::Exception* otherException) \
- : ca_mgm::Exception(file, line, msg, errorCode, otherException) {} \
+ : BASE(file, line, msg, errorCode, otherException) {} \
NAME##Exception::~NAME##Exception() throw() { } \
const char* NAME##Exception::type() const { return #NAME "Exception"; }\
+/**
+ * Define a new exception class named \<NAME\>Exception that derives from Exception.
+ * The new class will use UNKNOWN_SUBCLASS_ID for the subclass id.
+ * Use this macro for internal implementation exceptions that don't have an id.
+ * This macro is typically used in a cpp file.
+ *
+ * @param NAME The name of the new class (Exception will be postfixed)
+ */
+#define CA_MGM_DEFINE_EXCEPTION(NAME) CA_MGM_DEFINE_EXCEPTION2(NAME, ca_mgm::Exception)
/**
* Throw an exception using __FILE__ and __LINE__. If applicable,
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/UrlBase.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/UrlBase.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/UrlBase.hpp Sat Jul 10 19:13:35 2010
@@ -26,7 +26,6 @@
#include <limal/ca-mgm/config.h>
#include <limal/UrlUtils.hpp>
-//#include <blocxx/COWReference.hpp>
#include <limal/PtrTypes.hpp>
@@ -1168,7 +1167,6 @@
checkValidFragment(const std::string &fragment, EEncoding eflag) const;
private:
- //blocxx::COWReference<UrlBaseData> m_data;
RWCOW_pointer<UrlBaseData> m_data;
};
@@ -1177,7 +1175,6 @@
/**
* \brief Copy-On-Write Url reference.
*/
-//typedef blocxx::COWReference<UrlBase> UrlRef;
typedef RWCOW_pointer<UrlBase> UrlRef;
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/UrlUtils.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/UrlUtils.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/UrlUtils.hpp Sat Jul 10 19:13:35 2010
@@ -26,7 +26,7 @@
#include <limal/ca-mgm/config.h>
#include <limal/ByteBuffer.hpp>
-#include "blocxx/Exception.hpp"
+#include <limal/Exception.hpp>
#include <limal/String.hpp>
#include <map>
@@ -43,7 +43,7 @@
* @class UrlException
* Base class common for all URL exceptions.
*/
-BLOCXX_DECLARE_EXCEPTION (Url);
+CA_MGM_DECLARE_EXCEPTION (Url);
// -------------------------------------------------------------------
@@ -51,7 +51,7 @@
* @class UrlParsingException
* Thrown if the url or a component can't be parsed at all.
*/
-BLOCXX_DECLARE_EXCEPTION2(UrlParsing, UrlException);
+CA_MGM_DECLARE_EXCEPTION2(UrlParsing, UrlException);
// -------------------------------------------------------------------
@@ -59,7 +59,7 @@
* @class UrlDecodingException
* Thrown if the encoded string contains a NUL byte (%00).
*/
-BLOCXX_DECLARE_EXCEPTION2(UrlDecoding, UrlException);
+CA_MGM_DECLARE_EXCEPTION2(UrlDecoding, UrlException);
// -------------------------------------------------------------------
@@ -67,7 +67,7 @@
* @class UrlBadComponentException
* Thrown if a url component is invalid.
*/
-BLOCXX_DECLARE_EXCEPTION2(UrlBadComponent, UrlException);
+CA_MGM_DECLARE_EXCEPTION2(UrlBadComponent, UrlException);
// -------------------------------------------------------------------
@@ -75,7 +75,7 @@
* @class UrlNotAllowedException
* Thrown if scheme does not allow a component.
*/
-BLOCXX_DECLARE_EXCEPTION2(UrlNotAllowed, UrlException);
+CA_MGM_DECLARE_EXCEPTION2(UrlNotAllowed, UrlException);
// -------------------------------------------------------------------
@@ -84,7 +84,7 @@
* Thrown if a feature e.g. parsing of a component
* is not supported for the url/scheme.
*/
-BLOCXX_DECLARE_EXCEPTION2(UrlNotSupported, UrlException);
+CA_MGM_DECLARE_EXCEPTION2(UrlNotSupported, UrlException);
// -------------------------------------------------------------------
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CommonData.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CommonData.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CommonData.hpp Sat Jul 10 19:13:35 2010
@@ -71,7 +71,7 @@
enum EErrorCodes
{
- E_GENERIC = -1, //blocxx::Exception::UNKNOWN_ERROR_CODE, // == -1
+ E_GENERIC = -1,
E_C_EMPTY = -100, // value empty
E_ST_EMPTY = -101,
E_L_EMPTY = -102,
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt Sat Jul 10 19:13:35 2010
@@ -1,14 +1,14 @@
-d12f85f32848ae7f9f1d8064813aaa53-1278780371 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-68b3a1b7290aadfd42361b1b3c14e69a-1278780373 /C=DE/CN=Test Server Certificate\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1278780380 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1278780384 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1278780387 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-d12f85f32848ae7f9f1d8064813aaa53-1278780399 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-c293624b6a877f401407ce8f8f1f327e-1278780401 /C=DE/L=Nuremberg/O=SUSE Linux GmbH/OU=IT/CN=SUSE User CA/emailAddress=security-team(a)suse.de
-d12f85f32848ae7f9f1d8064813aaa53-1278780402 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-c1943ae4b9bd7320fae3e29f217483e3-1278780403 /C=DE/CN=Test Request/emailAddress=suse(a)suse.de
-d816690a832b0e52becd255d3a62e975-1278780406 /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse(a)suse.de
-9198f6798d9da70d7cbfb67b610633f5-1278780408 /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse(a)suse.de
-3e248858337c2b46dc67a0f9389376dd-1278780411 /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse(a)suse.de
-bf04fdd95062554800c1556085f47063-1278780414 /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse(a)suse.de
-9797ac11af29f94b82c1e5b0499ab5f2-1278780415 /C=DE/CN=Test Sub CA/emailAddress=suse(a)suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1278781967 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
+68b3a1b7290aadfd42361b1b3c14e69a-1278781968 /C=DE/CN=Test Server Certificate\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1278781973 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1278781976 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1278781979 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1278781988 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
+c293624b6a877f401407ce8f8f1f327e-1278781989 /C=DE/L=Nuremberg/O=SUSE Linux GmbH/OU=IT/CN=SUSE User CA/emailAddress=security-team(a)suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1278781990 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
+c1943ae4b9bd7320fae3e29f217483e3-1278781991 /C=DE/CN=Test Request/emailAddress=suse(a)suse.de
+d816690a832b0e52becd255d3a62e975-1278781994 /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse(a)suse.de
+9198f6798d9da70d7cbfb67b610633f5-1278781995 /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse(a)suse.de
+3e248858337c2b46dc67a0f9389376dd-1278781996 /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse(a)suse.de
+bf04fdd95062554800c1556085f47063-1278782000 /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse(a)suse.de
+9797ac11af29f94b82c1e5b0499ab5f2-1278782002 /C=DE/CN=Test Sub CA/emailAddress=suse(a)suse.de
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt Sat Jul 10 19:13:35 2010
@@ -1,11 +1,11 @@
-V 110710164612Z 01 unknown /C=DE/CN=Test CA/SUSE Inc.\Gmbh/emailAddress=suse(a)suse.de
-V 110710164613Z 02 unknown /C=DE/CN=Test Server Certificate/SUSE Inc.\Gmbh/emailAddress=suse(a)suse.de
-V 110710164617Z 03 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-V 110710164621Z 04 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-V 110710164625Z 05 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-R 110710164644Z 100710164646Z 06 unknown /C=DE/CN=Test Certificate for revocation/emailAddress=suse(a)suse.de
-R 110710164646Z 100710164647Z,holdInstruction,holdInstructionCallIssuer 07 unknown /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse(a)suse.de
-R 110710164648Z 100710164651Z,keyTime,20100710163011Z 08 unknown /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse(a)suse.de
-R 110710164651Z 100710164653Z,CAkeyTime,20100710163013Z 09 unknown /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse(a)suse.de
-R 110710164654Z 100710164654Z,holdInstruction,1.6.21.43 0A unknown /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse(a)suse.de
-V 120709164655Z 0B unknown /C=DE/CN=Test Sub CA/emailAddress=suse(a)suse.de
+V 110710171248Z 01 unknown /C=DE/CN=Test CA/SUSE Inc.\Gmbh/emailAddress=suse(a)suse.de
+V 110710171248Z 02 unknown /C=DE/CN=Test Server Certificate/SUSE Inc.\Gmbh/emailAddress=suse(a)suse.de
+V 110710171251Z 03 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+V 110710171254Z 04 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+V 110710171257Z 05 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+R 110710171312Z 100710171314Z 06 unknown /C=DE/CN=Test Certificate for revocation/emailAddress=suse(a)suse.de
+R 110710171314Z 100710171314Z,holdInstruction,holdInstructionCallIssuer 07 unknown /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse(a)suse.de
+R 110710171315Z 100710171316Z,keyTime,20100710165636Z 08 unknown /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse(a)suse.de
+R 110710171316Z 100710171319Z,CAkeyTime,20100710165639Z 09 unknown /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse(a)suse.de
+R 110710171320Z 100710171321Z,holdInstruction,1.6.21.43 0A unknown /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse(a)suse.de
+V 120709171322Z 0B unknown /C=DE/CN=Test Sub CA/emailAddress=suse(a)suse.de
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/.rand
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
Binary files - no diff available.
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem Sat Jul 10 19:13:35 2010
@@ -1,7 +1,7 @@
-----BEGIN X509 CRL-----
MIIC+TCCAeECAQEwDQYJKoZIhvcNAQEFBQAwQzELMAkGA1UEBhMCREUxFzAVBgNV
BAMTDlN0YXRpYyBUZXN0IENBMRswGQYJKoZIhvcNAQkBFgxzdXNlQHN1c2UuZGUX
-DTEwMDcxMDE2NDY1N1oXDTEwMDcxMTE2NDY1N1owgfAwEgIBAxcNMDUwODE4MTQx
+DTEwMDcxMDE3MTMyNFoXDTEwMDcxMTE3MTMyNFowgfAwEgIBAxcNMDUwODE4MTQx
MzIzWjAyAgEEFw0wNTA4MTgxNDEzMjVaMB4wCgYDVR0VBAMKAQYwEAYDVR0XBAkG
ByqGSM44AgIwOgIBBRcNMDUwODE4MTQxMzI2WjAmMAoGA1UdFQQDCgEBMBgGA1Ud
GAQRGA8yMDA1MDgxODE1NTY0NlowOgIBBhcNMDUwODE4MTQxMzI4WjAmMAoGA1Ud
@@ -9,10 +9,10 @@
ODE4WjAaMAoGA1UdFQQDCgEGMAwGA1UdFwQFBgMuFSugdzB1MHMGA1UdIwRsMGqA
FDIAwASkKojCPsrVvdhM01KIIH87oUekRTBDMQswCQYDVQQGEwJERTEXMBUGA1UE
AxMOU3RhdGljIFRlc3QgQ0ExGzAZBgkqhkiG9w0BCQEWDHN1c2VAc3VzZS5kZYIJ
-AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQAOcwfD/NxczaBnB27TtG65Bm6d
-Yrfi+Y3qY6gxXAsX4XkNDjYjHZEJH4/36BN0NEyqz6AWqB+3WX/96omzDBvNE51D
-gEYkZYX9zeoZxWHZPwFz/m0K7zNkiZ5QSkhHfYs+J5p7WZo7meBu7biyhFj+Icm7
-f0IxZo9y/siSP5Q+xkP919K6vKacFExiCVfuHlZ6Kgzub0ckVtAUbX2c2a4kcBcV
-5vERTWdNEBxFyNSa3+Cv2J2r7Bi9V9TzEKXqNsDnugboUptwBOdn1T9z69hXDa0S
-pNYKX68swGITbRj84LIG9RuJpSpD8eV9G8A4ecDqZD7vZW2vJ8dZ8XS2Hzki
+AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQB4sIMHgeZPVkUM0Hf6gqbbgsoB
+0ZCbQm+6ejkWdHOEwPbScKR1TjizFpKRgZBlC8ueKC4vXHXdQ6WzJhhum+iEwbYV
+KSkai9C9CLEbUHib22lA05JxbuSTNb6wSlwFk34CGkVUKUAdyViTP4EwF+sAgtjf
+z1UPbW+nd8nZgCNmRZIip3zoYOgUdFPsJauntwZ8uhIFwgx7HetMqSAK5uU50x4L
+gJPWpstnwr4sPe5NuGo5qCV3VhQsSnpig6KxIRklv2XTVtNjnd8bXPXOiag9A0mX
+PFxoqUCXEXEwHD9jOZ+BwEn6F285Tk+20zPbllpQLacyCVmXQC+W8bF4w2ZB
-----END X509 CRL-----
--
To unsubscribe, e-mail: limal-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: limal-commit+help(a)opensuse.org
1
0
r2685 - in /limal-branches/mc-devel/limal-ca-mgm: src/ src/limal/ testsuite/ testsuite/TestRepos/Test_CA1/ testsuite/TestRepos/Test_CA2/ testsuite/TestRepos/Test_CA2/crl/
by mcalmer＠svn.opensuse.org 10 Jul '10
by mcalmer＠svn.opensuse.org 10 Jul '10
10 Jul '10
Author: mcalmer
Date: Sat Jul 10 18:47:47 2010
New Revision: 2685
URL: http://svn.opensuse.org/viewcvs/limal?rev=2685&view=rev
Log:
blocxx::Exception => ca_mgm::Exception
Modified:
limal-branches/mc-devel/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierExtension_Priv.cpp
limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierGenerateExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/BasicConstraintsExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/BitExtensions.cpp
limal-branches/mc-devel/limal-ca-mgm/src/ByteBuffer.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CRLData.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CRLData_Priv.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CRLDistributionPointsExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CRLGenerationData.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CRLReason.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CertificateData_Priv.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CertificateIssueData.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CertificatePoliciesExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/DNObject.cpp
limal-branches/mc-devel/limal-ca-mgm/src/DNObject_Priv.cpp
limal-branches/mc-devel/limal-ca-mgm/src/Date.cpp
limal-branches/mc-devel/limal-ca-mgm/src/Exception.cpp
limal-branches/mc-devel/limal-ca-mgm/src/ExtendedKeyUsageExt.cpp
limal-branches/mc-devel/limal-ca-mgm/src/IssuerAlternativeNameExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/LDAPUrlImpl.cpp
limal-branches/mc-devel/limal-ca-mgm/src/LiteralValues.cpp
limal-branches/mc-devel/limal-ca-mgm/src/LiteralValues_Priv.cpp
limal-branches/mc-devel/limal-ca-mgm/src/LocalManagement.cpp
limal-branches/mc-devel/limal-ca-mgm/src/Logger.cpp
limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.cpp
limal-branches/mc-devel/limal-ca-mgm/src/PathName.cpp
limal-branches/mc-devel/limal-ca-mgm/src/PathUtils.cpp
limal-branches/mc-devel/limal-ca-mgm/src/PerlRegEx.cpp
limal-branches/mc-devel/limal-ca-mgm/src/PosixRegEx.cpp
limal-branches/mc-devel/limal-ca-mgm/src/RequestData_Priv.cpp
limal-branches/mc-devel/limal-ca-mgm/src/RequestGenerationData.cpp
limal-branches/mc-devel/limal-ca-mgm/src/StringExtensions.cpp
limal-branches/mc-devel/limal-ca-mgm/src/SubjectAlternativeNameExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/SubjectKeyIdentifierExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/Url.cpp
limal-branches/mc-devel/limal-ca-mgm/src/UrlBase.cpp
limal-branches/mc-devel/limal-ca-mgm/src/UrlUtils.cpp
limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp
limal-branches/mc-devel/limal-ca-mgm/src/ValueCheck.cpp
limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLExtensions_Priv.cpp
limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLGenerationExtensions.cpp
limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateExtensions_Priv.cpp
limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateIssueExtensions.cpp
limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensions.cpp
limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensions_Priv.cpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/Exception.hpp
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA2.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA3.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA4.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA7.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA8.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CA9.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest2.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest3.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest4.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest5.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest6.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ConvertTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/DeleteCATest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ExportTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/IPv6CheckTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCATest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCommonCertificateTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportRequestTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ListCATreeTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ListTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCATest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCRLTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCertificateTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCertificateTest2.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseRequestTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/RemoveCertificateTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/RemoveRequestTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/RequestTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest2.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest3.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest4.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest5.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/SubCATest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/.rand
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem
limal-branches/mc-devel/limal-ca-mgm/testsuite/UpdateDBTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/VerifyTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser.cc
Modified: limal-branches/mc-devel/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp Sat Jul 10 18:47:47 2010
@@ -103,12 +103,12 @@
if(!location.valid())
{
LOGIT_ERROR("invalid location");
- BLOCXX_THROW(ca_mgm::ValueException, __("Invalid location."));
+ CA_MGM_THROW(ca_mgm::ValueException, __("Invalid location."));
}
if(!initAccessOIDCheck().isValid(accessOID))
{
LOGIT_ERROR("invalid accessOID");
- BLOCXX_THROW(ca_mgm::ValueException, __("Invalid accessOID."));
+ CA_MGM_THROW(ca_mgm::ValueException, __("Invalid accessOID."));
}
}
@@ -132,12 +132,12 @@
if(!location.valid())
{
LOGIT_ERROR("invalid location");
- BLOCXX_THROW(ca_mgm::ValueException, __("Invalid location."));
+ CA_MGM_THROW(ca_mgm::ValueException, __("Invalid location."));
}
if(!initAccessOIDCheck().isValid(accessOID))
{
LOGIT_ERROR("invalid accessOID");
- BLOCXX_THROW(ca_mgm::ValueException, __("Invalid accessOID."));
+ CA_MGM_THROW(ca_mgm::ValueException, __("Invalid accessOID."));
}
m_impl->accessOID = accessOID;
@@ -252,7 +252,7 @@
type == E_CA_Req || type == E_CRL )
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str());
}
bool p = caConfig->exists(type2Section(type, true), "authorityInfoAccess");
@@ -302,7 +302,7 @@
for(;it != infolist.end(); it++) {
if(!(*it).valid()) {
LOGIT_ERROR("invalid AuthorityInformation in infolist");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid AuthorityInformation in the information list."));
}
}
@@ -315,7 +315,7 @@
{
if(!isPresent()) {
LOGIT_ERROR("AuthorityInfoAccessExt is not present");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("AuthorityInfoAccessExt is not present."));
}
return m_impl->info;
@@ -327,7 +327,7 @@
if(!valid())
{
LOGIT_ERROR("invalid AuthorityInfoAccessExt object");
- BLOCXX_THROW(ca_mgm::ValueException, __("Invalid AuthorityInfoAccessExt object."));
+ CA_MGM_THROW(ca_mgm::ValueException, __("Invalid AuthorityInfoAccessExt object."));
}
// These types are not supported by this object
@@ -335,7 +335,7 @@
type == E_CA_Req || type == E_CRL )
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str());
}
if(isPresent())
Modified: limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierExtension.cpp Sat Jul 10 18:47:47 2010
@@ -90,7 +90,7 @@
{
if(!isPresent()) {
LOGIT_ERROR("AuthorityKeyIdentifierExt is not present");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("AuthorityKeyIdentifierExt is not present."));
}
return m_impl->keyid;
@@ -101,7 +101,7 @@
{
if(!isPresent()) {
LOGIT_ERROR("AuthorityKeyIdentifierExt is not present");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("AuthorityKeyIdentifierExt is not present."));
}
return m_impl->DirName;
@@ -112,7 +112,7 @@
{
if(!isPresent()) {
LOGIT_ERROR("AuthorityKeyIdentifierExt is not present");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("AuthorityKeyIdentifierExt is not present."));
}
return m_impl->serial;
Modified: limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierExtension_Priv.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierExtension_Priv.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierExtension_Priv.cpp Sat Jul 10 18:47:47 2010
@@ -64,12 +64,12 @@
{
// extension occurred more than once
LOGIT_ERROR("Extension occurred more than once");
- BLOCXX_THROW(ca_mgm::SyntaxException,
+ CA_MGM_THROW(ca_mgm::SyntaxException,
"Extension occurred more than once");
}
LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")");
- BLOCXX_THROW(ca_mgm::SyntaxException,
+ CA_MGM_THROW(ca_mgm::SyntaxException,
str::form("Unable to parse the certificate (Crit: %d)",
crit).c_str());
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierGenerateExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierGenerateExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierGenerateExtension.cpp Sat Jul 10 18:47:47 2010
@@ -79,7 +79,7 @@
if(type == E_Client_Req || type == E_Server_Req || type == E_CA_Req)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
@@ -147,7 +147,7 @@
if(!isPresent())
{
LOGIT_ERROR("AuthorityKeyIdentifierGenerateExt is not present");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("AuthorityKeyIdentifierGenerateExt is not present."));
}
return m_impl->keyid;
@@ -166,7 +166,7 @@
if(!isPresent())
{
LOGIT_ERROR("AuthorityKeyIdentifierGenerateExt is not present");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("AuthorityKeyIdentifierGenerateExt is not present."));
}
return m_impl->issuer;
@@ -178,7 +178,7 @@
if(!valid())
{
LOGIT_ERROR("invalid AuthorityKeyIdentifierGenerateExt object");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid AuthorityKeyIdentifierGenerateExt object."));
}
@@ -186,7 +186,7 @@
if(type == E_Client_Req || type == E_Server_Req || type == E_CA_Req)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/BasicConstraintsExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/BasicConstraintsExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/BasicConstraintsExtension.cpp Sat Jul 10 18:47:47 2010
@@ -77,7 +77,7 @@
if(type == E_CRL)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
@@ -148,7 +148,7 @@
if(!isPresent())
{
LOGIT_ERROR("BasicConstraintsExt is not present");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("BasicConstraintsExt is not present."));
}
return m_impl->ca;
@@ -160,7 +160,7 @@
if(!isPresent())
{
LOGIT_ERROR("BasicConstraintsExt is not present");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("BasicConstraintsExt is not present."));
}
return m_impl->pathlen;
@@ -172,7 +172,7 @@
if(!valid())
{
LOGIT_ERROR("invalid BasicConstraintsExt object");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid BasicConstraintsExt object."));
}
@@ -180,7 +180,7 @@
if(type == E_CRL)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/BitExtensions.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/BitExtensions.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/BitExtensions.cpp Sat Jul 10 18:47:47 2010
@@ -104,7 +104,7 @@
{
if(!isPresent())
{
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("This BitExtension is not present."));
}
return m_impl->value;
@@ -127,7 +127,7 @@
if(type == E_CRL)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %d."), type).c_str());
}
@@ -167,7 +167,7 @@
{
if(!validKeyUsage(keyUsage))
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for keyUsage."));
}
setPresent(true);
@@ -196,7 +196,7 @@
{
if(!validKeyUsage(keyUsage))
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for keyUsage."));
}
setValue(keyUsage);
@@ -208,7 +208,7 @@
{
if(!isPresent())
{
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("KeyUsageExt is not present."));
}
return getValue();
@@ -219,7 +219,7 @@
{
if(!isPresent())
{
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("KeyUsageExt is not present."));
}
@@ -232,7 +232,7 @@
if(!valid())
{
LOGIT_ERROR("invalid KeyUsageExt object");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid KeyUsageExt object."));
}
@@ -240,7 +240,7 @@
if(type == E_CRL)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %d."), type).c_str());
}
@@ -365,7 +365,7 @@
if(type == E_CRL)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
@@ -403,7 +403,7 @@
{
if(nsCertTypes > 0xFF || nsCertTypes == 0)
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for NsCertTypeExt."));
}
setPresent(true);
@@ -432,7 +432,7 @@
{
if(nsCertTypes > 0xFF || nsCertTypes == 0)
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Invalid value for NsCertTypeExt: %1."), nsCertTypes).c_str());
}
setValue(nsCertTypes);
@@ -444,7 +444,7 @@
{
if(!isPresent())
{
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("NsCertTypeExt is not present."));
}
return getValue();
@@ -465,7 +465,7 @@
if(!valid())
{
LOGIT_ERROR("invalid NsCertTypeExt object");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid NsCertTypeExt object."));
}
@@ -473,7 +473,7 @@
if(type == E_CRL)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/ByteBuffer.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/ByteBuffer.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/ByteBuffer.cpp Sat Jul 10 18:47:47 2010
@@ -239,7 +239,7 @@
LOGIT_ERROR("ByteBuffer index out of bounds: size="
<< size() << ", pos=" << pos);
- BLOCXX_THROW(blocxx::OutOfBoundsException, str::form(
+ CA_MGM_THROW(blocxx::OutOfBoundsException, str::form(
__("ByteBuffer index out of bounds: size=%1, pos=%2."),
size(), pos).c_str());
}
@@ -257,7 +257,7 @@
}
else
{
- BLOCXX_THROW(ca_mgm::RuntimeException, __("ByteBuffer not initialized"));
+ CA_MGM_THROW(ca_mgm::RuntimeException, __("ByteBuffer not initialized"));
}
}
}
@@ -273,7 +273,7 @@
}
else
{
- BLOCXX_THROW(ca_mgm::RuntimeException, __("ByteBuffer not initialized"));
+ CA_MGM_THROW(ca_mgm::RuntimeException, __("ByteBuffer not initialized"));
}
}
@@ -289,7 +289,7 @@
LOGIT_ERROR("ByteBuffer index out of bounds: size="
<< size() << ", pos=" << pos);
- BLOCXX_THROW(blocxx::OutOfBoundsException, str::form(
+ CA_MGM_THROW(blocxx::OutOfBoundsException, str::form(
__("ByteBuffer index out of bounds: size=%1, pos=%2."),
size(), pos).c_str());
}
@@ -306,7 +306,7 @@
LOGIT_ERROR("ByteBuffer index out of bounds: size="
<< size() << ", pos=" << pos);
- BLOCXX_THROW(blocxx::OutOfBoundsException, str::form(
+ CA_MGM_THROW(blocxx::OutOfBoundsException, str::form(
__("ByteBuffer index out of bounds: size=%1, pos=%2."),
size(), pos).c_str());
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp Sat Jul 10 18:47:47 2010
@@ -97,7 +97,7 @@
{
LOGIT_ERROR("template not initialized");
// exception
- BLOCXX_THROW(ca_mgm::RuntimeException, __("Template not initialized."));
+ CA_MGM_THROW(ca_mgm::RuntimeException, __("Template not initialized."));
}
return "";
}
@@ -167,14 +167,14 @@
if(caName.empty())
{
LOGIT_ERROR("Empty CA name.");
- BLOCXX_THROW(ca_mgm::ValueException, __("Empty CA name."));
+ CA_MGM_THROW(ca_mgm::ValueException, __("Empty CA name."));
}
path::PathInfo pi(repos+"/"+caName+"/openssl.cnf.tmpl");
if(!pi.exists())
{
LOGIT_ERROR("Template does not exists: " << pi.toString());
- BLOCXX_THROW_ERR(ca_mgm::SystemException,
+ CA_MGM_THROW_ERR(ca_mgm::SystemException,
str::form(__("Template does not exist: %s."), pi.toString().c_str()).c_str(),
E_FILE_NOT_FOUND);
}
@@ -186,7 +186,7 @@
if(!passOK)
{
LOGIT_ERROR("Invalid CA password");
- BLOCXX_THROW_ERR(ca_mgm::ValueException,
+ CA_MGM_THROW_ERR(ca_mgm::ValueException,
__("Invalid CA password."), E_INVALID_PASSWD);
}
@@ -227,10 +227,10 @@
{
OpenSSLUtils::createCaInfrastructure(newCaName, m_impl->repositoryDir);
}
- catch(blocxx::Exception &e)
+ catch(Exception &e)
{
LOGIT_ERROR(e);
- BLOCXX_THROW_SUBEX(ca_mgm::SystemException,
+ CA_MGM_THROW_SUBEX(ca_mgm::SystemException,
__("Error while creating the CA infrastructure."),
e);
}
@@ -250,7 +250,7 @@
LOGIT_ERROR("Can not parse certificate name: " << certificate);
// %1 is the name of the CA
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
str::form(__("Cannot parse the certificate name %s."), certificate.c_str()).c_str());
}
@@ -262,7 +262,7 @@
path::removeDirRecursive(m_impl->repositoryDir + "/" + newCaName);
LOGIT_ERROR("Can not copy the private key." << r);
- BLOCXX_THROW(ca_mgm::SystemException, __("Cannot copy the private key."));
+ CA_MGM_THROW(ca_mgm::SystemException, __("Cannot copy the private key."));
}
r = path::copyFile(m_impl->repositoryDir +"/"+ m_impl->caName +"/newcerts/"+ certificate +".pem",
@@ -273,7 +273,7 @@
path::removeDirRecursive(m_impl->repositoryDir + "/" + newCaName);
LOGIT_ERROR("Can not copy the certificate." << r);
- BLOCXX_THROW(ca_mgm::SystemException, __("Cannot copy the certificate."));
+ CA_MGM_THROW(ca_mgm::SystemException, __("Cannot copy the certificate."));
}
r = path::copyFile(m_impl->repositoryDir + "/" + newCaName + "/" + "cacert.pem",
@@ -305,7 +305,7 @@
if(!requestData.valid())
{
LOGIT_ERROR("Invalid request data");
- BLOCXX_THROW(ca_mgm::ValueException, __("Invalid request data."));
+ CA_MGM_THROW(ca_mgm::ValueException, __("Invalid request data."));
}
// copy template to config
@@ -323,7 +323,7 @@
if(dKey.exists())
{
LOGIT_ERROR("Duplicate DN. Key '" << request <<".key' already exists.");
- BLOCXX_THROW(RuntimeException,
+ CA_MGM_THROW(RuntimeException,
str::form(__("Duplicate DN. Key %s.key already exists."), request.c_str()).c_str());
}
@@ -331,7 +331,7 @@
if(r.exists())
{
LOGIT_ERROR("Duplicate DN. Request '" << request <<".req' already exists.");
- BLOCXX_THROW(RuntimeException,
+ CA_MGM_THROW(RuntimeException,
str::form(__("Duplicate DN. Request %s.req already exists."), request.c_str()).c_str());
}
@@ -376,14 +376,14 @@
{
LOGIT_ERROR("Request does not exist.(" << requestFile << ")");
// %1 is the absolute path to the request
- BLOCXX_THROW(ValueException,
+ CA_MGM_THROW(ValueException,
str::form(__("Request does not exist (%s)."), requestFile.c_str() ).c_str());
}
if(!issueData.valid())
{
LOGIT_ERROR("Invalid issue data");
- BLOCXX_THROW(ca_mgm::ValueException, __("Invalid issue data."));
+ CA_MGM_THROW(ca_mgm::ValueException, __("Invalid issue data."));
}
std::string serial = OpenSSLUtils::nextSerial(m_impl->repositoryDir + "/" + m_impl->caName + "/serial");
@@ -399,7 +399,7 @@
LOGIT_ERROR("CA expires before the certificate should expire.");
LOGIT_ERROR("CA expires: '" << cdata.getEndDate() <<
"' Cert should expire: '" << issueData.getEndDate()<< "'");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("The CA expires before the certificate should expire."));
}
@@ -471,13 +471,13 @@
{
certificate = issueCertificate(requestName, certificateData, t);
}
- catch(blocxx::Exception &e)
+ catch(Exception &e)
{
OpenSSLUtils::delCAM(m_impl->caName, requestName, m_impl->repositoryDir);
path::removeFile(m_impl->repositoryDir + "/" + m_impl->caName + "/keys/" + requestName + ".key");
path::removeFile(m_impl->repositoryDir + "/" + m_impl->caName + "/req/" + requestName + ".req");
- BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException,
+ CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException,
__("Issuing the certificate failed."), e);
}
@@ -494,7 +494,7 @@
if(!pi.exists())
{
LOGIT_ERROR("File '" << certificateName << ".pem' not found in repository");
- BLOCXX_THROW_ERR(ca_mgm::SystemException,
+ CA_MGM_THROW_ERR(ca_mgm::SystemException,
str::form(__("File %s not found in the repository."), certificateName.c_str()).c_str(),
E_FILE_NOT_FOUND);
}
@@ -502,7 +502,7 @@
if(!crlReason.valid())
{
LOGIT_ERROR("Invalid CRL reason");
- BLOCXX_THROW(ca_mgm::ValueException, __("Invalid CRL reason."));
+ CA_MGM_THROW(ca_mgm::ValueException, __("Invalid CRL reason."));
}
// copy template to config
@@ -525,7 +525,7 @@
if(!crlData.valid())
{
LOGIT_ERROR("Invalid CRL data");
- BLOCXX_THROW(ca_mgm::ValueException, __("Invalid CRL data."));
+ CA_MGM_THROW(ca_mgm::ValueException, __("Invalid CRL data."));
}
// copy template to config
@@ -570,7 +570,7 @@
if(outPi.exists())
{
LOGIT_ERROR("Duplicate DN. Request already exists.");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("Duplicate DN. Request already exists."));
}
@@ -836,7 +836,7 @@
if(sa.size() != 2)
{
LOGIT_ERROR("Cannot parse certificate Name");
- BLOCXX_THROW(ca_mgm::ValueException, __("Cannot parse the certificate name."));
+ CA_MGM_THROW(ca_mgm::ValueException, __("Cannot parse the certificate name."));
}
ret = LocalManagement::readFile(m_impl->repositoryDir + "/" + m_impl->caName + "/keys/" +
@@ -863,7 +863,7 @@
if(sa.size() != 2)
{
LOGIT_ERROR("Cannot parse certificate Name");
- BLOCXX_THROW(ca_mgm::ValueException, __("Cannot parse the certificate name."));
+ CA_MGM_THROW(ca_mgm::ValueException, __("Cannot parse the certificate name."));
}
ret = LocalManagement::readFile(m_impl->repositoryDir + "/" + m_impl->caName + "/keys/" +
@@ -893,7 +893,7 @@
if(sa.size() != 2)
{
LOGIT_ERROR("Cannot parse certificate Name");
- BLOCXX_THROW(ca_mgm::ValueException, __("Cannot parse the certificate name."));
+ CA_MGM_THROW(ca_mgm::ValueException, __("Cannot parse the certificate name."));
}
ByteBuffer caCert;
@@ -944,7 +944,7 @@
if(!reqFile.exists())
{
LOGIT_ERROR("Request '" << reqFile.toString() <<"' does not exist." );
- BLOCXX_THROW(ca_mgm::SystemException, str::form(__("Request %s does not exist."),
+ CA_MGM_THROW(ca_mgm::SystemException, str::form(__("Request %s does not exist."),
reqFile.toString().c_str()).c_str());
}
@@ -964,7 +964,7 @@
r = path::removeFile(reqFile.toString());
if(r != 0)
{
- BLOCXX_THROW(ca_mgm::SystemException,
+ CA_MGM_THROW(ca_mgm::SystemException,
// %1 is the error code
str::form(__("Removing the request failed (%1)."), r).c_str());
}
@@ -978,7 +978,7 @@
if(!certFile.exists())
{
LOGIT_ERROR("Certificate does not exist." << certFile.toString());
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
// %s is the absolute path to the certificate
str::form(__("Certificate %s does not exist."),
certFile.toString().c_str()).c_str());
@@ -990,7 +990,7 @@
if(sa.size() != 3)
{
LOGIT_ERROR("Can not parse certificate name: " << certificateName);
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
// %s is the certificate name
str::form(__("Cannot parse the certificate name %s."), certificateName.c_str()).c_str());
}
@@ -1027,7 +1027,7 @@
int r = path::removeFile(certFile.toString());
if(r != 0)
{
- BLOCXX_THROW(ca_mgm::SystemException,
+ CA_MGM_THROW(ca_mgm::SystemException,
// %2 is the error code of rm
str::form(__("Removing the certificate failed: %d."), r).c_str());
}
@@ -1036,7 +1036,7 @@
{
LOGIT_ERROR("Only revoked or expired certificates can be deleted. " <<
str::form("The status of the certificate is '%s'.", state.c_str()).c_str());
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
str::form(__("Only revoked or expired certificates can be deleted. The status of the certificate is %s."), state.c_str()).c_str());
}
}
@@ -1049,7 +1049,7 @@
if(!db.exists())
{
LOGIT_ERROR("Database not found.");
- BLOCXX_THROW(ca_mgm::RuntimeException, __("Database not found."));
+ CA_MGM_THROW(ca_mgm::RuntimeException, __("Database not found."));
}
if(db.size() != 0)
@@ -1075,7 +1075,7 @@
if(!certFile.exists())
{
LOGIT_ERROR("Certificate does not exist");
- BLOCXX_THROW(ca_mgm::SystemException, __("Certificate does not exist."));
+ CA_MGM_THROW(ca_mgm::SystemException, __("Certificate does not exist."));
}
if(purpose != "sslclient" &&
@@ -1088,7 +1088,7 @@
purpose != "ocsphelper")
{
LOGIT_ERROR("Invalid purpose: " << purpose);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Invalid purpose %s."), purpose.c_str()).c_str());
}
@@ -1104,7 +1104,7 @@
if(!ret.empty())
{
LOGIT_ERROR(ret);
- BLOCXX_THROW(ca_mgm::RuntimeException, ret.c_str());
+ CA_MGM_THROW(ca_mgm::RuntimeException, ret.c_str());
}
return true;
@@ -1132,13 +1132,13 @@
if(!caRequestData.valid())
{
LOGIT_ERROR("Invalid CA request data");
- BLOCXX_THROW(ca_mgm::ValueException, __("Invalid CA request data."));
+ CA_MGM_THROW(ca_mgm::ValueException, __("Invalid CA request data."));
}
if(!caIssueData.valid())
{
LOGIT_ERROR("Invalid CA issue data");
- BLOCXX_THROW(ca_mgm::ValueException, __("Invalid CA issue data."));
+ CA_MGM_THROW(ca_mgm::ValueException, __("Invalid CA issue data."));
}
@@ -1148,10 +1148,10 @@
{
OpenSSLUtils::createCaInfrastructure(caName, repos);
}
- catch(blocxx::Exception &e)
+ catch(Exception &e)
{
LOGIT_ERROR(e);
- BLOCXX_THROW_SUBEX(ca_mgm::SystemException,
+ CA_MGM_THROW_SUBEX(ca_mgm::SystemException,
__("Error while creating the CA infrastructure."),
e);
}
@@ -1232,7 +1232,7 @@
if(caName.empty())
{
LOGIT_ERROR("CA name is empty");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("CA name is empty."));
}
@@ -1241,7 +1241,7 @@
if(caDir.exists())
{
LOGIT_ERROR("CA directory already exists");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("CA directory already exists."));
}
@@ -1252,14 +1252,14 @@
if(!bs.isPresent() || !bs.isCA())
{
LOGIT_ERROR("According to 'basicConstraints', this is not a CA.");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("According to basicConstraints, this is not a CA."));
}
if(caKey.empty())
{
LOGIT_ERROR("CA key is empty");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("CA key is empty."));
}
@@ -1268,14 +1268,14 @@
if(!keyregex.match(std::string(caKey.data(), caKey.size())))
{
LOGIT_ERROR("Invalid Key data.");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid key data."));
}
if(caPasswd.empty())
{
LOGIT_ERROR("CA password is empty.");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("CA password is empty."));
}
@@ -1291,10 +1291,10 @@
{
OpenSSLUtils::createCaInfrastructure(caName, repos);
}
- catch(blocxx::Exception &e)
+ catch(Exception &e)
{
LOGIT_ERROR(e);
- BLOCXX_THROW_SUBEX(ca_mgm::SystemException,
+ CA_MGM_THROW_SUBEX(ca_mgm::SystemException,
__("Error while creating the CA infrastructure."),
e);
}
@@ -1319,7 +1319,7 @@
path::removeDirRecursive(repos + "/" + caName);
LOGIT_ERROR ("Error during key encryption." );
- BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException,
+ CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException,
__("Error during key encryption."), e);
}
@@ -1341,7 +1341,7 @@
path::removeDirRecursive(repos + "/" + caName);
LOGIT_ERROR ("Error during write defaults." );
- BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException,
+ CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException,
__("Error during write defaults."), e);
}
@@ -1476,7 +1476,7 @@
if(caName.empty())
{
LOGIT_ERROR("Empty CA name.");
- BLOCXX_THROW(ca_mgm::ValueException, __("Empty CA name."));
+ CA_MGM_THROW(ca_mgm::ValueException, __("Empty CA name."));
}
path::PathInfo pi(repos + "/" + caName);
@@ -1484,7 +1484,7 @@
if(!pi.exists())
{
LOGIT_ERROR("CA name does not exist.(" << pi.toString() << ")");
- BLOCXX_THROW_ERR(ca_mgm::ValueException,
+ CA_MGM_THROW_ERR(ca_mgm::ValueException,
// %s is the absolute path name to the CA
str::form(__("CA name does not exist (%s)."), pi.toString().c_str()).c_str(),
E_FILE_NOT_FOUND);
@@ -1497,7 +1497,7 @@
if(!ret)
{
LOGIT_ERROR("Invalid CA password");
- BLOCXX_THROW_ERR(ca_mgm::ValueException, __("Invalid CA password."), E_INVALID_PASSWD);
+ CA_MGM_THROW_ERR(ca_mgm::ValueException, __("Invalid CA password."), E_INVALID_PASSWD);
}
if(!force)
@@ -1516,7 +1516,7 @@
{
LOGIT_ERROR("Deleting the CA is not allowed. " <<
"The CA must be expired or no certificate was signed with this CA");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("Deleting the CA is not allowed. The CA must be expired or never have signed a certificate."));
}
else
@@ -1540,7 +1540,7 @@
if( r != 0 )
{
LOGIT_ERROR("Deleting the CA failed: " << r);
- BLOCXX_THROW(ca_mgm::SystemException,
+ CA_MGM_THROW(ca_mgm::SystemException,
// %1 is the error code of rm
str::form(__("Deleting the CA failed: %1."), r).c_str());
}
@@ -1585,14 +1585,14 @@
type == E_CA_Req || type == E_CRL)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, str::form(__("Wrong type: %1."), type).c_str());
}
bool p = m_impl->config->exists(type2Section(type, false), "policy");
if(!p)
{
LOGIT_ERROR("missing value 'policy' in config file");
- BLOCXX_THROW(ca_mgm::SyntaxException,
+ CA_MGM_THROW(ca_mgm::SyntaxException,
__("The configuration file is missing a value for policy."));
}
std::string policySect = m_impl->config->getValue(type2Section(type, false), "policy");
@@ -1602,7 +1602,7 @@
if(policyKeys.empty())
{
LOGIT_ERROR("Can not parse Section " << policySect);
- BLOCXX_THROW(ca_mgm::SyntaxException,
+ CA_MGM_THROW(ca_mgm::SyntaxException,
str::form(__("Cannot parse section %s."), policySect.c_str()).c_str());
}
StringList::const_iterator it = policyKeys.begin();
@@ -1674,7 +1674,7 @@
}
LOGIT_ERROR("Field '" << *it << "' must have a value");
- BLOCXX_THROW_ERR(ca_mgm::ValueException,
+ CA_MGM_THROW_ERR(ca_mgm::ValueException,
str::form(__("Field %s must have a value."),
(*it).c_str()).c_str(),
errorCode);
@@ -1713,7 +1713,7 @@
errorCode = E_EM_NF;
}
LOGIT_ERROR("The '" << *it << "' field must be defined.");
- BLOCXX_THROW_ERR(ca_mgm::ValueException,
+ CA_MGM_THROW_ERR(ca_mgm::ValueException,
str::form(__("%s must be defined."), (*it).c_str()).c_str(),
errorCode);
}
@@ -1798,7 +1798,7 @@
LOGIT_ERROR("The '"<<*it<<"' field needed to be the same in the CA certificate ("<<
caMatchValue<<") and the request ("<< reqMatchValue <<")");
- BLOCXX_THROW_ERR(ca_mgm::ValueException,
+ CA_MGM_THROW_ERR(ca_mgm::ValueException,
str::form(__("%s must be the same in the CA certificate (%s) and the request (%s)."),
(*it).c_str(), caMatchValue.c_str(), reqMatchValue.c_str()).c_str(),
errorCode);
@@ -1810,7 +1810,7 @@
if(!policyFound)
{
LOGIT_ERROR("Invalid policy in config file ? (" << *it << "/" << policyString << ")");
- BLOCXX_THROW(ca_mgm::SyntaxException,
+ CA_MGM_THROW(ca_mgm::SyntaxException,
__("The configuration file seems to have an invalid policy."));
}
}
@@ -1837,7 +1837,7 @@
else
{
LOGIT_ERROR("config not initialized");
- BLOCXX_THROW(ca_mgm::RuntimeException, __("The configuration is not initialized."));
+ CA_MGM_THROW(ca_mgm::RuntimeException, __("The configuration is not initialized."));
}
}
@@ -1847,14 +1847,14 @@
if(!m_impl->config)
{
LOGIT_ERROR("config not initialized");
- BLOCXX_THROW(ca_mgm::RuntimeException, __("The configuration is not initialized."));
+ CA_MGM_THROW(ca_mgm::RuntimeException, __("The configuration is not initialized."));
}
bool p = m_impl->config->exists("req_ca", "distinguished_name");
if(!p)
{
LOGIT_ERROR("missing section 'distinguished_name' in config file");
- BLOCXX_THROW(ca_mgm::SyntaxException,
+ CA_MGM_THROW(ca_mgm::SyntaxException,
__("Missing section 'distinguished_name' in the configuration file."));
}
std::string dnSect = m_impl->config->getValue("req_ca", "distinguished_name");
@@ -1864,7 +1864,7 @@
if(dnKeys.empty())
{
LOGIT_ERROR("Can not parse Section " << dnSect);
- BLOCXX_THROW(ca_mgm::SyntaxException,
+ CA_MGM_THROW(ca_mgm::SyntaxException,
str::form(__("Cannot parse section %s."), dnSect.c_str()).c_str());
}
StringList::const_iterator it = dnKeys.begin();
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CRLData.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CRLData.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CRLData.cpp Sat Jul 10 18:47:47 2010
@@ -217,7 +217,7 @@
return (*(m_impl->revocationData.find(oid))).second;
}
LOGIT_ERROR("Entry not found: " << oid);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Entry not found."));
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CRLData_Priv.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CRLData_Priv.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CRLData_Priv.cpp Sat Jul 10 18:47:47 2010
@@ -95,14 +95,14 @@
if(!initHexCheck().isValid(serial))
{
LOGIT_ERROR("invalid serial: " << serial);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Invalid serial %s."), serial.c_str()).c_str());
}
std::vector<std::string> r = reason.verify();
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
setSerial( serial );
setRevocationDate( revokeDate );
@@ -132,7 +132,7 @@
if(!initHexCheck().isValid(serial))
{
LOGIT_ERROR("invalid serial: " << serial);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Invalid serial %s."), serial.c_str()).c_str());
}
m_impl->serial = serial;
@@ -150,7 +150,7 @@
if(!reason.valid())
{
LOGIT_ERROR("invalid CRL reason");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid CRL reason."));
}
m_impl->revocationReason = reason;
@@ -214,7 +214,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
m_impl->issuer = issuer;
}
@@ -238,7 +238,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
m_impl->extensions = ext;
}
@@ -250,7 +250,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
m_impl->revocationData = data;
}
@@ -351,7 +351,7 @@
else
{
LOGIT_ERROR("Unsupported signature algorithm: '" << sbuf << "'");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
str::form(__("Unsupported signature algorithm %s."), sbuf.c_str()).c_str());
}
@@ -390,7 +390,7 @@
if(!bio)
{
LOGIT_ERROR("Can not create a memory BIO");
- BLOCXX_THROW(ca_mgm::MemoryException,
+ CA_MGM_THROW(ca_mgm::MemoryException,
__("Cannot create a memory BIO."));
}
@@ -418,7 +418,7 @@
if(m_impl->x509 == NULL)
{
LOGIT_ERROR("Can not parse CRL");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("Cannot parse CRL."));
}
@@ -431,7 +431,7 @@
X509_CRL_free(m_impl->x509);
m_impl->x509 = NULL;
- BLOCXX_THROW_SUBEX(ca_mgm::SyntaxException,
+ CA_MGM_THROW_SUBEX(ca_mgm::SyntaxException,
__("Error parsing the CRL."),
e);
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CRLDistributionPointsExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CRLDistributionPointsExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CRLDistributionPointsExtension.cpp Sat Jul 10 18:47:47 2010
@@ -69,7 +69,7 @@
type == E_Server_Req || type == E_CA_Req )
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
@@ -126,7 +126,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
m_impl->altNameList = dp;
setPresent(true);
@@ -138,7 +138,7 @@
if(!isPresent())
{
LOGIT_ERROR("CRLDistributionPointsExt is not present");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("CRLDistributionPointsExt is not present."));
}
return m_impl->altNameList;
@@ -150,7 +150,7 @@
if(!valid())
{
LOGIT_ERROR("invalid CRLDistributionPointsExt object");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid CRLDistributionPointsExt object."));
}
@@ -159,7 +159,7 @@
type == E_Server_Req || type == E_CA_Req )
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CRLGenerationData.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CRLGenerationData.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CRLGenerationData.cpp Sat Jul 10 18:47:47 2010
@@ -85,7 +85,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
}
@@ -125,7 +125,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
m_impl->extensions = ext;
}
@@ -148,14 +148,14 @@
if(!valid())
{
LOGIT_ERROR("invalid CRLGenerationData object");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid CRLGenerationData object."));
}
// These types are not supported by this object
if(type != E_CRL)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %d."), type).c_str());
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CRLReason.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CRLReason.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CRLReason.cpp Sat Jul 10 18:47:47 2010
@@ -93,7 +93,7 @@
{
if(!checkReason(reason))
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Invalid revoke reason %s."), reason.c_str()).c_str());
}
}
@@ -128,7 +128,7 @@
{
if(!checkReason(reason))
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
// %s is the wrong reason string
str::form(__("Invalid revoke reason %s."), reason.c_str()).c_str());
}
@@ -152,7 +152,7 @@
if(!r.empty())
{
LOGIT_ERROR(r);
- BLOCXX_THROW(ca_mgm::ValueException, r.c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r.c_str());
}
m_impl->holdInstruction = holdInstruction;
@@ -167,7 +167,7 @@
if(0 != str::compareCI(m_impl->reason, "certificateHold"))
{
LOGIT_ERROR("Reason is not certificateHold");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("Reason is not certificateHold."));
}
return m_impl->holdInstruction;
@@ -190,7 +190,7 @@
if(0 != str::compareCI(m_impl->reason, "keyCompromise"))
{
LOGIT_ERROR("Reason is not keyCompromise");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("Reason is not keyCompromise."));
}
return m_impl->compromiseDate;
@@ -204,7 +204,7 @@
if(0 != str::compareCI(m_impl->reason, "keyCompromise"))
{
LOGIT_ERROR("Reason is not keyCompromise");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("Reason is not keyCompromise."));
}
std::string time;
@@ -235,7 +235,7 @@
if(0 != str::compareCI(m_impl->reason, "CACompromise"))
{
LOGIT_ERROR("Reason is not CACompromise");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("Reason is not CACompromise."));
}
return m_impl->compromiseDate;
@@ -249,7 +249,7 @@
if(0 != str::compareCI(m_impl->reason, "CACompromise"))
{
LOGIT_ERROR("Reason is not CACompromise");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("Reason is not CACompromise."));
}
std::string time;
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CertificateData_Priv.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CertificateData_Priv.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CertificateData_Priv.cpp Sat Jul 10 18:47:47 2010
@@ -88,7 +88,7 @@
if(!initHexCheck().isValid(serial))
{
LOGIT_ERROR("invalid serial: " << serial);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
// %1 is an invalid serial number
str::form(__("Invalid serial %s."), serial.c_str()).c_str());
}
@@ -109,7 +109,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
m_impl->issuer = issuer;
}
@@ -121,7 +121,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
m_impl->subject = subject;
}
@@ -163,7 +163,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
m_impl->extensions = ext;
}
@@ -201,7 +201,7 @@
if(!bio)
{
LOGIT_ERROR("Can not create a memory BIO");
- BLOCXX_THROW(ca_mgm::MemoryException,
+ CA_MGM_THROW(ca_mgm::MemoryException,
__("Cannot create a memory BIO."));
}
@@ -230,7 +230,7 @@
if(m_impl->x509 == NULL)
{
LOGIT_ERROR("Can not parse certificate");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("Cannot parse the certificate."));
}
@@ -243,7 +243,7 @@
X509_free(m_impl->x509);
m_impl->x509 = NULL;
- BLOCXX_THROW_SUBEX(ca_mgm::SyntaxException,
+ CA_MGM_THROW_SUBEX(ca_mgm::SyntaxException,
__("Error while parsing the certificate."),
e);
}
@@ -270,7 +270,7 @@
if (BIO_printf(bioS,"%02x",bs->data[i]) <= 0)
{
LOGIT_ERROR("Can not parse serial.");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("Cannot parse serial."));
}
}
@@ -338,7 +338,7 @@
if(pkey == NULL)
{
LOGIT_ERROR("Unable to get public key");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("Unable to get the public key."));
}
@@ -349,7 +349,7 @@
if(!rsa)
{
LOGIT_ERROR("could not get RSA key");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("Could not get RSA key."));
}
@@ -369,7 +369,7 @@
EVP_PKEY_free(pkey);
LOGIT_ERROR("Unsupported public key type");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("Unsupported public key type."));
}
@@ -405,7 +405,7 @@
EVP_PKEY_free(pkey);
LOGIT_ERROR("Unsupported public key algorithm");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("Unsupported public key algorithm."));
}
@@ -436,7 +436,7 @@
EVP_PKEY_free(pkey);
LOGIT_ERROR("Unsupported signature algorithm: '" << sbuf << "'");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
// %s is the unsupported signature algorithm string
str::form(__("Unsupported signature algorithm %s."), sbuf.c_str()).c_str());
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CertificateIssueData.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CertificateIssueData.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CertificateIssueData.cpp Sat Jul 10 18:47:47 2010
@@ -181,7 +181,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
m_impl->extensions = ext;
}
@@ -204,7 +204,7 @@
if(!valid())
{
LOGIT_ERROR("invalid CertificateIssueData object");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid CertificateIssueData object."));
}
// These types are not supported by this object
@@ -212,7 +212,7 @@
type == E_Server_Req || type == E_CA_Req)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %d."), type).c_str());
}
uint32_t t = (uint32_t)((getEndDate() - getStartDate())/(60*60*24));
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CertificatePoliciesExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CertificatePoliciesExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CertificatePoliciesExtension.cpp Sat Jul 10 18:47:47 2010
@@ -160,7 +160,7 @@
type == E_Server_Req || type == E_CA_Req )
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
@@ -207,7 +207,7 @@
if(text.length() > 200)
{
LOGIT_ERROR("The text is too long.");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("The text is too long."));
}
@@ -246,7 +246,7 @@
if(!valid())
{
LOGIT_ERROR("invalid UserNotice object");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid UserNotice object."));
}
@@ -255,7 +255,7 @@
type == E_Server_Req || type == E_CA_Req )
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
@@ -385,7 +385,7 @@
if(!initOIDCheck().isValid(policyIdentifier))
{
LOGIT_ERROR("invalid value for policyIdentifier" << policyIdentifier);
- BLOCXX_THROW(ca_mgm::ValueException ,
+ CA_MGM_THROW(ca_mgm::ValueException ,
// %s is the wrong string for policyIdentifier
str::form(__("Invalid value for policyIdentifier: %s."), policyIdentifier.c_str()).c_str());
}
@@ -416,7 +416,7 @@
type == E_Server_Req || type == E_CA_Req )
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
@@ -450,7 +450,7 @@
if(!initOIDCheck().isValid(policyIdentifier))
{
LOGIT_ERROR("invalid value for policyIdentifier" << policyIdentifier);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Invalid value for policyIdentifier: %s."), policyIdentifier.c_str()).c_str());
}
@@ -470,7 +470,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
m_impl->cpsURI = cpsURI;
}
@@ -488,7 +488,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
m_impl->noticeList = list;
}
@@ -505,7 +505,7 @@
if(!valid())
{
LOGIT_ERROR("invalid CertificatePolicy object");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid CertificatePolicy object."));
}
@@ -514,7 +514,7 @@
type == E_Server_Req || type == E_CA_Req )
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
@@ -690,7 +690,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
setPresent(true);
}
@@ -704,7 +704,7 @@
type == E_Server_Req || type == E_CA_Req )
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
@@ -774,7 +774,7 @@
{
if(!isPresent())
{
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("CertificatePoliciesExt is not present."));
}
return m_impl->ia5org;
@@ -787,7 +787,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
m_impl->policies = policies;
@@ -799,7 +799,7 @@
{
if(!isPresent())
{
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("CertificatePoliciesExt is not present."));
}
return m_impl->policies;
@@ -812,7 +812,7 @@
if(!valid())
{
LOGIT_ERROR("invalid CertificatePoliciesExt object");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid CertificatePoliciesExt object."));
}
@@ -821,7 +821,7 @@
type == E_Server_Req || type == E_CA_Req )
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/DNObject.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/DNObject.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/DNObject.cpp Sat Jul 10 18:47:47 2010
@@ -103,7 +103,7 @@
else
{
LOGIT_ERROR("Invalid type:" << m_impl->type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
// %s is the invalid string for a DN type
str::form(__("Invalid type %s."), m_impl->type.c_str()).c_str());
}
@@ -249,7 +249,7 @@
type == E_CA_Cert || type == E_CRL)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %d."), type).c_str());
}
@@ -257,7 +257,7 @@
if(!p)
{
LOGIT_ERROR("missing section 'distinguished_name' in config file");
- BLOCXX_THROW(ca_mgm::SyntaxException,
+ CA_MGM_THROW(ca_mgm::SyntaxException,
__("Missing section 'distinguished_name' in the configuration file."));
}
std::string dnSect = caConfig->getValue(type2Section(type, false),
@@ -268,7 +268,7 @@
if(dnKeys.empty())
{
LOGIT_ERROR("Can not parse Section " << dnSect);
- BLOCXX_THROW(ca_mgm::SyntaxException,
+ CA_MGM_THROW(ca_mgm::SyntaxException,
str::form(__("Cannot parse section %s."), dnSect.c_str()).c_str());
}
StringList::const_iterator it = dnKeys.begin();
@@ -368,7 +368,7 @@
std::vector<std::string> r = this->verify();
if(!r.empty())
{
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
}
@@ -396,7 +396,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
m_impl->dn = dn;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/DNObject_Priv.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/DNObject_Priv.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/DNObject_Priv.cpp Sat Jul 10 18:47:47 2010
@@ -75,7 +75,7 @@
if(!bio)
{
LOGIT_ERROR("Can not create a memory BIO");
- BLOCXX_THROW(ca_mgm::MemoryException,
+ CA_MGM_THROW(ca_mgm::MemoryException,
__("Cannot create a memory BIO."));
}
@@ -112,7 +112,7 @@
BIO_free(bio);
LOGIT_ERROR("Can not parse DN line: " << lines[j]);
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
str::form("Can not parse DN line: %1", lines[j]).c_str());
}
@@ -153,7 +153,7 @@
BIO_free(bio);
LOGIT_ERROR("Can not parse DN line: " << lines[j]);
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
// %1 is the wrong part of a DN which could not be parsed
str::form(__("Cannot parse DN line: %s."), lines[j].c_str()).c_str());
}
@@ -194,7 +194,7 @@
if(!p)
{
LOGIT_ERROR("missing section 'distinguished_name' in config file");
- BLOCXX_THROW(ca_mgm::SyntaxException,
+ CA_MGM_THROW(ca_mgm::SyntaxException,
__("Missing section 'distinguished_name' in the configuration file."));
}
std::string dnSect = ca.getConfig()->getValue("req_ca", "distinguished_name");
@@ -204,7 +204,7 @@
if(dnKeys.empty())
{
LOGIT_ERROR("Can not parse Section " << dnSect);
- BLOCXX_THROW(ca_mgm::SyntaxException,
+ CA_MGM_THROW(ca_mgm::SyntaxException,
str::form(__("Cannot parse section %s."), dnSect.c_str()).c_str());
}
StringList::const_iterator it = dnKeys.begin();
Modified: limal-branches/mc-devel/limal-ca-mgm/src/Date.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/Date.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/Date.cpp Sat Jul 10 18:47:47 2010
@@ -66,7 +66,7 @@
restoreLocale(thisLocale);
if (res == NULL)
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form( __("Invalid date format: '%s'"), date_str.c_str() ).c_str() );
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/Exception.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/Exception.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/Exception.cpp Sat Jul 10 18:47:47 2010
@@ -1,11 +1,183 @@
#include <limal/Exception.hpp>
+namespace
+{
+char* dupString(const char* str)
+{
+ if (!str)
+ {
+ return 0;
+ }
+ char* rv = new (std::nothrow) char[strlen(str)+1];
+ if (!rv)
+ {
+ return 0;
+ }
+ strcpy(rv, str);
+ return rv;
+}
+static void freeBuf(char** ptr)
+{
+ delete [] *ptr;
+ *ptr = NULL;
+}
+}
+
namespace LIMAL_NAMESPACE
{
- BLOCXX_DEFINE_EXCEPTION(Memory);
- BLOCXX_DEFINE_EXCEPTION(Runtime);
- BLOCXX_DEFINE_EXCEPTION(Overflow);
- BLOCXX_DEFINE_EXCEPTION(Syntax);
- BLOCXX_DEFINE_EXCEPTION(Value);
- BLOCXX_DEFINE_EXCEPTION(System);
+
+Exception::Exception(const char* file, int line, const char* msg, int errorCode, const Exception* subException)
+ : std::exception()
+ , m_file(dupString(file))
+ , m_line(line)
+ , m_msg(dupString(msg))
+ , m_errorCode(errorCode)
+{
+ if( subException != NULL )
+ {
+ try
+ {
+ m_msg = dupString(str::form("%s\n\t%s", m_msg, subException->getFullMessage().c_str()).c_str());
+ }
+ catch (...)
+ {}
+ }
+}
+
+ Exception::Exception( const Exception& e )
+ : std::exception(e)
+ , m_file(dupString(e.m_file))
+ , m_line(e.m_line)
+ , m_msg(dupString(e.m_msg))
+ , m_errorCode(e.m_errorCode)
+{}
+
+Exception::~Exception() throw()
+{
+ try
+ {
+ freeBuf(&m_file);
+ freeBuf(&m_msg);
+ }
+ catch (...)
+ {
+ // don't let exceptions escape
+ }
+}
+
+Exception&
+Exception::operator=(const Exception& rhs)
+{
+ if(this == &rhs) return *this;
+
+ m_file = rhs.m_file;
+ m_line = rhs.m_line;
+ m_msg = rhs.m_msg;
+ m_errorCode = rhs.m_errorCode;
+
+ return *this;
+}
+//////////////////////////////////////////////////////////////////////////////
+const char*
+Exception::type() const
+{
+ return "Exception";
+}
+
+//////////////////////////////////////////////////////////////////////////////
+int
+Exception::getLine() const
+{
+ return m_line;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+const char*
+Exception::getMessage() const
+{
+ return (m_msg != NULL) ? m_msg : "";
+}
+//////////////////////////////////////////////////////////////////////////////
+std::string
+Exception::getFullMessage() const
+{
+ try
+ {
+ return str::form("%s: %s %s: %s%s",
+ (getFile() == '\0')?"[no file]":getFile(),
+ (getLine() == 0)?"[no line]":str::numstring(getLine()).c_str(),
+ type(),
+ (getErrorCode() != 0)?(str::numstring(getErrorCode())+": ").c_str():" ",
+ (getMessage() == '\0')?"[no message]":getMessage()
+ );
+ }
+ catch (...)
+ {}
+ return "";
+}
+//////////////////////////////////////////////////////////////////////////////
+const char*
+Exception::getFile() const
+{
+ return (m_file != NULL) ? m_file : "";
+}
+//////////////////////////////////////////////////////////////////////////////
+std::ostream&
+operator<<(std::ostream& os, const Exception& e)
+{
+ if (*e.getFile() == '\0')
+ {
+ os << "[no file]: ";
+ }
+ else
+ {
+ os << e.getFile() << ": ";
+ }
+
+ if (e.getLine() == 0)
+ {
+ os << "[no line] ";
+ }
+ else
+ {
+ os << e.getLine() << ' ';
+ }
+
+ os << e.type() << ": ";
+
+ if (e.getErrorCode() != 0)
+ {
+ os << e.getErrorCode() << ": ";
+ }
+
+ if (*e.getMessage() == '\0')
+ {
+ os << "[no message]";
+ }
+ else
+ {
+ os << e.getMessage();
+ }
+ return os;
+}
+//////////////////////////////////////////////////////////////////////////////
+const char*
+Exception::what() const throw()
+{
+ return getMessage();
+}
+//////////////////////////////////////////////////////////////////////////////
+int
+Exception::getErrorCode() const
+{
+ return m_errorCode;
+}
+
+
+ CA_MGM_DEFINE_EXCEPTION(Memory);
+ CA_MGM_DEFINE_EXCEPTION(Runtime);
+ CA_MGM_DEFINE_EXCEPTION(Overflow);
+ CA_MGM_DEFINE_EXCEPTION(Syntax);
+ CA_MGM_DEFINE_EXCEPTION(Value);
+ CA_MGM_DEFINE_EXCEPTION(System);
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/ExtendedKeyUsageExt.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/ExtendedKeyUsageExt.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/ExtendedKeyUsageExt.cpp Sat Jul 10 18:47:47 2010
@@ -70,7 +70,7 @@
if(type == E_CRL)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
@@ -115,7 +115,7 @@
else
{
LOGIT_INFO("Unknown ExtendedKeyUsage option: " << (*it));
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Invalid ExtendedKeyUsage option %s."),
(*it).c_str()).c_str());
}
@@ -123,7 +123,7 @@
if(m_impl->usage.empty())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid ExtendedKeyUsageExt."));
}
@@ -164,7 +164,7 @@
else
{
LOGIT_INFO("Unknown ExtendedKeyUsage option: " << (*it));
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Invalid ExtendedKeyUsage option %s."),
(*it).c_str()).c_str());
}
@@ -172,7 +172,7 @@
if(m_impl->usage.empty())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid ExtendedKeyUsageExt."));
}
@@ -185,7 +185,7 @@
{
if(!isPresent())
{
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("ExtendedKeyUsageExt is not present."));
}
return m_impl->usage;
@@ -214,7 +214,7 @@
if(!valid())
{
LOGIT_ERROR("invalid ExtendedKeyUsageExt object");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid ExtendedKeyUsageExt object."));
}
@@ -222,7 +222,7 @@
if(type == E_CRL)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/IssuerAlternativeNameExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/IssuerAlternativeNameExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/IssuerAlternativeNameExtension.cpp Sat Jul 10 18:47:47 2010
@@ -78,7 +78,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
setPresent(true);
}
@@ -91,7 +91,7 @@
if(type == E_Client_Req || type == E_Server_Req || type == E_CA_Req)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
@@ -159,7 +159,7 @@
if(!isPresent())
{
LOGIT_ERROR("IssuerAlternativeNameExt is not present");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("IssuerAlternativeNameExt is not present."));
}
return m_impl->issuerCopy;
@@ -172,7 +172,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
m_impl->altNameList = alternativeNameList;
setPresent(true);
@@ -184,7 +184,7 @@
if(!isPresent())
{
LOGIT_ERROR("IssuerAlternativeNameExt is not present");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("IssuerAlternativeNameExt is not present."));
}
return m_impl->altNameList;
@@ -196,7 +196,7 @@
if(!altName.valid())
{
LOGIT_ERROR("invalid literal value for IssuerAlternativeNameExt");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid literal value for IssuerAlternativeNameExt."));
}
m_impl->altNameList.push_back(altName);
@@ -209,7 +209,7 @@
if(!valid())
{
LOGIT_ERROR("invalid IssuerAlternativeNameExt object");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid IssuerAlternativeNameExt object."));
}
@@ -217,7 +217,7 @@
if(type == E_Client_Req || type == E_Server_Req || type == E_CA_Req)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %d."), type).c_str());
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/LDAPUrlImpl.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/LDAPUrlImpl.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/LDAPUrlImpl.cpp Sat Jul 10 18:47:47 2010
@@ -100,7 +100,7 @@
}
else
{
- BLOCXX_THROW(ca_mgm::url::UrlNotSupportedException,
+ CA_MGM_THROW(ca_mgm::url::UrlNotSupportedException,
str::form(__("Unable to parse LDAP URL query string '%s'."),
getQueryString().c_str()).c_str()
);
@@ -141,7 +141,7 @@
}
if( !found)
{
- BLOCXX_THROW(UrlNotSupportedException,
+ CA_MGM_THROW(UrlNotSupportedException,
str::form(__("Invalid LDAP URL query parameter '%s'."),
p->first.c_str()).c_str()
);
Modified: limal-branches/mc-devel/limal-ca-mgm/src/LiteralValues.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/LiteralValues.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/LiteralValues.cpp Sat Jul 10 18:47:47 2010
@@ -77,7 +77,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
}
@@ -124,7 +124,7 @@
else
{
LOGIT_DEBUG("unknown type: "<< sp[1] << " = " << sp[2]);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Unknown type."));
}
}
@@ -164,7 +164,7 @@
m_impl->literalValue = dValue;
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
}
@@ -181,7 +181,7 @@
m_impl->literalValue = dValue;
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/LiteralValues_Priv.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/LiteralValues_Priv.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/LiteralValues_Priv.cpp Sat Jul 10 18:47:47 2010
@@ -150,7 +150,7 @@
else
{
LOGIT_ERROR("Invalid IP Address");
- BLOCXX_THROW(ca_mgm::SyntaxException, "Invalid IP Address");
+ CA_MGM_THROW(ca_mgm::SyntaxException, "Invalid IP Address");
break;
}
setLiteral("IP", oline);
Modified: limal-branches/mc-devel/limal-ca-mgm/src/LocalManagement.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/LocalManagement.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/LocalManagement.cpp Sat Jul 10 18:47:47 2010
@@ -88,7 +88,7 @@
if(dataList.size() <= 1) {
LOGIT_ERROR("Cannot split certificate output");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("Cannot split certificate output."));
}
@@ -285,7 +285,7 @@
if(r != 0) {
LOGIT_ERROR("Cannot create directory '" << pi.toString() << "' :" << errno2String(r));
- BLOCXX_THROW(ca_mgm::SystemException,
+ CA_MGM_THROW(ca_mgm::SystemException,
str::form(__("Cannot create directory %s: %s."),
pi.toString().c_str(), errno2String(r).c_str()).c_str());
@@ -306,7 +306,7 @@
if(r != 0) {
LOGIT_ERROR("Cannot create directory '" << pi.toString() << "' :" << errno2String(r));
- BLOCXX_THROW(ca_mgm::SystemException,
+ CA_MGM_THROW(ca_mgm::SystemException,
str::form(__("Cannot create directory %s: %s."),
pi.toString().c_str(), errno2String(r).c_str()).c_str());
@@ -325,7 +325,7 @@
if(r != 0) {
LOGIT_ERROR("Cannot create directory '" << pi.toString() << "' :" << errno2String(r));
- BLOCXX_THROW(ca_mgm::SystemException,
+ CA_MGM_THROW(ca_mgm::SystemException,
str::form(__("Cannot create directory %s: %s."),
pi.toString().c_str(), errno2String(r).c_str()).c_str());
@@ -339,7 +339,7 @@
if(!pi.isDir()) {
LOGIT_ERROR( "'" << pi.toString() <<"' is not a directory");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("%s is not a directory."), pi.toString().c_str()).c_str());
}
@@ -360,7 +360,7 @@
} else {
LOGIT_ERROR("Invalid certificate file.");
- BLOCXX_THROW(ca_mgm::SyntaxException,
+ CA_MGM_THROW(ca_mgm::SyntaxException,
__("Invalid certificate file."));
}
}
@@ -438,7 +438,7 @@
if(!filePi.exists()) {
LOGIT_ERROR("File not found: " << filePi.toString());
- BLOCXX_THROW_ERR(ca_mgm::RuntimeException,
+ CA_MGM_THROW_ERR(ca_mgm::RuntimeException,
str::form(__("File not found: %s."), filePi.toString().c_str()).c_str(),
E_FILE_NOT_FOUND);
@@ -447,7 +447,7 @@
if(filePi.size() > (1024*1024)) {
LOGIT_ERROR("File too big: " << filePi.toString());
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
str::form(__("File too big: %s."), filePi.toString().c_str()).c_str());
}
@@ -456,7 +456,7 @@
if(fd == -1) {
LOGIT_ERROR("Cannot open file: " << file << "(" << errno << ")");
- BLOCXX_THROW_ERRNO_MSG1(ca_mgm::SystemException,
+ CA_MGM_THROW_ERRNO_MSG1(ca_mgm::SystemException,
str::form(__("Cannot open file %s."), file.c_str()).c_str(),
errno);
@@ -476,7 +476,7 @@
fileObject.close();
LOGIT_ERROR("Cannot read from file: " << file << "(" << errno << ")");
- BLOCXX_THROW_ERRNO_MSG1(ca_mgm::SystemException,
+ CA_MGM_THROW_ERRNO_MSG1(ca_mgm::SystemException,
str::form(__("Cannot read from file %s."), file.c_str()).c_str(),
errno);
}
@@ -501,7 +501,7 @@
if(pi.exists() && !overwrite) {
LOGIT_ERROR ("File already exists: " << file );
- BLOCXX_THROW_ERR(ca_mgm::SystemException,
+ CA_MGM_THROW_ERR(ca_mgm::SystemException,
str::form(__("File already exists: %s."), file.c_str()).c_str(),
E_FILE_EXISTS);
@@ -511,7 +511,7 @@
if(fd == -1) {
LOGIT_ERROR("Cannot open file: " << file << "(" << errno << ")");
- BLOCXX_THROW_ERRNO_MSG1(ca_mgm::SystemException,
+ CA_MGM_THROW_ERRNO_MSG1(ca_mgm::SystemException,
str::form(__("Cannot open file %s."), file.c_str()).c_str(),
errno);
@@ -523,7 +523,7 @@
if(r != 0) {
LOGIT_ERROR("Cannot get lock on file: " << file << "(" << errno << ")");
- BLOCXX_THROW_ERRNO_MSG1(ca_mgm::SystemException,
+ CA_MGM_THROW_ERRNO_MSG1(ca_mgm::SystemException,
str::form(__("Cannot get lock on file %s."), file.c_str()).c_str(),
errno);
@@ -537,7 +537,7 @@
fileObject.close();
LOGIT_ERROR("Cannot write to file: " << file << "(" << errno << ")");
- BLOCXX_THROW_ERRNO_MSG1(ca_mgm::SystemException,
+ CA_MGM_THROW_ERRNO_MSG1(ca_mgm::SystemException,
str::form(__("Cannot write to file %s."), file.c_str()).c_str(),
errno);
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/Logger.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/Logger.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/Logger.cpp Sat Jul 10 18:47:47 2010
@@ -312,19 +312,19 @@
if( maxLogFileSize >= (UInt64(-1) / UInt64(1024)))
{
- BLOCXX_THROW(ca_mgm::OverflowException,
+ CA_MGM_THROW(ca_mgm::OverflowException,
__("The specified maximum log file size is too big.")
);
}
if( filename.empty())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("The log file path should be set.")
);
}
if( !filename.startsWith(BLOCXX_FILENAME_SEPARATOR))
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("The specified log file name '%s' "
"is not absolute"),
filename.c_str()).c_str()
Modified: limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.cpp Sat Jul 10 18:47:47 2010
@@ -50,7 +50,7 @@
if(!pi.exists() || !pi.isFile())
{
LOGIT_ERROR("File does not exist: " << configFile);
- BLOCXX_THROW_ERR(ca_mgm::ValueException,
+ CA_MGM_THROW_ERR(ca_mgm::ValueException,
str::form(__("File does not exist: %s."), configFile.c_str()).c_str(),
E_FILE_NOT_FOUND);
}
@@ -59,7 +59,7 @@
if(!pi.exists() || !pi.isDir())
{
LOGIT_ERROR("Directory does not exist: " << tmpDir);
- BLOCXX_THROW_ERR(ca_mgm::ValueException,
+ CA_MGM_THROW_ERR(ca_mgm::ValueException,
str::form(__("Directory does not exist: %s."), tmpDir.c_str()).c_str(),
E_FILE_NOT_FOUND);
}
@@ -68,7 +68,7 @@
if(!pi.exists() || !pi.isFile() || !pi.isX())
{
LOGIT_ERROR("Invalid command: " << command);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Invalid command %s."), command.c_str()).c_str());
}
@@ -123,10 +123,10 @@
status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput,
errOutput, env);
}
- catch(blocxx::Exception& e)
+ catch(Exception& e)
{
LOGIT_ERROR( "openssl exception:" << e);
- BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException,
+ CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException,
__("Executing openssl command failed."), e);
}
if(status != 0)
@@ -138,7 +138,7 @@
std::vector<std::string> sa;
str::split(errOutput, std::back_inserter(sa), "\n\r");
std::string msg = (sa.empty()? "" : sa[0]);
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
str::form(__("openssl command failed: %s"), msg.c_str()).c_str());
}
@@ -171,7 +171,7 @@
if(!pi.exists() || !pi.isFile())
{
LOGIT_ERROR("No valid keyfile specified");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("No valid key file specified."));
}
@@ -232,10 +232,10 @@
errOutput, env,
-1, -1, stdInput);
}
- catch(blocxx::Exception& e)
+ catch(Exception& e)
{
LOGIT_ERROR( "openssl exception:" << e);
- BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException,
+ CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException,
__("Executing openssl command failed."), e);
}
if(status != 0)
@@ -248,7 +248,7 @@
str::split(errOutput, std::back_inserter(sa), "\n\r");
std::string msg = (sa.empty()? "" : sa[0]);
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
str::form(__("openssl command failed: %s"), msg.c_str()).c_str());
}
@@ -275,7 +275,7 @@
if(!pi.exists() || !pi.isFile())
{
LOGIT_ERROR("No valid keyfile specified");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("No valid key file specified."));
}
@@ -283,7 +283,7 @@
if(!pi.exists() || !pi.isFile())
{
LOGIT_ERROR("No valid request file specified");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("No valid request file specified."));
}
@@ -332,10 +332,10 @@
status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput,
errOutput, env);
}
- catch(blocxx::Exception& e)
+ catch(Exception& e)
{
LOGIT_ERROR( "openssl exception:" << e);
- BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException,
+ CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException,
__("Executing openssl command failed."), e);
}
if(status != 0)
@@ -348,7 +348,7 @@
str::split(errOutput, std::back_inserter(sa), "\n\r");
std::string msg = (sa.empty()? "" : sa[0]);
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
str::form(__("openssl command failed: %s"), msg.c_str()).c_str());
}
@@ -380,7 +380,7 @@
if(!pi.exists() || !pi.isFile())
{
LOGIT_ERROR("No valid keyfile specified");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("No valid key file specified."));
}
@@ -388,7 +388,7 @@
if(!pi.exists() || !pi.isFile())
{
LOGIT_ERROR("No valid request file specified");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("No valid request file specified."));
}
@@ -458,10 +458,10 @@
status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput,
errOutput, env);
}
- catch(blocxx::Exception& e)
+ catch(Exception& e)
{
LOGIT_ERROR( "openssl exception:" << e);
- BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException,
+ CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException,
__("Executing openssl command failed."), e);
}
if(status != 0)
@@ -474,7 +474,7 @@
str::split(errOutput, std::back_inserter(sa), "\n\r");
std::string msg = (sa.empty()? "" : sa[0]);
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
str::form(__("openssl command failed: %s"), msg.c_str()).c_str());
}
@@ -500,7 +500,7 @@
if(!pi.exists() || !pi.isFile())
{
LOGIT_ERROR("No valid keyfile specified");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("No valid key file specified."));
}
@@ -508,7 +508,7 @@
if(!pi.exists() || !pi.isFile())
{
LOGIT_ERROR("No valid CA certificate file specified");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("No valid CA certificate file specified."));
}
@@ -516,7 +516,7 @@
if(!pi.exists() || !pi.isFile())
{
LOGIT_ERROR("No valid certificate file specified");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("No valid certificate file specified."));
}
@@ -598,10 +598,10 @@
status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput,
errOutput, env);
}
- catch(blocxx::Exception& e)
+ catch(Exception& e)
{
LOGIT_ERROR( "openssl exception:" << e);
- BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException,
+ CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException,
__("Executing openssl command failed."), e);
}
if(status != 0)
@@ -614,7 +614,7 @@
str::split(errOutput, std::back_inserter(sa), "\n\r");
std::string msg = (sa.empty()? "" : sa[0]);
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
str::form(__("openssl command failed: %s"), msg.c_str()).c_str());
}
@@ -641,7 +641,7 @@
if(!pi.exists() || !pi.isFile())
{
LOGIT_ERROR("No valid keyfile specified");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("No valid key file specified."));
}
@@ -649,7 +649,7 @@
if(!pi.exists() || !pi.isFile())
{
LOGIT_ERROR("No valid CA certificate file specified");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("No valid CA certificate file specified."));
}
@@ -700,10 +700,10 @@
status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput,
errOutput, env);
}
- catch(blocxx::Exception& e)
+ catch(Exception& e)
{
LOGIT_ERROR( "openssl exception:" << e);
- BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException,
+ CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException,
__("Executing openssl command failed."), e);
}
if(status != 0)
@@ -716,7 +716,7 @@
str::split(errOutput, std::back_inserter(sa), "\n\r");
std::string msg = (sa.empty()? "" : sa[0]);
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
str::form(__("openssl command failed: %s"), msg.c_str()).c_str());
}
@@ -739,7 +739,7 @@
if(!pi.exists() || !pi.isFile())
{
LOGIT_ERROR("No valid keyfile specified");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("No valid key file specified."));
}
@@ -747,7 +747,7 @@
if(!pi.exists() || !pi.isFile())
{
LOGIT_ERROR("No valid CA certificate file specified");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("No valid CA certificate file specified."));
}
@@ -784,10 +784,10 @@
status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput,
errOutput, env);
}
- catch(blocxx::Exception& e)
+ catch(Exception& e)
{
LOGIT_ERROR( "openssl exception:" << e);
- BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException,
+ CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException,
__("Executing openssl command failed."), e);
}
@@ -803,7 +803,7 @@
str::split(errOutput, std::back_inserter(sa), "\n\r");
std::string msg = (sa.empty()? "" : sa[0]);
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
str::form(__("openssl command failed: %s"), msg.c_str()).c_str());
}
@@ -827,7 +827,7 @@
if(!pi.exists() || !pi.isFile())
{
LOGIT_ERROR("No valid certificate file specified");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("No valid certificate file specified."));
}
@@ -835,7 +835,7 @@
if(!pi.exists() || !pi.isDir())
{
LOGIT_ERROR("No valid CA directory specified");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("No valid CA directory specified."));
}
@@ -875,10 +875,10 @@
status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput,
errOutput, env);
}
- catch(blocxx::Exception& e)
+ catch(Exception& e)
{
LOGIT_ERROR( "openssl exception:" << e);
- BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException,
+ CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException,
__("Executing openssl command failed."), e);
}
@@ -956,10 +956,10 @@
status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput,
errOutput, env);
}
- catch(blocxx::Exception& e)
+ catch(Exception& e)
{
LOGIT_ERROR( "openssl exception:" << e);
- BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException,
+ CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException,
__("Executing openssl command failed."), e);
}
@@ -989,7 +989,7 @@
{
LOGIT_ERROR("openssl stderr:" << errOutput);
}
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
str::form(__("Showing certificate status with serial %s failed (%d)."),
serial.c_str(), status).c_str());
}
@@ -1014,7 +1014,7 @@
if(sa.size() != 2)
{
LOGIT_ERROR("Can not parse certificate name");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("Cannot parse the certificate name."));
}
@@ -1025,7 +1025,7 @@
if(!pi.exists() || !pi.isFile())
{
LOGIT_ERROR("Keyfile does not exist");
- BLOCXX_THROW(ca_mgm::SystemException,
+ CA_MGM_THROW(ca_mgm::SystemException,
__("The key file does not exist."));
}
@@ -1055,10 +1055,10 @@
status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput,
errOutput, env);
}
- catch(blocxx::Exception& e)
+ catch(Exception& e)
{
LOGIT_ERROR( "openssl exception:" << e);
- BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException,
+ CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException,
__("Executing openssl command failed."), e);
}
if(status == 0)
@@ -1140,13 +1140,13 @@
status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput,
errOutput, env);
}
- catch(blocxx::Exception& e)
+ catch(Exception& e)
{
LOGIT_ERROR( "openssl exception:" << e);
path::removeFile(inFileName);
path::removeFile(outFileName);
path::removeFile(randfile);
- BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException,
+ CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException,
__("Executing openssl command failed."), e);
}
if(status != 0)
@@ -1174,7 +1174,7 @@
str::split(errOutput, std::back_inserter(sa), "\n\r");
std::string msg = (sa.empty()? "" : sa[0]);
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
str::form(__("openssl command failed: %s"), msg.c_str()).c_str());
}
@@ -1280,13 +1280,13 @@
status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput,
errOutput, env);
}
- catch(blocxx::Exception& e)
+ catch(Exception& e)
{
LOGIT_ERROR( "openssl exception:" << e);
path::removeFile(inFileName);
path::removeFile(outFileName);
path::removeFile(randfile);
- BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException,
+ CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException,
__("Executing openssl command failed."), e);
}
if(status != 0)
@@ -1324,12 +1324,12 @@
std::string msg = (sa.empty()? "" : sa[0]);
if(PerlRegEx("unable to load Private Key", PCRE_CASELESS).match(msg))
{
- BLOCXX_THROW_ERR(ca_mgm::ValueException,
+ CA_MGM_THROW_ERR(ca_mgm::ValueException,
__("Invalid password."), E_INVALID_PASSWD);
}
else
{
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
str::form(__("openssl command failed: %s"),msg.c_str()).c_str());
}
}
@@ -1405,13 +1405,13 @@
status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput,
errOutput, env);
}
- catch(blocxx::Exception& e)
+ catch(Exception& e)
{
LOGIT_ERROR( "openssl exception:" << e);
path::removeFile(inFileName);
path::removeFile(outFileName);
path::removeFile(randfile);
- BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException,
+ CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException,
__("Executing openssl command failed."), e);
}
if(status != 0)
@@ -1439,7 +1439,7 @@
str::split(errOutput, std::back_inserter(sa), "\n\r");
std::string msg = (sa.empty()? "" : sa[0]);
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
str::form(__("openssl command failed: %s"), msg.c_str()).c_str());
}
@@ -1514,13 +1514,13 @@
status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput,
errOutput, env);
}
- catch(blocxx::Exception& e)
+ catch(Exception& e)
{
LOGIT_ERROR( "openssl exception:" << e);
path::removeFile(inFileName);
path::removeFile(outFileName);
path::removeFile(randfile);
- BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException,
+ CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException,
__("Executing openssl command failed."), e);
}
if(status != 0)
@@ -1548,7 +1548,7 @@
str::split(errOutput, std::back_inserter(sa), "\n\r");
std::string msg = (sa.empty()? "" : sa[0]);
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
str::form(__("openssl command failed: %s"), msg.c_str()).c_str());
}
@@ -1626,7 +1626,7 @@
else
{
LOGIT_ERROR("Out password is required");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("The password for encrypting the output is required."));
}
@@ -1667,7 +1667,7 @@
status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput,
errOutput, env);
}
- catch(blocxx::Exception& e)
+ catch(Exception& e)
{
LOGIT_ERROR( "openssl exception:" << e);
path::removeFile(inFileName1);
@@ -1678,7 +1678,7 @@
}
path::removeFile(outFileName);
path::removeFile(randfile);
- BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException,
+ CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException,
__("Executing openssl command failed."), e);
}
if(status != 0)
@@ -1713,12 +1713,12 @@
std::string msg = (sa.empty()? "" : sa[0]);
if(PerlRegEx("unable to load Private Key", PCRE_CASELESS).match(msg))
{
- BLOCXX_THROW_ERR(ca_mgm::ValueException,
+ CA_MGM_THROW_ERR(ca_mgm::ValueException,
__("Invalid password."), E_INVALID_PASSWD);
}
else
{
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
str::form(__("openssl command failed: %s"), msg.c_str()).c_str());
}
}
@@ -1773,7 +1773,7 @@
else
{
LOGIT_ERROR("PKCS12 password is required");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("The PKCS12 password is required."));
}
@@ -1816,13 +1816,13 @@
status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput,
errOutput, env);
}
- catch(blocxx::Exception& e)
+ catch(Exception& e)
{
LOGIT_ERROR( "openssl exception:" << e);
path::removeFile(inFileName);
path::removeFile(outFileName);
path::removeFile(randfile);
- BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException,
+ CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException,
__("Executing openssl command failed."), e);
}
if(status != 0)
@@ -1860,12 +1860,12 @@
std::string msg = (sa.empty()? "" : sa[0]);
if(PerlRegEx("invalid password", PCRE_CASELESS).match(msg))
{
- BLOCXX_THROW_ERR(ca_mgm::ValueException,
+ CA_MGM_THROW_ERR(ca_mgm::ValueException,
__("Invalid password."), E_INVALID_PASSWD);
}
else
{
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
str::form(__("openssl command failed: %s"), msg.c_str()).c_str());
}
}
@@ -1891,7 +1891,7 @@
{
LOGIT_ERROR("Cannot read directory: " << repository <<
"(" << System::errorMsg(r) << ") [" << r << "]");
- BLOCXX_THROW(ca_mgm::SystemException,
+ CA_MGM_THROW(ca_mgm::SystemException,
str::form(__("Cannot read directory: %s (%s) [%d]."),
repository.c_str(), ::strerror(r), r).c_str());
}
@@ -1941,7 +1941,7 @@
else
{
LOGIT_ERROR("No serial number found in " << serialFile);
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
str::form(__("No serial number found in %s."),
serialFile.c_str()).c_str());
}
@@ -1961,7 +1961,7 @@
if( (*it)[0] == md5 )
{
LOGIT_ERROR("Request already exist.");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("The request already exists."));
}
}
@@ -2091,7 +2091,7 @@
{
LOGIT_ERROR("Cannot read directory: " << reqDir <<
"(" << System::errorMsg(r) << ") [" << r << "]");
- BLOCXX_THROW(ca_mgm::SystemException,
+ CA_MGM_THROW(ca_mgm::SystemException,
str::form(__("Cannot read directory: %s (%s) [%d]."),
reqDir.c_str(), ::strerror(r), r).c_str());
}
@@ -2152,7 +2152,7 @@
if(subject.empty())
{
LOGIT_ERROR("Can not find request subject.");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("Cannot find the request subject."));
}
@@ -2243,7 +2243,7 @@
{
LOGIT_ERROR("Cannot read directory: " << certDir <<
"(" << System::errorMsg(r) << ") [" << r << "]");
- BLOCXX_THROW(ca_mgm::SystemException,
+ CA_MGM_THROW(ca_mgm::SystemException,
str::form(__("Cannot read directory: %s (%s) [%d]."),
certDir.c_str(), ::strerror(r), r).c_str());
}
@@ -2313,7 +2313,7 @@
if(subject.empty())
{
LOGIT_ERROR("Can not find certificate subject.");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("Cannot find the certificate subject."));
}
@@ -2412,7 +2412,7 @@
if(caName.empty() || !PerlRegEx("\\w+").match(caName))
{
LOGIT_ERROR("Invalid caName: " << caName);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Invalid caName: %s."), caName.c_str()).c_str());
}
@@ -2421,7 +2421,7 @@
if(!pi.exists() || !pi.isDir())
{
LOGIT_ERROR(repository << " does not exist");
- BLOCXX_THROW_ERR(ca_mgm::SystemException,
+ CA_MGM_THROW_ERR(ca_mgm::SystemException,
str::form(__("'%s' does not exist."), repository.c_str()).c_str(),
E_FILE_NOT_FOUND);
}
@@ -2431,7 +2431,7 @@
if(pi.exists())
{
LOGIT_ERROR(pi.toString() << " still exist");
- BLOCXX_THROW_ERR(ca_mgm::SystemException,
+ CA_MGM_THROW_ERR(ca_mgm::SystemException,
str::form(__("%s still exists."), pi.toString().c_str()).c_str(),
E_FILE_EXISTS);
}
@@ -2442,9 +2442,9 @@
{
LOGIT_ERROR(str::form("Can not create directory: %s (%s [%d])",
pi.toString().c_str(), ::strerror(r), r));
- BLOCXX_THROW(ca_mgm::SystemException,
+ CA_MGM_THROW(ca_mgm::SystemException,
str::form(__("Cannot create directory: %s (%s [%d])."),
- pi.toString().c_str(), ::strerror(r), r).c_str());
+ pi.toString().c_str(), ::strerror(r), r).c_str());
}
ByteBuffer tmpl;
@@ -2473,11 +2473,11 @@
LocalManagement::writeFile(ByteBuffer(newConf.c_str(), newConf.length()),
pi.toString() + "/openssl.cnf.tmpl");
}
- catch(blocxx::Exception &e)
+ catch(Exception &e)
{
path::removeDirRecursive(repository + "/" + caName);
- BLOCXX_THROW_SUBEX(ca_mgm::SystemException,
+ CA_MGM_THROW_SUBEX(ca_mgm::SystemException,
__("Cannot copy the configuration template."), e);
}
@@ -2490,7 +2490,7 @@
LOGIT_ERROR(str::form("Can not create directory: %s (%s [%d])",
dir.c_str(), ::strerror(r), r));
- BLOCXX_THROW(ca_mgm::SystemException,
+ CA_MGM_THROW(ca_mgm::SystemException,
str::form(__("Cannot create directory: %s (%s [%d])."),
dir.c_str(), ::strerror(r), r).c_str());
}
@@ -2504,7 +2504,7 @@
LOGIT_ERROR(str::form("Can not create directory: %s (%s [%d])",
dir.c_str(), ::strerror(r), r));
- BLOCXX_THROW(ca_mgm::SystemException,
+ CA_MGM_THROW(ca_mgm::SystemException,
str::form(__("Cannot create directory: %s (%s [%d])."),
dir.c_str(), ::strerror(r), r).c_str());
}
@@ -2518,7 +2518,7 @@
LOGIT_ERROR(str::form("Can not create directory: %s (%s [%d])",
dir.c_str(), ::strerror(r), r));
- BLOCXX_THROW(ca_mgm::SystemException,
+ CA_MGM_THROW(ca_mgm::SystemException,
str::form(__("Cannot create directory: %s (%s [%d])."),
dir.c_str(), ::strerror(r), r).c_str());
}
@@ -2532,7 +2532,7 @@
LOGIT_ERROR(str::form("Can not create directory: %s (%s [%d])",
dir.c_str(), ::strerror(r), r));
- BLOCXX_THROW(ca_mgm::SystemException,
+ CA_MGM_THROW(ca_mgm::SystemException,
str::form(__("Cannot create directory: %s (%s [%d])."),
dir.c_str(), ::strerror(r), r).c_str());
}
@@ -2546,7 +2546,7 @@
LOGIT_ERROR(str::form("Can not create directory: %s (%s [%d])",
dir.c_str(), ::strerror(r), r));
- BLOCXX_THROW(ca_mgm::SystemException,
+ CA_MGM_THROW(ca_mgm::SystemException,
str::form(__("Cannot create directory: %s (%s [%d])."),
dir.c_str(), ::strerror(r), r).c_str());
}
@@ -2560,11 +2560,11 @@
LocalManagement::writeFile(ByteBuffer(),
pi.toString() + "/cam.txt");
}
- catch(blocxx::Exception &e)
+ catch(Exception &e)
{
path::removeDirRecursive(repository + "/" + caName);
- BLOCXX_THROW_SUBEX(ca_mgm::SystemException,
+ CA_MGM_THROW_SUBEX(ca_mgm::SystemException,
__("Cannot create the file."), e);
}
}
@@ -2598,11 +2598,11 @@
errOutput, env,
-1, -1, in);
}
- catch(blocxx::Exception& e)
+ catch(Exception& e)
{
LOGIT_ERROR( "openssl exception:" << e);
path::removeFile(randfile);
- BLOCXX_THROW_SUBEX(ca_mgm::RuntimeException,
+ CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException,
__("Executing openssl command failed."), e);
}
if(status != 0)
@@ -2624,7 +2624,7 @@
if(foundError)
{
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
str::form(__("openssl command failed: %s"), errOutput.c_str()).c_str());
}
return stdOutput;
Modified: limal-branches/mc-devel/limal-ca-mgm/src/PathName.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/PathName.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/PathName.cpp Sat Jul 10 18:47:47 2010
@@ -188,7 +188,7 @@
if( name.find_first_of('/') != std::string::npos ||
name.find_first_of('\\') != std::string::npos)
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("The specified filename component '%s' "
"contains a filename separator"),
name.c_str()).c_str()
@@ -350,7 +350,7 @@
{
if( prefix != 2)
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid drive letter prefix in the specified path list."));
}
drive = *item;
@@ -358,7 +358,7 @@
else
if( !item->empty() )
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("The first pathname list component has to be "
"empty or contain a drive letter prefix")
);
@@ -372,7 +372,7 @@
}
catch(const ca_mgm::ValueException &e)
{
- BLOCXX_THROW_SUBEX(ca_mgm::ValueException,
+ CA_MGM_THROW_SUBEX(ca_mgm::ValueException,
__("The path list contains an element with a filename separator."),
e);
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/PathUtils.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/PathUtils.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/PathUtils.cpp Sat Jul 10 18:47:47 2010
@@ -34,15 +34,12 @@
inline static std::string mode2String(mode_t o) {
std::string s;
- //s.format("%#4o", o);
s = str::form("0%03o", o);
return s;
}
inline static std::string errno2String(int e) {
- char buf[blocxx::ExceptionDetail::BUFSZ];
- blocxx::ExceptionDetail::portable_strerror_r(e, buf, sizeof(buf));
- std::string s(buf);
+ std::string s(::strerror(e));
s += "(" + str::numstring(e) + ")";
return s;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/PerlRegEx.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/PerlRegEx.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/PerlRegEx.cpp Sat Jul 10 18:47:47 2010
@@ -205,7 +205,7 @@
{
if( !compile(regex, cflags))
{
- BLOCXX_THROW_ERR(ca_mgm::ValueException,
+ CA_MGM_THROW_ERR(ca_mgm::ValueException,
errorString().c_str(), m_ecode);
}
}
@@ -220,7 +220,7 @@
{
if( ref.m_pcre != NULL && !compile(ref.m_rxstr, ref.m_flags))
{
- BLOCXX_THROW_ERR(ca_mgm::ValueException,
+ CA_MGM_THROW_ERR(ca_mgm::ValueException,
errorString().c_str(), m_ecode);
}
}
@@ -254,7 +254,7 @@
}
else if( !compile(ref.m_rxstr, ref.m_flags))
{
- BLOCXX_THROW_ERR(ca_mgm::ValueException,
+ CA_MGM_THROW_ERR(ca_mgm::ValueException,
errorString().c_str(), m_ecode);
}
return *this;
@@ -340,18 +340,18 @@
{
if( m_pcre == NULL)
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
"Regular expression is not compiled");
}
if( count >= size_t(INT_MAX / 3))
{
- BLOCXX_THROW(ca_mgm::SystemException,
+ CA_MGM_THROW(ca_mgm::SystemException,
"Match count limit exceeded");
}
if( index > str.length())
{
- BLOCXX_THROW(ca_mgm::OverflowException,
+ CA_MGM_THROW(ca_mgm::OverflowException,
str::form("String index out of bounds ("
"length = %d, index = %d).",
str.length(), index
@@ -410,18 +410,18 @@
{
if( m_pcre == NULL)
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
"Regular expression is not compiled");
}
if( count >= size_t(INT_MAX / 3))
{
- BLOCXX_THROW(ca_mgm::SystemException,
+ CA_MGM_THROW(ca_mgm::SystemException,
"Match count limit exceeded");
}
if( index > str.length())
{
- BLOCXX_THROW(ca_mgm::OverflowException,
+ CA_MGM_THROW(ca_mgm::OverflowException,
str::form("String index out of bounds ("
"length = %d, index = %d)",
str.length(), index
@@ -478,7 +478,7 @@
{
if( m_pcre == NULL)
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
"Regular expression is not compiled");
}
@@ -490,7 +490,7 @@
{
if( rsub.empty())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
"Non-capturing regular expression");
}
@@ -510,7 +510,7 @@
}
else if(m_ecode != PCRE_ERROR_NOMATCH)
{
- BLOCXX_THROW_ERR(ca_mgm::RuntimeException,
+ CA_MGM_THROW_ERR(ca_mgm::RuntimeException,
errorString().c_str(), m_ecode);
}
return ssub;
@@ -524,7 +524,7 @@
{
if( m_pcre == NULL)
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
"Regular expression is not compiled");
}
@@ -543,7 +543,7 @@
rsub[0].rm_eo < 0)
{
// only if empty (missused as guard).
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
"Non-capturing regular expression");
}
@@ -561,7 +561,7 @@
}
else
{
- BLOCXX_THROW_ERR(ca_mgm::RuntimeException,
+ CA_MGM_THROW_ERR(ca_mgm::RuntimeException,
errorString().c_str(), m_ecode);
}
} while(global && match && out.length() > off);
@@ -576,7 +576,7 @@
{
if( m_pcre == NULL)
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
"Regular expression is not compiled");
}
@@ -595,7 +595,7 @@
rsub[0].rm_so < 0 ||
rsub[0].rm_eo < 0)
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
"Non-capturing regular expression");
}
@@ -618,7 +618,7 @@
}
else
{
- BLOCXX_THROW_ERR(ca_mgm::RuntimeException,
+ CA_MGM_THROW_ERR(ca_mgm::RuntimeException,
errorString().c_str(), m_ecode);
}
} while(match && len > off);
@@ -633,7 +633,7 @@
{
if( m_pcre == NULL)
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
"Regular expression is not compiled");
}
@@ -656,7 +656,7 @@
{
m_ecode = ret;
m_error = getError(m_ecode);
- BLOCXX_THROW_ERR(ca_mgm::RuntimeException,
+ CA_MGM_THROW_ERR(ca_mgm::RuntimeException,
errorString().c_str(), m_ecode);
}
}
@@ -671,13 +671,13 @@
{
if( m_pcre == NULL)
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
"Regular expression is not compiled");
}
if( index > str.length())
{
- BLOCXX_THROW(ca_mgm::OverflowException,
+ CA_MGM_THROW(ca_mgm::OverflowException,
str::form("String index out of bounds."
"length = %d, index = %d",
str.length(), index
@@ -699,7 +699,7 @@
else
{
m_error = getError(m_ecode);
- BLOCXX_THROW_ERR(ca_mgm::RuntimeException,
+ CA_MGM_THROW_ERR(ca_mgm::RuntimeException,
errorString().c_str(), m_ecode);
}
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/PosixRegEx.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/PosixRegEx.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/PosixRegEx.cpp Sat Jul 10 18:47:47 2010
@@ -130,7 +130,7 @@
{
if( !compile(regex, cflags))
{
- BLOCXX_THROW_ERR(ca_mgm::ValueException,
+ CA_MGM_THROW_ERR(ca_mgm::ValueException,
errorString().c_str(), m_ecode);
}
}
@@ -145,7 +145,7 @@
{
if( ref.compiled && !compile(ref.m_rxstr, ref.m_flags))
{
- BLOCXX_THROW_ERR(ca_mgm::ValueException,
+ CA_MGM_THROW_ERR(ca_mgm::ValueException,
errorString().c_str(), m_ecode);
}
}
@@ -179,7 +179,7 @@
}
else if( !compile(ref.m_rxstr, ref.m_flags))
{
- BLOCXX_THROW_ERR(ca_mgm::ValueException,
+ CA_MGM_THROW_ERR(ca_mgm::ValueException,
errorString().c_str(), m_ecode);
}
return *this;
@@ -260,13 +260,13 @@
{
if( !compiled)
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
"Regular expression is not compiled");
}
if( index > str.length())
{
- BLOCXX_THROW(ca_mgm::OverflowException,
+ CA_MGM_THROW(ca_mgm::OverflowException,
str::form("String index out of bounds ("
"length = %d, index = %d).",
str.length(), index
@@ -322,7 +322,7 @@
{
if( !compiled)
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
"Regular expression is not compiled");
}
@@ -334,7 +334,7 @@
{
if( rsub.empty())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
"Non-capturing regular expression");
}
@@ -354,7 +354,7 @@
}
else if(m_ecode != REG_NOMATCH)
{
- BLOCXX_THROW_ERR(ca_mgm::RuntimeException,
+ CA_MGM_THROW_ERR(ca_mgm::RuntimeException,
errorString().c_str(), m_ecode);
}
return ssub;
@@ -368,7 +368,7 @@
{
if( !compiled)
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
"Regular expression is not compiled");
}
@@ -387,7 +387,7 @@
rsub[0].rm_eo < 0)
{
// only if empty (missused as guard).
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
"Non-capturing regular expression");
}
@@ -405,7 +405,7 @@
}
else
{
- BLOCXX_THROW_ERR(ca_mgm::RuntimeException,
+ CA_MGM_THROW_ERR(ca_mgm::RuntimeException,
errorString().c_str(), m_ecode);
}
} while(global && match && out.length() > off);
@@ -419,7 +419,7 @@
{
if( !compiled)
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
"Regular expression is not compiled");
}
@@ -438,7 +438,7 @@
rsub[0].rm_so < 0 ||
rsub[0].rm_eo < 0)
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
"Non-capturing regular expression");
}
@@ -461,7 +461,7 @@
}
else
{
- BLOCXX_THROW_ERR(ca_mgm::RuntimeException,
+ CA_MGM_THROW_ERR(ca_mgm::RuntimeException,
errorString().c_str(), m_ecode);
}
} while(match && len > off);
@@ -476,7 +476,7 @@
{
if( !compiled)
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
"Regular expression is not compiled");
}
@@ -499,7 +499,7 @@
{
m_ecode = ret;
m_error = getError(&m_regex, m_ecode);
- BLOCXX_THROW_ERR(ca_mgm::RuntimeException,
+ CA_MGM_THROW_ERR(ca_mgm::RuntimeException,
errorString().c_str(), m_ecode);
}
}
@@ -515,13 +515,13 @@
{
if( !compiled)
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
"Regular expression is not compiled");
}
if( index > str.length())
{
- BLOCXX_THROW(ca_mgm::OverflowException,
+ CA_MGM_THROW(ca_mgm::OverflowException,
str::form("String index out of bounds ("
"length = %d, index = %d).",
str.length(), index
@@ -544,7 +544,7 @@
else
{
m_error = getError(&m_regex, m_ecode);
- BLOCXX_THROW_ERR(ca_mgm::RuntimeException,
+ CA_MGM_THROW_ERR(ca_mgm::RuntimeException,
errorString().c_str(), m_ecode);
}
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/RequestData_Priv.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/RequestData_Priv.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/RequestData_Priv.cpp Sat Jul 10 18:47:47 2010
@@ -94,7 +94,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
m_impl->subject = dn;
}
@@ -130,7 +130,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
m_impl->extensions = ext;
}
@@ -175,7 +175,7 @@
if(pkey == NULL)
{
LOGIT_ERROR("Unable to get public key");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("Unable to get the public key."));
}
@@ -186,7 +186,7 @@
if(!rsa)
{
LOGIT_ERROR("could not get RSA key");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("Could not get RSA key."));
}
@@ -206,7 +206,7 @@
EVP_PKEY_free(pkey);
LOGIT_ERROR("Unsupported public key type");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("Unsupported public key type."));
}
@@ -239,7 +239,7 @@
EVP_PKEY_free(pkey);
LOGIT_ERROR("Unsupported public key algorithm");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("Unsupported public key algorithm."));
}
@@ -269,7 +269,7 @@
EVP_PKEY_free(pkey);
LOGIT_ERROR("Unsupported signature algorithm: '" << sbuf << "'");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
str::form(__("Unsupported signature algorithm %s."), sbuf.c_str()).c_str());
}
@@ -362,7 +362,7 @@
if(!bio)
{
LOGIT_ERROR("Can not create a memory BIO");
- BLOCXX_THROW(ca_mgm::MemoryException,
+ CA_MGM_THROW(ca_mgm::MemoryException,
__("Cannot create a memory BIO."));
}
@@ -389,7 +389,7 @@
if(m_impl->x509 == NULL)
{
LOGIT_ERROR("Can not parse request");
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("Cannot parse the request."));
}
@@ -402,7 +402,7 @@
X509_REQ_free(m_impl->x509);
m_impl->x509 = NULL;
- BLOCXX_THROW_SUBEX(ca_mgm::SyntaxException,
+ CA_MGM_THROW_SUBEX(ca_mgm::SyntaxException,
__("Error while parsing the request."),
e);
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/RequestGenerationData.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/RequestGenerationData.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/RequestGenerationData.cpp Sat Jul 10 18:47:47 2010
@@ -136,7 +136,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
m_impl->subject = dn;
}
@@ -208,7 +208,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
m_impl->extensions = ext;
}
@@ -233,7 +233,7 @@
if(!m_impl->extensions.valid())
{
LOGIT_ERROR("invalid RequestGenerationData object");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid RequestGenerationData object."));
}
@@ -241,7 +241,7 @@
type == E_Server_Cert || type == E_CA_Cert )
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/StringExtensions.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/StringExtensions.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/StringExtensions.cpp Sat Jul 10 18:47:47 2010
@@ -102,7 +102,7 @@
if(!initURICheck().isValid(v))
{
LOGIT_ERROR("invalid value for NsBaseUrlExt");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for NsBaseUrlExt."));
}
setPresent(true);
@@ -115,7 +115,7 @@
if(type == E_CRL)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
@@ -160,7 +160,7 @@
if(!initURICheck().isValid(v))
{
LOGIT_ERROR("invalid value for NsBaseUrlExt");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for NsBaseUrlExt."));
}
m_impl->value = v;
@@ -172,7 +172,7 @@
{
if(!isPresent())
{
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("NsBaseUrlExt is not present."));
}
return m_impl->value;
@@ -184,7 +184,7 @@
if(!valid())
{
LOGIT_ERROR("invalid NsBaseUrlExt object");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid NsBaseUrlExt object."));
}
@@ -192,7 +192,7 @@
if(type == E_CRL)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
@@ -267,7 +267,7 @@
{
if(!initURICheck().isValid(v)) {
LOGIT_ERROR("invalid value for NsRevocationUrlExt");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for NsRevocationUrlExt."));
}
setPresent(true);
@@ -280,7 +280,7 @@
if(type == E_CRL)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
@@ -320,7 +320,7 @@
{
if(!initURICheck().isValid(v)) {
LOGIT_ERROR("invalid value for NsRevocationUrlExt");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for NsRevocationUrlExt."));
}
m_impl->value = v;
@@ -331,7 +331,7 @@
NsRevocationUrlExt::getValue() const
{
if(!isPresent()) {
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("NsRevocationUrlExt is not present."));
}
return m_impl->value;
@@ -342,7 +342,7 @@
{
if(!valid()) {
LOGIT_ERROR("invalid NsRevocationUrlExt object");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid NsRevocationUrlExt object."));
}
@@ -350,7 +350,7 @@
if(type == E_CRL)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
@@ -421,7 +421,7 @@
{
if(!initURICheck().isValid(v)) {
LOGIT_ERROR("invalid value for NsCaRevocationUrlExt");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for NsCaRevocationUrlExt."));
}
setPresent(true);
@@ -434,7 +434,7 @@
if(type == E_CRL)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
@@ -474,7 +474,7 @@
{
if(!initURICheck().isValid(v)) {
LOGIT_ERROR("invalid value for NsCaRevocationUrlExt");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for NsCaRevocationUrlExt."));
}
m_impl->value = v;
@@ -485,7 +485,7 @@
NsCaRevocationUrlExt::getValue() const
{
if(!isPresent()) {
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("NsCaRevocationUrlExt is not present."));
}
return m_impl->value;
@@ -496,7 +496,7 @@
{
if(!valid()) {
LOGIT_ERROR("invalid NsCaRevocationUrlExt object");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid NsCaRevocationUrlExt object."));
}
@@ -504,7 +504,7 @@
if(type == E_CRL)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
@@ -574,7 +574,7 @@
{
if(!initURICheck().isValid(v)) {
LOGIT_ERROR("invalid value for NsRenewalUrlExt");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for NsRenewalUrlExt."));
}
setPresent(true);
@@ -587,7 +587,7 @@
if(type == E_CRL)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
@@ -627,7 +627,7 @@
{
if(!initURICheck().isValid(v)) {
LOGIT_ERROR("invalid value for NsRenewalUrlExt");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for NsRenewalUrlExt."));
}
m_impl->value = v;
@@ -638,7 +638,7 @@
NsRenewalUrlExt::getValue() const
{
if(!isPresent()) {
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("NsRenewalUrlExt is not present."));
}
return m_impl->value;
@@ -649,7 +649,7 @@
{
if(!valid()) {
LOGIT_ERROR("invalid NsRenewalUrlExt object");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid NsRenewalUrlExt object."));
}
@@ -657,7 +657,7 @@
if(type == E_CRL)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
@@ -726,7 +726,7 @@
{
if(!initURICheck().isValid(v)) {
LOGIT_ERROR("invalid value for NsCaPolicyUrlExt");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for NsCaPolicyUrlExt."));
}
setPresent(true);
@@ -739,7 +739,7 @@
if(type == E_CRL)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
@@ -779,7 +779,7 @@
{
if(!initURICheck().isValid(v)) {
LOGIT_ERROR("invalid value for NsCaPolicyUrlExt");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for NsCaPolicyUrlExt."));
}
m_impl->value = v;
@@ -790,7 +790,7 @@
NsCaPolicyUrlExt::getValue() const
{
if(!isPresent()) {
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("NsCaPolicyUrlExt is not present."));
}
return m_impl->value;
@@ -801,7 +801,7 @@
{
if(!valid()) {
LOGIT_ERROR("invalid NsCaPolicyUrlExt object");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid NsCaPolicyUrlExt object."));
}
@@ -809,7 +809,7 @@
if(type == E_CRL)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
@@ -887,7 +887,7 @@
if(type == E_CRL)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Invalid type: %1."), type).c_str());
}
@@ -933,7 +933,7 @@
NsSslServerNameExt::getValue() const
{
if(!isPresent()) {
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("NsSslServerNameExt is not present."));
}
return m_impl->value;
@@ -944,14 +944,14 @@
{
if(!valid()) {
LOGIT_ERROR("invalid NsSslServerNameExt object");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid NsSslServerNameExt object."));
}
// This extension is not supported by type CRL
if(type == E_CRL) {
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
@@ -1013,7 +1013,7 @@
// These types are not supported by this object
if(type == E_CRL) {
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
@@ -1059,7 +1059,7 @@
NsCommentExt::getValue() const
{
if(!isPresent()) {
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("NsCommentExt is not present."));
}
return m_impl->value;
@@ -1070,14 +1070,14 @@
{
if(!valid()) {
LOGIT_ERROR("invalid NsCommentExt object");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid NsCommentExt object."));
}
// This extension is not supported by type CRL
if(type == E_CRL) {
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/SubjectAlternativeNameExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/SubjectAlternativeNameExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/SubjectAlternativeNameExtension.cpp Sat Jul 10 18:47:47 2010
@@ -78,7 +78,7 @@
if(type == E_CRL)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
@@ -124,7 +124,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
setPresent(true);
}
@@ -165,7 +165,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
m_impl->altNameList = alternativeNameList;
setPresent(true);
@@ -176,7 +176,7 @@
{
if(!isPresent())
{
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("SubjectAlternativeNameExt is not present."));
}
return m_impl->emailCopy;
@@ -187,7 +187,7 @@
{
if(!isPresent())
{
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("SubjectAlternativeNameExt is not present."));
}
return m_impl->altNameList;
@@ -200,7 +200,7 @@
if(!valid())
{
LOGIT_ERROR("invalid SubjectAlternativeNameExt object");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid SubjectAlternativeNameExt object."));
}
@@ -208,7 +208,7 @@
if(type == E_CRL)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/SubjectKeyIdentifierExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/SubjectKeyIdentifierExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/SubjectKeyIdentifierExtension.cpp Sat Jul 10 18:47:47 2010
@@ -78,7 +78,7 @@
if(type == E_CRL)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
@@ -122,7 +122,7 @@
!initHexCheck().isValid(keyid))
{
LOGIT_ERROR("invalid KeyID");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid KeyID."));
}
setPresent(true);
@@ -156,7 +156,7 @@
if(!keyId.empty() && !initHexCheck().isValid(keyId))
{
LOGIT_ERROR("invalid KeyID");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid KeyID."));
}
m_impl->autodetect = autoDetect;
@@ -169,7 +169,7 @@
{
if(!isPresent())
{
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("SubjectKeyIdentifierExt is not present."));
}
return m_impl->autodetect;
@@ -180,7 +180,7 @@
{
if(!isPresent())
{
- BLOCXX_THROW(ca_mgm::RuntimeException,
+ CA_MGM_THROW(ca_mgm::RuntimeException,
__("SubjectKeyIdentifierExt is not present."));
}
return m_impl->keyid;
@@ -193,7 +193,7 @@
if(!valid())
{
LOGIT_ERROR("invalid SubjectKeyIdentifierExt object");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid SubjectKeyIdentifierExt object."));
}
@@ -201,7 +201,7 @@
if(type == E_CRL)
{
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
str::form(__("Wrong type: %1."), type).c_str());
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/Url.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/Url.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/Url.cpp Sat Jul 10 18:47:47 2010
@@ -60,7 +60,7 @@
{
if( !m_impl)
{
- BLOCXX_THROW(url::UrlException,
+ CA_MGM_THROW(url::UrlException,
__("The URL implementation reference cannot be empty.")
);
}
@@ -81,7 +81,7 @@
UrlRef url( parseUrl(urlString));
if( !url)
{
- BLOCXX_THROW(url::UrlException,
+ CA_MGM_THROW(url::UrlException,
__("The URL implementation reference cannot be empty.")
);
}
@@ -119,14 +119,14 @@
}
catch(const blocxx::Exception &e)
{
- BLOCXX_THROW_SUBEX(url::UrlParsingException,
+ CA_MGM_THROW_SUBEX(url::UrlParsingException,
str::form(__("Unable to parse url string '%s'."),
urlString.c_str()).c_str(), e
);
}
catch( ... )
{
- BLOCXX_THROW(url::UrlParsingException,
+ CA_MGM_THROW(url::UrlParsingException,
str::form(__("Unable to parse url string '%s'."),
urlString.c_str()).c_str()
);
Modified: limal-branches/mc-devel/limal-ca-mgm/src/UrlBase.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/UrlBase.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/UrlBase.cpp Sat Jul 10 18:47:47 2010
@@ -152,7 +152,7 @@
{
if( regx.empty() || regx == "^$")
{
- BLOCXX_THROW(UrlNotAllowedException,
+ CA_MGM_THROW(UrlNotAllowedException,
str::form(__("The %s url component is "
"not allowed in this scheme"),
name.c_str()).c_str()
@@ -171,14 +171,14 @@
{
if( show)
{
- BLOCXX_THROW(UrlBadComponentException,
+ CA_MGM_THROW(UrlBadComponentException,
str::form(__("Invalid %s URL component data '%s'."),
name.c_str(), data.c_str()).c_str()
);
}
else
{
- BLOCXX_THROW(UrlBadComponentException,
+ CA_MGM_THROW(UrlBadComponentException,
str::form(__("Invalid data in the %s URL component."), name.c_str()).c_str()
);
}
@@ -263,21 +263,21 @@
{
if( components.has_authority && config("with_authority") != "y")
{
- BLOCXX_THROW(UrlNotAllowedException,
+ CA_MGM_THROW(UrlNotAllowedException,
__("The authority url component is not "
"allowed in this scheme")
);
}
if( components.has_querystr && config("rx_querystr").empty())
{
- BLOCXX_THROW(UrlNotAllowedException,
+ CA_MGM_THROW(UrlNotAllowedException,
__("The query string url component is not "
"allowed in this scheme")
);
}
if( components.has_fragment && config("rx_fragment").empty())
{
- BLOCXX_THROW(UrlNotAllowedException,
+ CA_MGM_THROW(UrlNotAllowedException,
__("The fragment string url component is not "
"allowed in this scheme")
);
@@ -773,7 +773,7 @@
if( config("psep_pathparam").empty() ||
config("vsep_pathparam").empty())
{
- BLOCXX_THROW(UrlNotSupportedException,
+ CA_MGM_THROW(UrlNotSupportedException,
__("Path parameter parsing is not supported for this URL.")
);
}
@@ -822,7 +822,7 @@
if( config("psep_querystr").empty() ||
config("vsep_querystr").empty())
{
- BLOCXX_THROW(UrlNotSupportedException,
+ CA_MGM_THROW(UrlNotSupportedException,
__("Query string parsing is not supported for this URL.")
);
}
@@ -857,13 +857,13 @@
else
if( scheme.empty())
{
- BLOCXX_THROW(UrlBadComponentException,
+ CA_MGM_THROW(UrlBadComponentException,
__("The URL scheme is a required component.")
);
}
else
{
- BLOCXX_THROW(UrlBadComponentException,
+ CA_MGM_THROW(UrlBadComponentException,
str::form(__("Invalid URL scheme '%s'."),
scheme.c_str()).c_str()
);
@@ -963,7 +963,7 @@
{
if( config("with_authority") != "y")
{
- BLOCXX_THROW(UrlNotAllowedException,
+ CA_MGM_THROW(UrlNotAllowedException,
__("The username component is not "
"allowed in this scheme")
);
@@ -997,7 +997,7 @@
{
if( config("with_authority") != "y")
{
- BLOCXX_THROW(UrlNotAllowedException,
+ CA_MGM_THROW(UrlNotAllowedException,
__("The password component is not "
"allowed in this scheme")
);
@@ -1027,7 +1027,7 @@
{
if(config("require_host") == "m")
{
- BLOCXX_THROW(UrlNotAllowedException,
+ CA_MGM_THROW(UrlNotAllowedException,
__("The URL scheme requires a host.")
);
}
@@ -1037,7 +1037,7 @@
{
if( config("with_authority") != "y")
{
- BLOCXX_THROW(UrlNotAllowedException,
+ CA_MGM_THROW(UrlNotAllowedException,
__("The hostname component is not "
"allowed in this scheme")
);
@@ -1101,7 +1101,7 @@
if( config("with_authority") != "y" ||
config("with_port") != "y")
{
- BLOCXX_THROW(UrlNotAllowedException,
+ CA_MGM_THROW(UrlNotAllowedException,
__("The port number component is not "
"allowed in this scheme")
);
@@ -1122,7 +1122,7 @@
{
if(config("require_pathname") == "m")
{
- BLOCXX_THROW(UrlNotAllowedException,
+ CA_MGM_THROW(UrlNotAllowedException,
__("The URL scheme requires a path.")
);
}
@@ -1185,7 +1185,7 @@
if( config("psep_pathparam").empty() ||
config("vsep_pathparam").empty())
{
- BLOCXX_THROW(UrlNotSupportedException,
+ CA_MGM_THROW(UrlNotSupportedException,
__("Path parameter parsing is not supported for this URL.")
);
}
@@ -1230,7 +1230,7 @@
if( config("psep_querystr").empty() ||
config("vsep_querystr").empty())
{
- BLOCXX_THROW(UrlNotSupportedException,
+ CA_MGM_THROW(UrlNotSupportedException,
__("Query string parsing is not supported for this URL.")
);
}
@@ -1361,7 +1361,7 @@
// We don't support the IP-Literal "[v<HEX> ... ]" format
if( host.at(1) == 'v')
{
- BLOCXX_THROW(UrlBadComponentException,
+ CA_MGM_THROW(UrlBadComponentException,
__("The IPvFuture URL host format is not supported.")
);
}
@@ -1395,7 +1395,7 @@
if( !valid)
{
- BLOCXX_THROW(UrlBadComponentException,
+ CA_MGM_THROW(UrlBadComponentException,
str::form(__("Invalid hostname URL component data '%s'."),
host.c_str()).c_str()
);
@@ -1425,7 +1425,7 @@
if( !valid)
{
- BLOCXX_THROW(UrlBadComponentException,
+ CA_MGM_THROW(UrlBadComponentException,
str::form(__("Invalid port number URL component data '%s'."),
port.c_str()).c_str()
);
@@ -1451,7 +1451,7 @@
if(!(path.at(0) == '/' || (path.length() >= 3 &&
str::toLower(path.substr(0, 3)) == "%2f")))
{
- BLOCXX_THROW(UrlNotAllowedException,
+ CA_MGM_THROW(UrlNotAllowedException,
__("A relative path is not allowed if authority exists.")
);
}
@@ -1464,7 +1464,7 @@
{
if(path.at(0) != '/')
{
- BLOCXX_THROW(UrlNotAllowedException,
+ CA_MGM_THROW(UrlNotAllowedException,
__("A relative path is not allowed if authority exists.")
);
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/UrlUtils.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/UrlUtils.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/UrlUtils.cpp Sat Jul 10 18:47:47 2010
@@ -195,7 +195,7 @@
// is a %00 octet allowed ?
if( !allowNUL)
{
- BLOCXX_THROW(UrlDecodingException,
+ CA_MGM_THROW(UrlDecodingException,
__("The URL-encoded string may not contain a NULL byte.")
);
}
@@ -256,7 +256,7 @@
{
if( psep.empty())
{
- BLOCXX_THROW(UrlNotSupportedException,
+ CA_MGM_THROW(UrlNotSupportedException,
__("Invalid split separator character.")
);
}
@@ -294,7 +294,7 @@
{
if( psep.empty() || vsep.empty())
{
- BLOCXX_THROW(UrlNotSupportedException,
+ CA_MGM_THROW(UrlNotSupportedException,
__("Invalid split separator character.")
);
}
@@ -368,7 +368,7 @@
{
if( psep.empty() || vsep.empty())
{
- BLOCXX_THROW(UrlNotSupportedException,
+ CA_MGM_THROW(UrlNotSupportedException,
__("Invalid parameter map join separator character.")
);
}
@@ -444,7 +444,7 @@
}
else
{
- BLOCXX_THROW(UrlParsingException,
+ CA_MGM_THROW(UrlParsingException,
__("Unable to parse main URL components.")
);
}
@@ -489,7 +489,7 @@
}
else
{
- BLOCXX_THROW(UrlParsingException,
+ CA_MGM_THROW(UrlParsingException,
__("Unable to parse URL authority components.")
);
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp Sat Jul 10 18:47:47 2010
@@ -239,7 +239,7 @@
break;
default:
LOGIT_ERROR("wrong type" << type);
- BLOCXX_THROW(ValueException, str::form("wrong type: %d", type).c_str());
+ CA_MGM_THROW(ValueException, str::form("wrong type: %d", type).c_str());
}
LOGIT_DEBUG("type2Section: type=" << type << " result=" << result);
return result;
Modified: limal-branches/mc-devel/limal-ca-mgm/src/ValueCheck.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/ValueCheck.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/ValueCheck.cpp Sat Jul 10 18:47:47 2010
@@ -124,7 +124,7 @@
{
if( !m_self)
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("The value check may not contain a NULL pointer."));
}
@@ -155,7 +155,7 @@
{
if( !m_self)
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("The value check may not contain a NULL pointer."));
}
@@ -236,7 +236,7 @@
}
else
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("The value check may not contain a NULL pointer."));
}
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLExtensions_Priv.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLExtensions_Priv.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLExtensions_Priv.cpp Sat Jul 10 18:47:47 2010
@@ -75,7 +75,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
m_impl->authorityKeyIdentifier = ext;
}
@@ -87,7 +87,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ca_mgm::ValueException, r[0].c_str());
+ CA_MGM_THROW(ca_mgm::ValueException, r[0].c_str());
}
m_impl->issuerAlternativeName = ext;
}
@@ -129,12 +129,12 @@
{
// extension occurred more than once
LOGIT_ERROR("Extension occurred more than once");
- BLOCXX_THROW(ca_mgm::SyntaxException,
+ CA_MGM_THROW(ca_mgm::SyntaxException,
__("Extension occurred more than once."));
}
LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")");
- BLOCXX_THROW(ca_mgm::SyntaxException,
+ CA_MGM_THROW(ca_mgm::SyntaxException,
str::form(__("Unable to parse the certificate (Crit: %1)."),
crit).c_str());
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLGenerationExtensions.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLGenerationExtensions.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLGenerationExtensions.cpp Sat Jul 10 18:47:47 2010
@@ -95,7 +95,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3CRLGenerationExts::setAuthorityKeyIdentifier."));
}
m_impl->authorityKeyIdentifier = ext;
@@ -118,7 +118,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3CRLGenerationExts::setIssuerAlternativeName."));
}
m_impl->issuerAlternativeName = ext;
@@ -142,7 +142,7 @@
if(!valid())
{
LOGIT_ERROR("invalid X509v3RequestExts object");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid X509v3RequestExts object."));
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateExtensions_Priv.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateExtensions_Priv.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateExtensions_Priv.cpp Sat Jul 10 18:47:47 2010
@@ -145,7 +145,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ValueException, r[0].c_str());
+ CA_MGM_THROW(ValueException, r[0].c_str());
}
m_impl->nsBaseUrl = ext;
}
@@ -157,7 +157,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ValueException, r[0].c_str());
+ CA_MGM_THROW(ValueException, r[0].c_str());
}
m_impl->nsRevocationUrl = ext;
}
@@ -169,7 +169,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ValueException, r[0].c_str());
+ CA_MGM_THROW(ValueException, r[0].c_str());
}
m_impl->nsCaRevocationUrl = ext;
}
@@ -181,7 +181,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ValueException, r[0].c_str());
+ CA_MGM_THROW(ValueException, r[0].c_str());
}
m_impl->nsRenewalUrl = ext;
}
@@ -193,7 +193,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ValueException, r[0].c_str());
+ CA_MGM_THROW(ValueException, r[0].c_str());
}
m_impl->nsCaPolicyUrl = ext;
}
@@ -205,7 +205,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ValueException, r[0].c_str());
+ CA_MGM_THROW(ValueException, r[0].c_str());
}
m_impl->nsSslServerName = ext;
}
@@ -217,7 +217,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ValueException, r[0].c_str());
+ CA_MGM_THROW(ValueException, r[0].c_str());
}
m_impl->nsComment = ext;
}
@@ -229,7 +229,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ValueException, r[0].c_str());
+ CA_MGM_THROW(ValueException, r[0].c_str());
}
m_impl->nsCertType = ext;
}
@@ -241,7 +241,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ValueException, r[0].c_str());
+ CA_MGM_THROW(ValueException, r[0].c_str());
}
m_impl->keyUsage = ext;
}
@@ -253,7 +253,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ValueException, r[0].c_str());
+ CA_MGM_THROW(ValueException, r[0].c_str());
}
m_impl->basicConstraints = ext;
}
@@ -265,7 +265,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ValueException, r[0].c_str());
+ CA_MGM_THROW(ValueException, r[0].c_str());
}
m_impl->extendedKeyUsage = ext;
}
@@ -277,7 +277,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ValueException, r[0].c_str());
+ CA_MGM_THROW(ValueException, r[0].c_str());
}
m_impl->subjectKeyIdentifier = ext;
}
@@ -289,7 +289,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ValueException, r[0].c_str());
+ CA_MGM_THROW(ValueException, r[0].c_str());
}
m_impl->authorityKeyIdentifier = ext;
}
@@ -301,7 +301,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ValueException, r[0].c_str());
+ CA_MGM_THROW(ValueException, r[0].c_str());
}
m_impl->subjectAlternativeName = ext;
}
@@ -313,7 +313,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ValueException, r[0].c_str());
+ CA_MGM_THROW(ValueException, r[0].c_str());
}
m_impl->issuerAlternativeName = ext;
}
@@ -325,7 +325,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ValueException, r[0].c_str());
+ CA_MGM_THROW(ValueException, r[0].c_str());
}
m_impl->authorityInfoAccess = ext;
}
@@ -337,7 +337,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ValueException, r[0].c_str());
+ CA_MGM_THROW(ValueException, r[0].c_str());
}
m_impl->crlDistributionPoints = ext;
}
@@ -349,7 +349,7 @@
if(!r.empty())
{
LOGIT_ERROR(r[0]);
- BLOCXX_THROW(ValueException, r[0].c_str());
+ CA_MGM_THROW(ValueException, r[0].c_str());
}
m_impl->certificatePolicies = ext;
}
@@ -389,14 +389,14 @@
{
// extension occurred more than once
LOGIT_ERROR("Extension occurred more than once: " << nid);
- BLOCXX_THROW(SyntaxException,
+ CA_MGM_THROW(SyntaxException,
str::form(__("Extension occurred more than once: %1."),
nid).c_str());
}
LOGIT_ERROR("Unable to parse the certificate (NID:" <<
nid << " Crit:" << crit << ")");
- BLOCXX_THROW(SyntaxException,
+ CA_MGM_THROW(SyntaxException,
str::form(__("Unable to parse the certificate (NID: %1 Crit: %2)."),
nid, crit).c_str());
}
@@ -446,14 +446,14 @@
{
// extension occurred more than once
LOGIT_ERROR("Extension occurred more than once: " << nid);
- BLOCXX_THROW(SyntaxException,
+ CA_MGM_THROW(SyntaxException,
str::form(__("Extension occurred more than once: %1."),
nid).c_str());
}
LOGIT_ERROR("Unable to parse the certificate (NID:" <<
nid << " Crit:" << crit << ")");
- BLOCXX_THROW(SyntaxException,
+ CA_MGM_THROW(SyntaxException,
str::form(__("Unable to parse the certificate (NID: %1 Crit: %2)."),
nid, crit).c_str());
}
@@ -505,12 +505,12 @@
{
// extension occurred more than once
LOGIT_ERROR("Extension occurred more than once");
- BLOCXX_THROW(SyntaxException,
+ CA_MGM_THROW(SyntaxException,
__("Extension occurred more than once."));
}
LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")");
- BLOCXX_THROW(SyntaxException,
+ CA_MGM_THROW(SyntaxException,
str::form(__("Unable to parse the certificate (Crit: %1)."),
crit).c_str());
}
@@ -571,12 +571,12 @@
{
// extension occurred more than once
LOGIT_ERROR("Extension occurred more than once");
- BLOCXX_THROW(SyntaxException,
+ CA_MGM_THROW(SyntaxException,
__("Extension occurred more than once."));
}
LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")");
- BLOCXX_THROW(SyntaxException,
+ CA_MGM_THROW(SyntaxException,
str::form(__("Unable to parse the certificate (Crit: %1)."),
crit).c_str());
}
@@ -635,12 +635,12 @@
{
// extension occurred more than once
LOGIT_ERROR("Extension occurred more than once");
- BLOCXX_THROW(SyntaxException,
+ CA_MGM_THROW(SyntaxException,
__("Extension occurred more than once."));
}
LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")");
- BLOCXX_THROW(SyntaxException,
+ CA_MGM_THROW(SyntaxException,
str::form(__("Unable to parse the certificate (Crit: %1)."),
crit).c_str());
}
@@ -694,13 +694,13 @@
{
// extension occurred more than once
LOGIT_ERROR("Extension occurred more than once");
- BLOCXX_THROW(SyntaxException,
+ CA_MGM_THROW(SyntaxException,
__("Extension occurred more than once."));
}
LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")");
- BLOCXX_THROW(SyntaxException,
+ CA_MGM_THROW(SyntaxException,
str::form(__("Unable to parse the certificate (Crit: %1)."),
crit).c_str());
}
@@ -764,12 +764,12 @@
{
// extension occurred more than once
LOGIT_ERROR("Extension occurred more than once");
- BLOCXX_THROW(SyntaxException,
+ CA_MGM_THROW(SyntaxException,
__("Extension occurred more than once."));
}
LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")");
- BLOCXX_THROW(SyntaxException,
+ CA_MGM_THROW(SyntaxException,
str::form(__("Unable to parse the certificate (Crit: %1)."),
crit).c_str());
}
@@ -833,13 +833,13 @@
{
// extension occurred more than once
LOGIT_ERROR("Extension occurred more than once");
- BLOCXX_THROW(SyntaxException,
+ CA_MGM_THROW(SyntaxException,
__("Extension occurred more than once."));
}
LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")");
- BLOCXX_THROW(SyntaxException,
+ CA_MGM_THROW(SyntaxException,
str::form(__("Unable to parse the certificate (Crit: %1)."),
crit).c_str());
}
@@ -909,12 +909,12 @@
{
// extension occurred more than once
LOGIT_ERROR("Extension occurred more than once");
- BLOCXX_THROW(SyntaxException,
+ CA_MGM_THROW(SyntaxException,
__("Extension occurred more than once."));
}
LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")");
- BLOCXX_THROW(SyntaxException,
+ CA_MGM_THROW(SyntaxException,
str::form(__("Unable to parse the certificate (Crit: %1)."), crit).c_str());
}
@@ -934,7 +934,7 @@
if(!lv.valid())
{
LOGIT_ERROR("Invalid location in authorityInfoAccess");
- BLOCXX_THROW(SyntaxException,
+ CA_MGM_THROW(SyntaxException,
__("Invalid location in authorityInfoAccess."));
}
@@ -995,12 +995,12 @@
{
// extension occurred more than once
LOGIT_ERROR("Extension occurred more than once");
- BLOCXX_THROW(SyntaxException,
+ CA_MGM_THROW(SyntaxException,
__("Extension occurred more than once."));
}
LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")");
- BLOCXX_THROW(SyntaxException,
+ CA_MGM_THROW(SyntaxException,
str::form(__("Unable to parse the certificate (Crit: %1)."),
crit).c_str());
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateIssueExtensions.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateIssueExtensions.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateIssueExtensions.cpp Sat Jul 10 18:47:47 2010
@@ -167,7 +167,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3CertificateIssueExts::setNsBaseUrl."));
}
m_impl->nsBaseUrl = ext;
@@ -190,7 +190,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3CertificateIssueExts::setNsRevocationUrl."));
}
m_impl->nsRevocationUrl = ext;
@@ -213,7 +213,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3CertificateIssueExts::setNsCaRevocationUrl."));
}
m_impl->nsCaRevocationUrl = ext;
@@ -236,7 +236,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3CertificateIssueExts::setNsRenewalUrl."));
}
m_impl->nsRenewalUrl = ext;
@@ -259,7 +259,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3CertificateIssueExts::setNsCaPolicyUrl."));
}
m_impl->nsCaPolicyUrl = ext;
@@ -282,7 +282,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3CertificateIssueExts::setNsSslServerName."));
}
m_impl->nsSslServerName = ext;
@@ -305,7 +305,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3CertificateIssueExts::setNsComment."));
}
m_impl->nsComment = ext;
@@ -328,7 +328,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3CertificateIssueExts::setNsCertType."));
}
m_impl->nsCertType = ext;
@@ -351,7 +351,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3CertificateIssueExts::setKeyUsage."));
}
m_impl->keyUsage = ext;
@@ -374,7 +374,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3CertificateIssueExts::setBasicConstraints."));
}
m_impl->basicConstraints = ext;
@@ -397,7 +397,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3CertificateIssueExts::setExtendedKeyUsage."));
}
m_impl->extendedKeyUsage = ext;
@@ -420,7 +420,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3CertificateIssueExts::setSubjectKeyIdentifier."));
}
m_impl->subjectKeyIdentifier = ext;
@@ -443,7 +443,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3CertificateIssueExts::setAuthorityKeyIdentifier."));
}
m_impl->authorityKeyIdentifier = ext;
@@ -466,7 +466,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3CertificateIssueExts::setSubjectAlternativeName."));
}
m_impl->subjectAlternativeName = ext;
@@ -489,7 +489,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3CertificateIssueExts::setIssuerAlternativeName."));
}
m_impl->issuerAlternativeName = ext;
@@ -512,7 +512,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3CertificateIssueExts::setAuthorityInfoAccess."));
}
m_impl->authorityInfoAccess = ext;
@@ -535,7 +535,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3CertificateIssueExts::setCRLDistributionPoints."));
}
m_impl->crlDistributionPoints = ext;
@@ -558,7 +558,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3CertificateIssueExts::setCertificatePolicies."));
}
m_impl->certificatePolicies = ext;
@@ -582,7 +582,7 @@
if(!valid())
{
LOGIT_ERROR("invalid X509v3RequestExts object");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid X509v3RequestExts object."));
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensions.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensions.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensions.cpp Sat Jul 10 18:47:47 2010
@@ -64,7 +64,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3RequestExts::setNsSslServerName."));
}
m_impl->nsSslServerName = ext;
@@ -87,7 +87,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3RequestExts::setNsComment."));
}
m_impl->nsComment = ext;
@@ -110,7 +110,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3RequestExts::setNsCertType."));
}
m_impl->nsCertType = ext;
@@ -133,7 +133,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3RequestExts::setKeyUsage."));
}
m_impl->keyUsage = ext;
@@ -156,7 +156,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3RequestExts::setBasicConstraints."));
}
m_impl->basicConstraints = ext;
@@ -179,7 +179,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3RequestExts::setExtendedKeyUsage."));
}
m_impl->extendedKeyUsage = ext;
@@ -202,7 +202,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3RequestExts::setSubjectKeyIdentifier."));
}
m_impl->subjectKeyIdentifier = ext;
@@ -225,7 +225,7 @@
{
if(!ext.valid())
{
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid value for X509v3RequestExts::setSubjectAlternativeName."));
}
m_impl->subjectAlternativeName = ext;
@@ -249,7 +249,7 @@
if(!valid())
{
LOGIT_ERROR("invalid X509v3RequestExts object");
- BLOCXX_THROW(ca_mgm::ValueException,
+ CA_MGM_THROW(ca_mgm::ValueException,
__("Invalid X509v3RequestExts object."));
}
m_impl->nsSslServerName.commit2Config(ca, type);
Modified: limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensions_Priv.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensions_Priv.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensions_Priv.cpp Sat Jul 10 18:47:47 2010
@@ -128,14 +128,14 @@
{
// extension occurred more than once
LOGIT_ERROR("Extension occurred more than once: " << nid);
- BLOCXX_THROW(ca_mgm::SyntaxException,
+ CA_MGM_THROW(ca_mgm::SyntaxException,
str::form(__("Extension occurred more than once: %1."),
nid).c_str());
}
LOGIT_ERROR("Unable to parse the certificate (NID:" << nid <<
" Crit:" << crit << ")");
- BLOCXX_THROW(ca_mgm::SyntaxException,
+ CA_MGM_THROW(ca_mgm::SyntaxException,
str::form(__("Unable to parse the certificate (NID: %1 Crit: %2)."),
nid, crit).c_str());
}
@@ -183,14 +183,14 @@
{
// extension occurred more than once
LOGIT_ERROR("Extension occurred more than once: " << nid);
- BLOCXX_THROW(ca_mgm::SyntaxException,
+ CA_MGM_THROW(ca_mgm::SyntaxException,
str::form(__("Extension occurred more than once: %1."),
nid).c_str());
}
LOGIT_ERROR("Unable to parse the certificate (NID:" << nid <<
" Crit:" << crit << ")");
- BLOCXX_THROW(ca_mgm::SyntaxException,
+ CA_MGM_THROW(ca_mgm::SyntaxException,
str::form(__("Unable to parse the certificate (NID: %1 Crit: %2)."),
nid, crit).c_str());
}
@@ -243,12 +243,12 @@
{
// extension occurred more than once
LOGIT_ERROR("Extension occurred more than once");
- BLOCXX_THROW(ca_mgm::SyntaxException,
+ CA_MGM_THROW(ca_mgm::SyntaxException,
__("Extension occurred more than once."));
}
LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")");
- BLOCXX_THROW(ca_mgm::SyntaxException,
+ CA_MGM_THROW(ca_mgm::SyntaxException,
str::form(__("Unable to parse the certificate (Crit: %1)."),
crit).c_str());
}
@@ -309,12 +309,12 @@
{
// extension occurred more than once
LOGIT_ERROR("Extension occurred more than once");
- BLOCXX_THROW(ca_mgm::SyntaxException,
+ CA_MGM_THROW(ca_mgm::SyntaxException,
__("Extension occurred more than once."));
}
LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")");
- BLOCXX_THROW(ca_mgm::SyntaxException,
+ CA_MGM_THROW(ca_mgm::SyntaxException,
str::form(__("Unable to parse the certificate (Crit: %1)."),
crit).c_str());
}
@@ -372,13 +372,13 @@
{
// extension occurred more than once
LOGIT_ERROR("Extension occurred more than once");
- BLOCXX_THROW(ca_mgm::SyntaxException,
+ CA_MGM_THROW(ca_mgm::SyntaxException,
__("Extension occurred more than once."));
}
LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")");
- BLOCXX_THROW(ca_mgm::SyntaxException,
+ CA_MGM_THROW(ca_mgm::SyntaxException,
str::form(__("Unable to parse the certificate (Crit: %1)."),
crit).c_str());
}
@@ -430,12 +430,12 @@
{
// extension occurred more than once
LOGIT_ERROR("Extension occurred more than once");
- BLOCXX_THROW(ca_mgm::SyntaxException,
+ CA_MGM_THROW(ca_mgm::SyntaxException,
__("Extension occurred more than once."));
}
LOGIT_ERROR("Unable to parse the certificate (" << "Crit:" << crit << ")");
- BLOCXX_THROW(ca_mgm::SyntaxException,
+ CA_MGM_THROW(ca_mgm::SyntaxException,
str::form(__("Unable to parse the certificate (Crit: %1)."),
crit).c_str());
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/Exception.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/Exception.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/Exception.hpp Sat Jul 10 18:47:47 2010
@@ -26,7 +26,7 @@
* BloCxx provides several macros helping to throw exceptions:
* @code
* #include <limal/Exception.hpp>
- *
+ *
*
* BLOCXX_THROW_ERRNO_MSG(ca_mgm::SystemException,
* "Can't do this and that");
@@ -54,14 +54,189 @@
#ifndef LIMAL_EXCEPTION_HPP
#define LIMAL_EXCEPTION_HPP
-#include "blocxx/BLOCXX_config.h"
-#include "blocxx/Exception.hpp"
#include "limal/ca-mgm/config.h"
-
+#include <limal/String.hpp>
+#include <string.h>
namespace LIMAL_NAMESPACE
{
+ class Exception : public std::exception
+ {
+ friend std::ostream & operator<<( std::ostream & str, const Exception & obj );
+
+ protected:
+ Exception(const char* file, int line, const char* msg,
+ int errorCode, const Exception *otherException = 0);
+
+ public:
+ Exception(const Exception& e);
+ Exception& operator= (const Exception& rhs);
+ virtual ~Exception() throw();
+
+ /**
+ * Returns a string representing the concrete type. e.g. "SocketException". Will not return 0.
+ * This function will not throw. Derived class implementations must not throw.
+ */
+ virtual const char* type() const;
+ /**
+ * Returns the message. May return 0.
+ * This function will not throw. Derived class implementations must not throw.
+ */
+ virtual const char* getMessage() const;
+ /**
+ * Returns the full message.
+ * This function will not throw. Derived class implementations must not throw.
+ */
+ virtual std::string getFullMessage() const;
+
+ /**
+ * Returns the file. May return 0.
+ */
+ const char* getFile() const;
+ int getLine() const;
+
+ /**
+ * Returns the error code representing the error which occurred.
+ * Code are unique only in the scope of the derived exception class.
+ * May return UNKNONWN_ERROR_CODE if the error is unavailable.
+ */
+ int getErrorCode() const;
+
+ /**
+ * Returns getMessage()
+ */
+ virtual const char* what() const throw();
+
+ private:
+ char* m_file;
+ int m_line;
+ char* m_msg;
+ int m_errorCode;
+ };
+
+namespace ExceptionDetail
+{
+ unsigned const BUFSZ = 1024;
+
+ template <typename exType>
+ struct Errno
+ {
+ static exType simple(char const * file, int line, int errnum)
+ {
+ return exType(file, line, ::strerror(errnum), errnum);
+ }
+
+ template <typename Mtype>
+ static exType format(char const * file, int line,
+ Mtype const & msg, int errnum)
+ {
+ return format(file, line, msg.c_str(), errnum);
+ }
+
+ static exType format(char const * file, int line,
+ char const * msg, int errnum)
+ {
+ return exType(file, line, str::form("%s: %d(%s)", msg, errnum, ::strerror(errnum)).c_str(), errnum);
+ }
+ }; // struct Errno
+}
+
+/**
+ * Declare a new exception class named \<NAME\>Exception that derives from \<BASE\>.
+ * This macro is typically used in a header file.
+ *
+ * @param NAME The name of the new class (Exception will be postfixed)
+ * @param BASE The base class.
+ */
+#define CA_MGM_DECLARE_EXCEPTION(NAME) \
+class NAME##Exception : public ca_mgm::Exception \
+{ \
+public: \
+ NAME##Exception(const char* file, int line, const char* msg, int errorCode = 0, const ca_mgm::Exception* otherException = 0); \
+ virtual ~NAME##Exception() throw(); \
+ virtual const char* type() const; \
+};
+
+/**
+ * Define a new exception class named \<NAME\>Exception that derives from \<BASE\>.
+ * The new class will use UNKNOWN_SUBCLASS_ID for the subclass id.
+ * This macro is typically used in a cpp file.
+ *
+ * @param NAME The name of the new class (Exception will be postfixed)
+ * @param BASE The base class.
+ */
+#define CA_MGM_DEFINE_EXCEPTION(NAME) \
+NAME##Exception::NAME##Exception(const char* file, int line, const char* msg, int errorCode, const ::ca_mgm::Exception* otherException) \
+ : ca_mgm::Exception(file, line, msg, errorCode, otherException) {} \
+NAME##Exception::~NAME##Exception() throw() { } \
+const char* NAME##Exception::type() const { return #NAME "Exception"; }\
+
+
+/**
+ * Throw an exception using __FILE__ and __LINE__. If applicable,
+ * BLOCXX_THROW_ERR should be used instead of this macro.
+ *
+ * @param exType The type of the exception
+ * @param msg The exception message. A string that will be copied.
+ */
+#define CA_MGM_THROW(exType, msg) throw exType(__FILE__, __LINE__, (msg))
+
+/**
+ * Throw an exception using __FILE__ and __LINE__.
+ * @param exType The type of the exception
+ * @param msg The exception message. A string that will be copied.
+ * @param subex A sub-exception. A pointer to it will be passed to the
+ * exception constructor, which should clone() it.
+ */
+#define CA_MGM_THROW_SUBEX(exType, msg, subex) \
+throw exType(__FILE__, __LINE__, (msg), 0, &(subex))
+
+/**
+ * Throw an exception using __FILE__ and __LINE__.
+ * @param exType The type of the exception
+ * @param msg The exception message. A string that will be copied.
+ * @param err The error code.
+ */
+#define CA_MGM_THROW_ERR(exType, msg, err) \
+throw exType(__FILE__, __LINE__, (msg), (err))
+/**
+ * Throw an exception using __FILE__, __LINE__, errno and strerror(errno)
+ * @param exType The type of the exception; ctor must take file, line,
+ * message, and error code.
+ */
+#define CA_MGM_THROW_ERRNO(exType) CA_MGM_THROW_ERRNO1(exType, errno)
+
+/**
+ * Throw an exception using __FILE__, __LINE__, errnum and strerror(errnum)
+ * @param exType The type of the exception; ctor must take file, line,
+ * message, and error code.
+ * @param errnum The errno value.
+ */
+#define CA_MGM_THROW_ERRNO1(exType, errnum) \
+throw ::ca_mgm::ExceptionDetail::Errno< exType >::simple(__FILE__, __LINE__, (errnum))
+
+/**
+ * Throw an exception using __FILE__, __LINE__, errno and strerror(errno)
+ * @param exType The type of the exception; ctor must take file, line,
+ * message, and error code.
+ * @param msg The exception message to use.
+ */
+#define CA_MGM_THROW_ERRNO_MSG(exType, msg) \
+CA_MGM_THROW_ERRNO_MSG1(exType, (msg), errno)
+
+/**
+ * Throw an exception using __FILE__, __LINE__, errnum and strerror(errnum)
+ * @param exType The type of the exception; ctor must take file, line,
+ * message, and error code.
+ * @param msg The exception message to use.
+ * @param errnum The errno value.
+ */
+#define CA_MGM_THROW_ERRNO_MSG1(exType, msg, errnum) \
+throw ::ca_mgm::ExceptionDetail::Errno< exType >:: \
+ format(__FILE__, __LINE__, (msg), (errnum))
+
+
/**
* @brief MemoryException class declaration
*
@@ -71,7 +246,7 @@
* a MemoryException.
*
*/
- BLOCXX_DECLARE_EXCEPTION(Memory);
+ CA_MGM_DECLARE_EXCEPTION(Memory);
/**
* @brief RuntimeException class declaration
@@ -81,7 +256,7 @@
* calling the failing code.
*
*/
- BLOCXX_DECLARE_EXCEPTION(Runtime);
+ CA_MGM_DECLARE_EXCEPTION(Runtime);
/**
* @brief OverflowException class declaration
@@ -93,7 +268,7 @@
* type.
*
*/
- BLOCXX_DECLARE_EXCEPTION(Overflow);
+ CA_MGM_DECLARE_EXCEPTION(Overflow);
/**
* @brief SyntaxException class declaration
@@ -103,7 +278,7 @@
* in the configuration files or similar problems.
*
*/
- BLOCXX_DECLARE_EXCEPTION(Syntax);
+ CA_MGM_DECLARE_EXCEPTION(Syntax);
/**
@@ -113,7 +288,7 @@
* E.g. a string should be an email address, but it is not.
*
*/
- BLOCXX_DECLARE_EXCEPTION(Value);
+ CA_MGM_DECLARE_EXCEPTION(Value);
/**
* @brief SystemException class declaration
@@ -121,7 +296,7 @@
* A system error is thrown in case of reached system limits.
*
*/
- BLOCXX_DECLARE_EXCEPTION(System);
+ CA_MGM_DECLARE_EXCEPTION(System);
} // End of LIMAL_NAMESPACE
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA2.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA2.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA2.cc Sat Jul 10 18:47:47 2010
@@ -6,6 +6,7 @@
#include <limal/PerlRegEx.hpp>
#include <limal/Logger.hpp>
#include <limal/ca-mgm/CA.hpp>
+#include <limal/Exception.hpp>
#include <iostream>
#include <fstream>
@@ -106,7 +107,7 @@
}
}
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA3.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA3.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA3.cc Sat Jul 10 18:47:47 2010
@@ -107,7 +107,7 @@
}
}
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA4.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA4.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA4.cc Sat Jul 10 18:47:47 2010
@@ -6,6 +6,7 @@
#include <limal/PerlRegEx.hpp>
#include <limal/Logger.hpp>
#include <limal/ca-mgm/CA.hpp>
+#include <limal/Exception.hpp>
#include <iostream>
#include <fstream>
@@ -83,7 +84,7 @@
}
}
}
- catch(blocxx::Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA5.cc Sat Jul 10 18:47:47 2010
@@ -139,7 +139,7 @@
}
}
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA6.cc Sat Jul 10 18:47:47 2010
@@ -125,7 +125,7 @@
}
}
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA7.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA7.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA7.cc Sat Jul 10 18:47:47 2010
@@ -103,7 +103,7 @@
}
}
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA8.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA8.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA8.cc Sat Jul 10 18:47:47 2010
@@ -7,6 +7,7 @@
#include <limal/Logger.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
+#include <limal/Exception.hpp>
#include <iostream>
#include <fstream>
@@ -128,7 +129,7 @@
cout << "DONE" << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CA9.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CA9.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CA9.cc Sat Jul 10 18:47:47 2010
@@ -7,6 +7,7 @@
#include <limal/Logger.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
+#include <limal/Exception.hpp>
#include <iostream>
#include <fstream>
@@ -48,7 +49,7 @@
cout << "DONE" << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest.cc Sat Jul 10 18:47:47 2010
@@ -7,6 +7,7 @@
#include <limal/Logger.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
+#include <limal/Exception.hpp>
#include <iostream>
#include <fstream>
@@ -81,7 +82,7 @@
cout << "DONE" << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest2.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest2.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest2.cc Sat Jul 10 18:47:47 2010
@@ -7,6 +7,7 @@
#include <limal/Logger.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
+#include <limal/Exception.hpp>
#include <iostream>
#include <fstream>
@@ -76,7 +77,7 @@
cout << "DONE" << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest3.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest3.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest3.cc Sat Jul 10 18:47:47 2010
@@ -7,6 +7,7 @@
#include <limal/Logger.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
+#include <limal/Exception.hpp>
#include <iostream>
#include <fstream>
@@ -217,7 +218,7 @@
cout << "DONE" << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest4.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest4.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest4.cc Sat Jul 10 18:47:47 2010
@@ -7,6 +7,7 @@
#include <limal/Logger.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
+#include <limal/Exception.hpp>
#include <iostream>
#include <fstream>
@@ -209,7 +210,7 @@
cout << "DONE" << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest5.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest5.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest5.cc Sat Jul 10 18:47:47 2010
@@ -7,6 +7,7 @@
#include <limal/Logger.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
+#include <limal/Exception.hpp>
#include <iostream>
#include <fstream>
@@ -136,7 +137,7 @@
cout << "DONE" << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest6.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest6.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest6.cc Sat Jul 10 18:47:47 2010
@@ -7,6 +7,7 @@
#include <limal/Logger.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
+#include <limal/Exception.hpp>
#include <iostream>
#include <fstream>
@@ -136,7 +137,7 @@
cout << "DONE" << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ConvertTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ConvertTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ConvertTest.cc Sat Jul 10 18:47:47 2010
@@ -11,6 +11,7 @@
#include <limal/ByteBuffer.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/ca-mgm/LocalManagement.hpp>
+#include <limal/Exception.hpp>
#include <iostream>
#include <fstream>
@@ -187,7 +188,7 @@
}
}
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
@@ -206,7 +207,7 @@
cout << "Got DER Key" << endl;
}
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cout << "Got expected Exception." << endl;
cerr << "Exception:" << endl << e.getFile() << ": " << e.type() << ": " << e.getErrorCode() << ": ";
@@ -235,7 +236,7 @@
cout << "Got PKCS12 data" << endl;
}
}
- catch(Exception &e)
+ catch(ca_mgm::Exception &e)
{
cout << "Got expected Exception." << endl;
cerr << "Exception:" << endl << e.getFile() << ": " << e.type() << ": " << e.getErrorCode() << ": ";
@@ -270,7 +271,7 @@
//cout << pem.data() << endl;
}
}
- catch(Exception &e)
+ catch(ca_mgm::Exception &e)
{
cout << "Got expected Exception." << endl;
cerr << "Exception:" << endl << e.getFile() << ": " << e.type() << ": " << e.getErrorCode() << ": ";
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/DeleteCATest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/DeleteCATest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/DeleteCATest.cc Sat Jul 10 18:47:47 2010
@@ -54,7 +54,7 @@
cout << "DONE" << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ExportTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ExportTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ExportTest.cc Sat Jul 10 18:47:47 2010
@@ -292,7 +292,7 @@
cout << "DONE" << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/IPv6CheckTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/IPv6CheckTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/IPv6CheckTest.cc Sat Jul 10 18:47:47 2010
@@ -71,7 +71,7 @@
cout << "DONE" << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCATest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCATest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCATest.cc Sat Jul 10 18:47:47 2010
@@ -94,7 +94,7 @@
cout << "DONE" << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCommonCertificateTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCommonCertificateTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportCommonCertificateTest.cc Sat Jul 10 18:47:47 2010
@@ -153,7 +153,7 @@
cout << "DONE" << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportRequestTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportRequestTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ImportRequestTest.cc Sat Jul 10 18:47:47 2010
@@ -78,7 +78,7 @@
cout << "DONE" << endl;
}
- catch(blocxx::Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ListCATreeTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ListCATreeTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ListCATreeTest.cc Sat Jul 10 18:47:47 2010
@@ -7,6 +7,7 @@
#include <limal/Logger.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
+#include <limal/Exception.hpp>
#include <iostream>
#include <fstream>
@@ -51,7 +52,7 @@
cout << "DONE" << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ListTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ListTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ListTest.cc Sat Jul 10 18:47:47 2010
@@ -103,7 +103,7 @@
cout << "DONE" << endl;
}
- catch(blocxx::Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCATest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCATest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCATest.cc Sat Jul 10 18:47:47 2010
@@ -67,7 +67,7 @@
cout << "DONE" << endl;
}
- catch(blocxx::Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCRLTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCRLTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCRLTest.cc Sat Jul 10 18:47:47 2010
@@ -6,6 +6,7 @@
#include <limal/PerlRegEx.hpp>
#include <limal/Logger.hpp>
#include <limal/ca-mgm/CA.hpp>
+#include <limal/Exception.hpp>
#include <iostream>
#include <fstream>
@@ -90,7 +91,7 @@
cout << crl.getCRLAsText() << endl;
cout << crl.getExtensionsAsText() << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCertificateTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCertificateTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCertificateTest.cc Sat Jul 10 18:47:47 2010
@@ -6,6 +6,7 @@
#include <limal/PerlRegEx.hpp>
#include <limal/Logger.hpp>
#include <limal/ca-mgm/CA.hpp>
+#include <limal/Exception.hpp>
#include <iostream>
#include <fstream>
@@ -85,7 +86,7 @@
cout << cd.getCertificateAsText() << endl;
cout << cd.getExtensionsAsText() << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCertificateTest2.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCertificateTest2.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseCertificateTest2.cc Sat Jul 10 18:47:47 2010
@@ -7,6 +7,7 @@
#include <limal/Logger.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/ca-mgm/LocalManagement.hpp>
+#include <limal/Exception.hpp>
#include <iostream>
#include <fstream>
@@ -89,7 +90,7 @@
cout << cd.getCertificateAsText() << endl;
cout << cd.getExtensionsAsText() << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseRequestTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseRequestTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/ParseRequestTest.cc Sat Jul 10 18:47:47 2010
@@ -6,6 +6,7 @@
#include <limal/PerlRegEx.hpp>
#include <limal/Logger.hpp>
#include <limal/ca-mgm/CA.hpp>
+#include <limal/Exception.hpp>
#include <iostream>
#include <fstream>
@@ -87,7 +88,7 @@
cout << cd.getExtensionsAsText() << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/RemoveCertificateTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/RemoveCertificateTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/RemoveCertificateTest.cc Sat Jul 10 18:47:47 2010
@@ -202,7 +202,7 @@
}
cout << "DONE" << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/RemoveRequestTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/RemoveRequestTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/RemoveRequestTest.cc Sat Jul 10 18:47:47 2010
@@ -80,7 +80,7 @@
}
cout << "DONE" << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/RequestTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/RequestTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/RequestTest.cc Sat Jul 10 18:47:47 2010
@@ -7,6 +7,7 @@
#include <limal/Logger.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
+#include <limal/Exception.hpp>
#include <iostream>
#include <fstream>
@@ -122,7 +123,7 @@
cout << "DONE" << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest.cc Sat Jul 10 18:47:47 2010
@@ -7,6 +7,7 @@
#include <limal/Logger.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
+#include <limal/Exception.hpp>
#include <iostream>
#include <fstream>
@@ -113,7 +114,7 @@
}
cout << "DONE" << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest2.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest2.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest2.cc Sat Jul 10 18:47:47 2010
@@ -8,6 +8,7 @@
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/ca-mgm/CRLReason.hpp>
+#include <limal/Exception.hpp>
#include <iostream>
#include <fstream>
@@ -120,7 +121,7 @@
cout << "DONE" << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest3.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest3.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest3.cc Sat Jul 10 18:47:47 2010
@@ -8,6 +8,7 @@
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/ca-mgm/CRLReason.hpp>
+#include <limal/Exception.hpp>
#include <iostream>
#include <fstream>
@@ -120,7 +121,7 @@
cout << "DONE" << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest4.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest4.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest4.cc Sat Jul 10 18:47:47 2010
@@ -8,6 +8,7 @@
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/ca-mgm/CRLReason.hpp>
+#include <limal/Exception.hpp>
#include <iostream>
#include <fstream>
@@ -119,7 +120,7 @@
}
cout << "DONE" << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest5.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest5.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/RevokeTest5.cc Sat Jul 10 18:47:47 2010
@@ -8,6 +8,7 @@
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/ca-mgm/CRLReason.hpp>
+#include <limal/Exception.hpp>
#include <iostream>
#include <fstream>
@@ -119,7 +120,7 @@
}
cout << "DONE" << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/SubCATest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/SubCATest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/SubCATest.cc Sat Jul 10 18:47:47 2010
@@ -7,6 +7,7 @@
#include <limal/Logger.hpp>
#include <limal/PathInfo.hpp>
#include <limal/ca-mgm/CA.hpp>
+#include <limal/Exception.hpp>
#include <iostream>
#include <fstream>
@@ -79,7 +80,7 @@
cout << "DONE" << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt Sat Jul 10 18:47:47 2010
@@ -1,14 +1,14 @@
-d12f85f32848ae7f9f1d8064813aaa53-1278263331 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-68b3a1b7290aadfd42361b1b3c14e69a-1278263333 /C=DE/CN=Test Server Certificate\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1278263339 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1278263343 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1278263346 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-d12f85f32848ae7f9f1d8064813aaa53-1278263357 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-c293624b6a877f401407ce8f8f1f327e-1278263358 /C=DE/L=Nuremberg/O=SUSE Linux GmbH/OU=IT/CN=SUSE User CA/emailAddress=security-team(a)suse.de
-d12f85f32848ae7f9f1d8064813aaa53-1278263359 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-c1943ae4b9bd7320fae3e29f217483e3-1278263360 /C=DE/CN=Test Request/emailAddress=suse(a)suse.de
-d816690a832b0e52becd255d3a62e975-1278263363 /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse(a)suse.de
-9198f6798d9da70d7cbfb67b610633f5-1278263366 /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse(a)suse.de
-3e248858337c2b46dc67a0f9389376dd-1278263369 /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse(a)suse.de
-bf04fdd95062554800c1556085f47063-1278263372 /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse(a)suse.de
-9797ac11af29f94b82c1e5b0499ab5f2-1278263375 /C=DE/CN=Test Sub CA/emailAddress=suse(a)suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1278780371 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
+68b3a1b7290aadfd42361b1b3c14e69a-1278780373 /C=DE/CN=Test Server Certificate\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1278780380 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1278780384 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1278780387 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1278780399 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
+c293624b6a877f401407ce8f8f1f327e-1278780401 /C=DE/L=Nuremberg/O=SUSE Linux GmbH/OU=IT/CN=SUSE User CA/emailAddress=security-team(a)suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1278780402 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
+c1943ae4b9bd7320fae3e29f217483e3-1278780403 /C=DE/CN=Test Request/emailAddress=suse(a)suse.de
+d816690a832b0e52becd255d3a62e975-1278780406 /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse(a)suse.de
+9198f6798d9da70d7cbfb67b610633f5-1278780408 /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse(a)suse.de
+3e248858337c2b46dc67a0f9389376dd-1278780411 /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse(a)suse.de
+bf04fdd95062554800c1556085f47063-1278780414 /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse(a)suse.de
+9797ac11af29f94b82c1e5b0499ab5f2-1278780415 /C=DE/CN=Test Sub CA/emailAddress=suse(a)suse.de
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt Sat Jul 10 18:47:47 2010
@@ -1,11 +1,11 @@
-V 110704170852Z 01 unknown /C=DE/CN=Test CA/SUSE Inc.\Gmbh/emailAddress=suse(a)suse.de
-V 110704170853Z 02 unknown /C=DE/CN=Test Server Certificate/SUSE Inc.\Gmbh/emailAddress=suse(a)suse.de
-V 110704170856Z 03 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-V 110704170900Z 04 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-V 110704170904Z 05 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-R 110704170922Z 100704170923Z 06 unknown /C=DE/CN=Test Certificate for revocation/emailAddress=suse(a)suse.de
-R 110704170923Z 100704170925Z,holdInstruction,holdInstructionCallIssuer 07 unknown /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse(a)suse.de
-R 110704170926Z 100704170929Z,keyTime,20100704165249Z 08 unknown /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse(a)suse.de
-R 110704170929Z 100704170932Z,CAkeyTime,20100704165252Z 09 unknown /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse(a)suse.de
-R 110704170932Z 100704170934Z,holdInstruction,1.6.21.43 0A unknown /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse(a)suse.de
-V 120703170935Z 0B unknown /C=DE/CN=Test Sub CA/emailAddress=suse(a)suse.de
+V 110710164612Z 01 unknown /C=DE/CN=Test CA/SUSE Inc.\Gmbh/emailAddress=suse(a)suse.de
+V 110710164613Z 02 unknown /C=DE/CN=Test Server Certificate/SUSE Inc.\Gmbh/emailAddress=suse(a)suse.de
+V 110710164617Z 03 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+V 110710164621Z 04 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+V 110710164625Z 05 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+R 110710164644Z 100710164646Z 06 unknown /C=DE/CN=Test Certificate for revocation/emailAddress=suse(a)suse.de
+R 110710164646Z 100710164647Z,holdInstruction,holdInstructionCallIssuer 07 unknown /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse(a)suse.de
+R 110710164648Z 100710164651Z,keyTime,20100710163011Z 08 unknown /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse(a)suse.de
+R 110710164651Z 100710164653Z,CAkeyTime,20100710163013Z 09 unknown /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse(a)suse.de
+R 110710164654Z 100710164654Z,holdInstruction,1.6.21.43 0A unknown /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse(a)suse.de
+V 120709164655Z 0B unknown /C=DE/CN=Test Sub CA/emailAddress=suse(a)suse.de
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/.rand
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
Binary files - no diff available.
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem Sat Jul 10 18:47:47 2010
@@ -1,7 +1,7 @@
-----BEGIN X509 CRL-----
MIIC+TCCAeECAQEwDQYJKoZIhvcNAQEFBQAwQzELMAkGA1UEBhMCREUxFzAVBgNV
BAMTDlN0YXRpYyBUZXN0IENBMRswGQYJKoZIhvcNAQkBFgxzdXNlQHN1c2UuZGUX
-DTEwMDcwNDE3MDkzN1oXDTEwMDcwNTE3MDkzN1owgfAwEgIBAxcNMDUwODE4MTQx
+DTEwMDcxMDE2NDY1N1oXDTEwMDcxMTE2NDY1N1owgfAwEgIBAxcNMDUwODE4MTQx
MzIzWjAyAgEEFw0wNTA4MTgxNDEzMjVaMB4wCgYDVR0VBAMKAQYwEAYDVR0XBAkG
ByqGSM44AgIwOgIBBRcNMDUwODE4MTQxMzI2WjAmMAoGA1UdFQQDCgEBMBgGA1Ud
GAQRGA8yMDA1MDgxODE1NTY0NlowOgIBBhcNMDUwODE4MTQxMzI4WjAmMAoGA1Ud
@@ -9,10 +9,10 @@
ODE4WjAaMAoGA1UdFQQDCgEGMAwGA1UdFwQFBgMuFSugdzB1MHMGA1UdIwRsMGqA
FDIAwASkKojCPsrVvdhM01KIIH87oUekRTBDMQswCQYDVQQGEwJERTEXMBUGA1UE
AxMOU3RhdGljIFRlc3QgQ0ExGzAZBgkqhkiG9w0BCQEWDHN1c2VAc3VzZS5kZYIJ
-AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQAK0PZ5ztRnz45zI1/bzQC060as
-9QXpYpZtzJWDHCfzlE64d4/EJjoP69clsYqRSsa0JxM+iJHOowIb/FJJQ0S4jJ7R
-5H5bbv08kWRqCKmVx8XHJFtfpc+fwMVg6Ut8szDJWUswNWP3zEaZKrMzY3u9FdYq
-OZ3nH6vc9pAo5se2Y/c04GSUbQK8ynAOqCeXHmLC0IzVzsw/JaCslypr4DSN7bJx
-mnGRRXwGS6U0InAzAJHYSF4yu/13O6QnXlY3moLBJZaPbRuiLrNyWrbjjN4xoQCP
-fMvbQFnXwKiL53kK49BkK9lTQ1vukeZAfszCasJI9LIdrBQjDIrMjYTIBBIC
+AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQAOcwfD/NxczaBnB27TtG65Bm6d
+Yrfi+Y3qY6gxXAsX4XkNDjYjHZEJH4/36BN0NEyqz6AWqB+3WX/96omzDBvNE51D
+gEYkZYX9zeoZxWHZPwFz/m0K7zNkiZ5QSkhHfYs+J5p7WZo7meBu7biyhFj+Icm7
+f0IxZo9y/siSP5Q+xkP919K6vKacFExiCVfuHlZ6Kgzub0ckVtAUbX2c2a4kcBcV
+5vERTWdNEBxFyNSa3+Cv2J2r7Bi9V9TzEKXqNsDnugboUptwBOdn1T9z69hXDa0S
+pNYKX68swGITbRj84LIG9RuJpSpD8eV9G8A4ecDqZD7vZW2vJ8dZ8XS2Hzki
-----END X509 CRL-----
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/UpdateDBTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/UpdateDBTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/UpdateDBTest.cc Sat Jul 10 18:47:47 2010
@@ -64,7 +64,7 @@
cout << "DONE" << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/VerifyTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/VerifyTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/VerifyTest.cc Sat Jul 10 18:47:47 2010
@@ -70,7 +70,7 @@
cout << serial << ": Verify success" << endl;
}
- catch(RuntimeException &e)
+ catch(ca_mgm::RuntimeException &e)
{
if(r1.match(e.what()))
{
@@ -91,7 +91,7 @@
cout << "DONE" << endl;
}
- catch(Exception& e)
+ catch(ca_mgm::Exception& e)
{
cerr << e << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/iniParser.cc Sat Jul 10 18:47:47 2010
@@ -5,6 +5,7 @@
#include <limal/String.hpp>
#include <limal/Logger.hpp>
#include "INIParser/INIParser.hpp"
+#include <limal/Exception.hpp>
#include <iostream>
#include <fstream>
--
To unsubscribe, e-mail: limal-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: limal-commit+help(a)opensuse.org
1
0
r2684 - in /limal-branches/mc-devel/limal-ca-mgm: src/ testsuite/TestRepos/Test_CA1/ testsuite/TestRepos/Test_CA2/ testsuite/TestRepos/Test_CA2/crl/
by mcalmer＠svn.opensuse.org 04 Jul '10
by mcalmer＠svn.opensuse.org 04 Jul '10
04 Jul '10
Author: mcalmer
Date: Sun Jul 4 19:09:56 2010
New Revision: 2684
URL: http://svn.opensuse.org/viewcvs/limal?rev=2684&view=rev
Log:
more Format removed
Modified:
limal-branches/mc-devel/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/BasicConstraintsExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CRLData.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CRLData_Priv.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CRLReason_Priv.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CertificateData.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CertificateIssueData.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CertificatePoliciesExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/ExtendedKeyUsageExt.cpp
limal-branches/mc-devel/limal-ca-mgm/src/RequestData.cpp
limal-branches/mc-devel/limal-ca-mgm/src/RequestData_Priv.cpp
limal-branches/mc-devel/limal-ca-mgm/src/RequestGenerationData.cpp
limal-branches/mc-devel/limal-ca-mgm/src/StringExtensions.cpp
limal-branches/mc-devel/limal-ca-mgm/src/SubjectKeyIdentifierExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/.rand
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem
Modified: limal-branches/mc-devel/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp Sun Jul 4 19:09:56 2010
@@ -24,7 +24,7 @@
#include <limal/ca-mgm/CA.hpp>
#include <limal/ValueRegExCheck.hpp>
#include <limal/Exception.hpp>
-#include <blocxx/Format.hpp>
+
#include "Utils.hpp"
Modified: limal-branches/mc-devel/limal-ca-mgm/src/BasicConstraintsExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/BasicConstraintsExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/BasicConstraintsExtension.cpp Sun Jul 4 19:09:56 2010
@@ -23,7 +23,7 @@
#include <limal/ca-mgm/BasicConstraintsExtension.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
-#include <blocxx/Format.hpp>
+
#include "Utils.hpp"
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CRLData.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CRLData.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CRLData.cpp Sun Jul 4 19:09:56 2010
@@ -23,7 +23,7 @@
#include <limal/ca-mgm/CRLData.hpp>
#include <limal/ValueRegExCheck.hpp>
#include <limal/Exception.hpp>
-#include <blocxx/Format.hpp>
+
#include "CRLDataImpl.hpp"
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CRLData_Priv.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CRLData_Priv.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CRLData_Priv.cpp Sun Jul 4 19:09:56 2010
@@ -33,7 +33,7 @@
#include <limal/PathInfo.hpp>
#include <limal/ValueRegExCheck.hpp>
#include <limal/Exception.hpp>
-#include <blocxx/Format.hpp>
+
#include <limal/Date.hpp>
#include <limal/String.hpp>
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CRLReason_Priv.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CRLReason_Priv.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CRLReason_Priv.cpp Sun Jul 4 19:09:56 2010
@@ -29,7 +29,7 @@
#include <openssl/evp.h>
#include <limal/Exception.hpp>
-#include <blocxx/Format.hpp>
+
#include <limal/Date.hpp>
#include "Utils.hpp"
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CertificateData.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CertificateData.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CertificateData.cpp Sun Jul 4 19:09:56 2010
@@ -23,7 +23,7 @@
#include <limal/ca-mgm/CertificateData.hpp>
#include <limal/ValueRegExCheck.hpp>
#include <limal/Exception.hpp>
-#include <blocxx/Format.hpp>
+
#include "CertificateDataImpl.hpp"
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CertificateIssueData.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CertificateIssueData.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CertificateIssueData.cpp Sun Jul 4 19:09:56 2010
@@ -23,7 +23,7 @@
#include <limal/ca-mgm/CA.hpp>
#include <limal/ca-mgm/CertificateIssueData.hpp>
#include <limal/Exception.hpp>
-#include <blocxx/Format.hpp>
+
#include <limal/Date.hpp>
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CertificatePoliciesExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CertificatePoliciesExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CertificatePoliciesExtension.cpp Sun Jul 4 19:09:56 2010
@@ -23,7 +23,7 @@
#include <limal/ca-mgm/CA.hpp>
#include <limal/ValueRegExCheck.hpp>
#include <limal/Exception.hpp>
-#include <blocxx/Format.hpp>
+
#include "Utils.hpp"
Modified: limal-branches/mc-devel/limal-ca-mgm/src/ExtendedKeyUsageExt.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/ExtendedKeyUsageExt.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/ExtendedKeyUsageExt.cpp Sun Jul 4 19:09:56 2010
@@ -23,7 +23,7 @@
#include <limal/ca-mgm/CA.hpp>
#include <limal/ValueRegExCheck.hpp>
#include <limal/Exception.hpp>
-#include <blocxx/Format.hpp>
+
#include "Utils.hpp"
Modified: limal-branches/mc-devel/limal-ca-mgm/src/RequestData.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/RequestData.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/RequestData.cpp Sun Jul 4 19:09:56 2010
@@ -23,7 +23,7 @@
#include <limal/ca-mgm/RequestData.hpp>
#include <limal/ValueRegExCheck.hpp>
#include <limal/Exception.hpp>
-#include <blocxx/Format.hpp>
+
#include "Utils.hpp"
#include "RequestDataImpl.hpp"
Modified: limal-branches/mc-devel/limal-ca-mgm/src/RequestData_Priv.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/RequestData_Priv.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/RequestData_Priv.cpp Sun Jul 4 19:09:56 2010
@@ -30,7 +30,7 @@
#include <openssl/rsa.h>
#include <openssl/evp.h>
-#include <blocxx/Format.hpp>
+
#include <limal/Exception.hpp>
#include <limal/PathUtils.hpp>
#include <limal/PathInfo.hpp>
Modified: limal-branches/mc-devel/limal-ca-mgm/src/RequestGenerationData.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/RequestGenerationData.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/RequestGenerationData.cpp Sun Jul 4 19:09:56 2010
@@ -24,7 +24,7 @@
#include <limal/ca-mgm/RequestGenerationData.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
-#include <blocxx/Format.hpp>
+
#include "Utils.hpp"
Modified: limal-branches/mc-devel/limal-ca-mgm/src/StringExtensions.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/StringExtensions.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/StringExtensions.cpp Sun Jul 4 19:09:56 2010
@@ -24,7 +24,7 @@
#include <limal/ca-mgm/CA.hpp>
#include <limal/ValueRegExCheck.hpp>
#include <limal/Exception.hpp>
-#include <blocxx/Format.hpp>
+
#include "Utils.hpp"
Modified: limal-branches/mc-devel/limal-ca-mgm/src/SubjectKeyIdentifierExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/SubjectKeyIdentifierExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/SubjectKeyIdentifierExtension.cpp Sun Jul 4 19:09:56 2010
@@ -24,7 +24,7 @@
#include <limal/ca-mgm/CA.hpp>
#include <limal/ValueRegExCheck.hpp>
#include <limal/Exception.hpp>
-#include <blocxx/Format.hpp>
+
#include "Utils.hpp"
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt Sun Jul 4 19:09:56 2010
@@ -1,14 +1,14 @@
-d12f85f32848ae7f9f1d8064813aaa53-1278262531 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-68b3a1b7290aadfd42361b1b3c14e69a-1278262532 /C=DE/CN=Test Server Certificate\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1278262536 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1278262541 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1278262545 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-d12f85f32848ae7f9f1d8064813aaa53-1278262556 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-c293624b6a877f401407ce8f8f1f327e-1278262557 /C=DE/L=Nuremberg/O=SUSE Linux GmbH/OU=IT/CN=SUSE User CA/emailAddress=security-team(a)suse.de
-d12f85f32848ae7f9f1d8064813aaa53-1278262559 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-c1943ae4b9bd7320fae3e29f217483e3-1278262560 /C=DE/CN=Test Request/emailAddress=suse(a)suse.de
-d816690a832b0e52becd255d3a62e975-1278262564 /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse(a)suse.de
-9198f6798d9da70d7cbfb67b610633f5-1278262565 /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse(a)suse.de
-3e248858337c2b46dc67a0f9389376dd-1278262566 /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse(a)suse.de
-bf04fdd95062554800c1556085f47063-1278262567 /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse(a)suse.de
-9797ac11af29f94b82c1e5b0499ab5f2-1278262569 /C=DE/CN=Test Sub CA/emailAddress=suse(a)suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1278263331 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
+68b3a1b7290aadfd42361b1b3c14e69a-1278263333 /C=DE/CN=Test Server Certificate\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1278263339 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1278263343 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1278263346 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1278263357 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
+c293624b6a877f401407ce8f8f1f327e-1278263358 /C=DE/L=Nuremberg/O=SUSE Linux GmbH/OU=IT/CN=SUSE User CA/emailAddress=security-team(a)suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1278263359 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
+c1943ae4b9bd7320fae3e29f217483e3-1278263360 /C=DE/CN=Test Request/emailAddress=suse(a)suse.de
+d816690a832b0e52becd255d3a62e975-1278263363 /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse(a)suse.de
+9198f6798d9da70d7cbfb67b610633f5-1278263366 /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse(a)suse.de
+3e248858337c2b46dc67a0f9389376dd-1278263369 /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse(a)suse.de
+bf04fdd95062554800c1556085f47063-1278263372 /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse(a)suse.de
+9797ac11af29f94b82c1e5b0499ab5f2-1278263375 /C=DE/CN=Test Sub CA/emailAddress=suse(a)suse.de
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt Sun Jul 4 19:09:56 2010
@@ -1,11 +1,11 @@
-V 110704165532Z 01 unknown /C=DE/CN=Test CA/SUSE Inc.\Gmbh/emailAddress=suse(a)suse.de
-V 110704165532Z 02 unknown /C=DE/CN=Test Server Certificate/SUSE Inc.\Gmbh/emailAddress=suse(a)suse.de
-V 110704165534Z 03 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-V 110704165538Z 04 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-V 110704165543Z 05 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-R 110704165601Z 100704165603Z 06 unknown /C=DE/CN=Test Certificate for revocation/emailAddress=suse(a)suse.de
-R 110704165604Z 100704165604Z,holdInstruction,holdInstructionCallIssuer 07 unknown /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse(a)suse.de
-R 110704165605Z 100704165606Z,keyTime,20100704163926Z 08 unknown /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse(a)suse.de
-R 110704165606Z 100704165607Z,CAkeyTime,20100704163927Z 09 unknown /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse(a)suse.de
-R 110704165607Z 100704165608Z,holdInstruction,1.6.21.43 0A unknown /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse(a)suse.de
-V 120703165609Z 0B unknown /C=DE/CN=Test Sub CA/emailAddress=suse(a)suse.de
+V 110704170852Z 01 unknown /C=DE/CN=Test CA/SUSE Inc.\Gmbh/emailAddress=suse(a)suse.de
+V 110704170853Z 02 unknown /C=DE/CN=Test Server Certificate/SUSE Inc.\Gmbh/emailAddress=suse(a)suse.de
+V 110704170856Z 03 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+V 110704170900Z 04 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+V 110704170904Z 05 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+R 110704170922Z 100704170923Z 06 unknown /C=DE/CN=Test Certificate for revocation/emailAddress=suse(a)suse.de
+R 110704170923Z 100704170925Z,holdInstruction,holdInstructionCallIssuer 07 unknown /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse(a)suse.de
+R 110704170926Z 100704170929Z,keyTime,20100704165249Z 08 unknown /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse(a)suse.de
+R 110704170929Z 100704170932Z,CAkeyTime,20100704165252Z 09 unknown /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse(a)suse.de
+R 110704170932Z 100704170934Z,holdInstruction,1.6.21.43 0A unknown /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse(a)suse.de
+V 120703170935Z 0B unknown /C=DE/CN=Test Sub CA/emailAddress=suse(a)suse.de
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/.rand
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
Binary files - no diff available.
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem Sun Jul 4 19:09:56 2010
@@ -1,7 +1,7 @@
-----BEGIN X509 CRL-----
MIIC+TCCAeECAQEwDQYJKoZIhvcNAQEFBQAwQzELMAkGA1UEBhMCREUxFzAVBgNV
BAMTDlN0YXRpYyBUZXN0IENBMRswGQYJKoZIhvcNAQkBFgxzdXNlQHN1c2UuZGUX
-DTEwMDcwNDE2NTYxMloXDTEwMDcwNTE2NTYxMlowgfAwEgIBAxcNMDUwODE4MTQx
+DTEwMDcwNDE3MDkzN1oXDTEwMDcwNTE3MDkzN1owgfAwEgIBAxcNMDUwODE4MTQx
MzIzWjAyAgEEFw0wNTA4MTgxNDEzMjVaMB4wCgYDVR0VBAMKAQYwEAYDVR0XBAkG
ByqGSM44AgIwOgIBBRcNMDUwODE4MTQxMzI2WjAmMAoGA1UdFQQDCgEBMBgGA1Ud
GAQRGA8yMDA1MDgxODE1NTY0NlowOgIBBhcNMDUwODE4MTQxMzI4WjAmMAoGA1Ud
@@ -9,10 +9,10 @@
ODE4WjAaMAoGA1UdFQQDCgEGMAwGA1UdFwQFBgMuFSugdzB1MHMGA1UdIwRsMGqA
FDIAwASkKojCPsrVvdhM01KIIH87oUekRTBDMQswCQYDVQQGEwJERTEXMBUGA1UE
AxMOU3RhdGljIFRlc3QgQ0ExGzAZBgkqhkiG9w0BCQEWDHN1c2VAc3VzZS5kZYIJ
-AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQB/SLGeASU2Gh53qt0BAqd72oV+
-CRqTtWBPTqWWq725/fjebLqo77+0/vyRrqIge14LeuKe2e2aMsfKDSjHfgW0UF44
-SynM+JGYf7IiBSoE/lOMDtHAWeVrX/Z5F2OgjybVmBKXgox5MLhPMDtV6o2z/8Su
-6PNrO+ef1ibepx0zmXHScfPSWthlyN7PlMTgKapFBcLiHndQ0zWbtCOkETmFaFzo
-Q+x+nBF6cWSHjvcy0aYSzrbEQlPOxXU3zANgzLWwQAgl1ZtlvrnFXrot/67xDNSL
-SeQwPU6CkimwC/M1foZ8s9ew/ly+ejXfmyp1O44wx5UjdKZPWmejX2DY/+gF
+AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQAK0PZ5ztRnz45zI1/bzQC060as
+9QXpYpZtzJWDHCfzlE64d4/EJjoP69clsYqRSsa0JxM+iJHOowIb/FJJQ0S4jJ7R
+5H5bbv08kWRqCKmVx8XHJFtfpc+fwMVg6Ut8szDJWUswNWP3zEaZKrMzY3u9FdYq
+OZ3nH6vc9pAo5se2Y/c04GSUbQK8ynAOqCeXHmLC0IzVzsw/JaCslypr4DSN7bJx
+mnGRRXwGS6U0InAzAJHYSF4yu/13O6QnXlY3moLBJZaPbRuiLrNyWrbjjN4xoQCP
+fMvbQFnXwKiL53kK49BkK9lTQ1vukeZAfszCasJI9LIdrBQjDIrMjYTIBBIC
-----END X509 CRL-----
--
To unsubscribe, e-mail: limal-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: limal-commit+help(a)opensuse.org
1
0
r2683 - /limal-branches/mc-devel/limal-ca-mgm/src/CRLGenerationData.cpp
by mcalmer＠svn.opensuse.org 04 Jul '10
by mcalmer＠svn.opensuse.org 04 Jul '10
04 Jul '10
Author: mcalmer
Date: Sun Jul 4 19:06:38 2010
New Revision: 2683
URL: http://svn.opensuse.org/viewcvs/limal?rev=2683&view=rev
Log:
yet another Format removed
Modified:
limal-branches/mc-devel/limal-ca-mgm/src/CRLGenerationData.cpp
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CRLGenerationData.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CRLGenerationData.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CRLGenerationData.cpp Sun Jul 4 19:06:38 2010
@@ -23,7 +23,6 @@
#include <limal/ca-mgm/CA.hpp>
#include <limal/ca-mgm/CRLGenerationData.hpp>
#include <limal/Exception.hpp>
-#include <blocxx/Format.hpp>
#include "Utils.hpp"
--
To unsubscribe, e-mail: limal-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: limal-commit+help(a)opensuse.org
1
0
r2682 - in /limal-branches/mc-devel/limal-ca-mgm: src/ src/limal/ src/limal/ca-mgm/ testsuite/TestRepos/Test_CA1/ testsuite/TestRepos/Test_CA2/ testsuite/TestRepos/Test_CA2/crl/
by mcalmer＠svn.opensuse.org 04 Jul '10
by mcalmer＠svn.opensuse.org 04 Jul '10
04 Jul '10
Author: mcalmer
Date: Sun Jul 4 18:59:33 2010
New Revision: 2682
URL: http://svn.opensuse.org/viewcvs/limal?rev=2682&view=rev
Log:
blocxx::COWIntrusiveReference => RWCOW_pointer
Modified:
limal-branches/mc-devel/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierGenerateExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/BasicConstraintsExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/BitExtensions.cpp
limal-branches/mc-devel/limal-ca-mgm/src/ByteBuffer.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CAConfig.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CRLData.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CRLDataImpl.hpp
limal-branches/mc-devel/limal-ca-mgm/src/CRLDistributionPointsExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CRLGenerationData.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CRLReason.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CertificateData.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CertificateDataImpl.hpp
limal-branches/mc-devel/limal-ca-mgm/src/CertificateIssueData.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CertificatePoliciesExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/DNObject.cpp
limal-branches/mc-devel/limal-ca-mgm/src/DNObjectImpl.hpp
limal-branches/mc-devel/limal-ca-mgm/src/ExtendedKeyUsageExt.cpp
limal-branches/mc-devel/limal-ca-mgm/src/ExtensionBase.cpp
limal-branches/mc-devel/limal-ca-mgm/src/IssuerAlternativeNameExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/LiteralValues.cpp
limal-branches/mc-devel/limal-ca-mgm/src/RequestDataImpl.hpp
limal-branches/mc-devel/limal-ca-mgm/src/RequestGenerationData.cpp
limal-branches/mc-devel/limal-ca-mgm/src/StringExtensions.cpp
limal-branches/mc-devel/limal-ca-mgm/src/SubjectAlternativeNameExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/SubjectKeyIdentifierExtension.cpp
limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLExtensionsImpl.hpp
limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLGenerationExtensions.cpp
limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateExtensionsImpl.hpp
limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateIssueExtensions.cpp
limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensions.cpp
limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensionsImpl.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ByteBuffer.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/AuthorityInfoAccessExtension.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/AuthorityKeyIdentifierExtension.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/AuthorityKeyIdentifierGenerateExtension.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/BasicConstraintsExtension.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/BitExtensions.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CA.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CAConfig.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLData.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLDistributionPointsExtension.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLGenerationData.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLReason.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificateData.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificateIssueData.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificatePoliciesExtension.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/DNObject.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/ExtendedKeyUsageExt.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/ExtensionBase.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/IssuerAlternativeNameExtension.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/LiteralValues.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/RequestData.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/RequestGenerationData.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/StringExtensions.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/SubjectAlternativeNameExtension.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/SubjectKeyIdentifierExtension.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CRLExtensions.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CRLGenerationExtensions.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CertificateExtensions.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CertificateIssueExtensions.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3RequestExtensions.hpp
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/.rand
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem
Modified: limal-branches/mc-devel/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/AuthorityInfoAccessExtension.cpp Sun Jul 4 18:59:33 2010
@@ -25,7 +25,7 @@
#include <limal/ValueRegExCheck.hpp>
#include <limal/Exception.hpp>
#include <blocxx/Format.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "Utils.hpp"
@@ -36,7 +36,7 @@
using namespace blocxx;
-class AuthorityInformationImpl : public blocxx::COWIntrusiveCountableBase
+class AuthorityInformationImpl
{
public:
@@ -50,9 +50,8 @@
{}
AuthorityInformationImpl(const AuthorityInformationImpl &ai)
- : blocxx::COWIntrusiveCountableBase(ai),
- accessOID(ai.accessOID),
- location(ai.location)
+ : accessOID(ai.accessOID)
+ , location(ai.location)
{}
virtual ~AuthorityInformationImpl() {}
@@ -67,7 +66,7 @@
};
-class AuthorityInfoAccessExtImpl : public blocxx::COWIntrusiveCountableBase
+class AuthorityInfoAccessExtImpl
{
public:
AuthorityInfoAccessExtImpl()
@@ -75,8 +74,7 @@
{}
AuthorityInfoAccessExtImpl(const AuthorityInfoAccessExtImpl &aie)
- : blocxx::COWIntrusiveCountableBase(aie),
- info(aie.info)
+ : info(aie.info)
{}
virtual ~AuthorityInfoAccessExtImpl() {}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierExtension.cpp Sun Jul 4 18:59:33 2010
@@ -21,7 +21,7 @@
/-*/
#include <limal/ca-mgm/AuthorityKeyIdentifierExtension.hpp>
#include <limal/Exception.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "Utils.hpp"
@@ -31,7 +31,7 @@
using namespace ca_mgm;
using namespace blocxx;
-class AuthorityKeyIdentifierExtImpl : public blocxx::COWIntrusiveCountableBase
+class AuthorityKeyIdentifierExtImpl
{
public:
@@ -42,8 +42,7 @@
{}
AuthorityKeyIdentifierExtImpl(const AuthorityKeyIdentifierExtImpl &impl)
- : COWIntrusiveCountableBase(impl)
- , keyid(impl.keyid)
+ : keyid(impl.keyid)
, DirName(impl.DirName)
, serial(impl.serial)
{}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierGenerateExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierGenerateExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/AuthorityKeyIdentifierGenerateExtension.cpp Sun Jul 4 18:59:33 2010
@@ -23,7 +23,7 @@
#include <limal/ca-mgm/AuthorityKeyIdentifierGenerateExtension.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "Utils.hpp"
@@ -33,7 +33,7 @@
using namespace ca_mgm;
using namespace blocxx;
-class AuthorityKeyIdentifierGenerateExtImpl : public blocxx::COWIntrusiveCountableBase
+class AuthorityKeyIdentifierGenerateExtImpl
{
public:
@@ -49,8 +49,7 @@
{}
AuthorityKeyIdentifierGenerateExtImpl(const AuthorityKeyIdentifierGenerateExtImpl& impl)
- : COWIntrusiveCountableBase(impl)
- , keyid(impl.keyid)
+ : keyid(impl.keyid)
, issuer(impl.issuer)
{}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/BasicConstraintsExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/BasicConstraintsExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/BasicConstraintsExtension.cpp Sun Jul 4 18:59:33 2010
@@ -24,7 +24,7 @@
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
#include <blocxx/Format.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "Utils.hpp"
@@ -34,7 +34,7 @@
using namespace ca_mgm;
using namespace blocxx;
-class BasicConstraintsExtImpl : public blocxx::COWIntrusiveCountableBase
+class BasicConstraintsExtImpl
{
public:
@@ -49,8 +49,7 @@
{}
BasicConstraintsExtImpl(const BasicConstraintsExtImpl& impl)
- : COWIntrusiveCountableBase(impl)
- , ca(impl.ca)
+ : ca(impl.ca)
, pathlen(impl.pathlen)
{}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/BitExtensions.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/BitExtensions.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/BitExtensions.cpp Sun Jul 4 18:59:33 2010
@@ -33,7 +33,7 @@
using namespace blocxx;
class BitExtensionImpl
-//: public blocxx::COWIntrusiveCountableBase
+//
{
public:
BitExtensionImpl()
Modified: limal-branches/mc-devel/limal-ca-mgm/src/ByteBuffer.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/ByteBuffer.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/ByteBuffer.cpp Sun Jul 4 18:59:33 2010
@@ -20,7 +20,7 @@
#include <limal/ByteBuffer.hpp>
#include <limal/String.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include <cstring>
@@ -38,7 +38,7 @@
// --- Inner ByteBufferImpl class ----------------------------------------
// -----------------------------------------------------------------------
class ByteBufferImpl
- : public blocxx::COWIntrusiveCountableBase
+
{
public:
@@ -65,8 +65,7 @@
}
ByteBufferImpl(const ByteBufferImpl &buf)
- : COWIntrusiveCountableBase(buf)
- , m_len(buf.m_len)
+ : m_len(buf.m_len)
, m_buf(new char[m_len + 1])
{
::memmove(m_buf, buf.m_buf, m_len);
@@ -120,6 +119,13 @@
}
}
+ void
+ clear()
+ {
+ m_len = 0;
+ m_buf = NULL;
+ }
+
size_t
size() const
{
@@ -149,30 +155,20 @@
// --- ByteBuffer class ----------------------------------------------
// -------------------------------------------------------------------
ByteBuffer::ByteBuffer()
- : m_impl(NULL)
+ : m_impl(new ByteBufferImpl())
{}
// -------------------------------------------------------------------
ByteBuffer::ByteBuffer(const char *str)
- : m_impl(NULL)
-{
- if( str != NULL)
- {
- m_impl = new ByteBufferImpl(str);
- }
-}
+ : m_impl(new ByteBufferImpl(str))
+{}
// -------------------------------------------------------------------
ByteBuffer::ByteBuffer(const char *ptr, size_t len)
- : m_impl(NULL)
-{
- if( ptr != NULL)
- {
- m_impl = new ByteBufferImpl(ptr, len);
- }
-}
+ : m_impl(new ByteBufferImpl(ptr, len))
+{}
// -------------------------------------------------------------------
@@ -204,7 +200,7 @@
void
ByteBuffer::clear()
{
- m_impl = NULL;
+ m_impl->clear();
}
@@ -255,14 +251,14 @@
{
if(ptr != NULL)
{
- if(m_impl)
- {
- m_impl->append(ptr, len);
- }
- else
- {
- m_impl = new ByteBufferImpl(ptr, len);
- }
+ if(m_impl)
+ {
+ m_impl->append(ptr, len);
+ }
+ else
+ {
+ BLOCXX_THROW(ca_mgm::RuntimeException, __("ByteBuffer not initialized"));
+ }
}
}
@@ -271,14 +267,14 @@
void
ByteBuffer::append(char c)
{
- if(m_impl)
- {
- m_impl->append(&c, 1);
- }
- else
- {
- m_impl = new ByteBufferImpl(&c, 1);
- }
+ if(m_impl)
+ {
+ m_impl->append(&c, 1);
+ }
+ else
+ {
+ BLOCXX_THROW(ca_mgm::RuntimeException, __("ByteBuffer not initialized"));
+ }
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp Sun Jul 4 18:59:33 2010
@@ -29,7 +29,7 @@
#include <limal/Date.hpp>
#include <limal/String.hpp>
#include <blocxx/StringBuffer.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include <openssl/pem.h>
@@ -48,7 +48,7 @@
using namespace ca_mgm;
using namespace blocxx;
-class CAImpl : public blocxx::COWIntrusiveCountableBase
+class CAImpl
{
public:
@@ -109,12 +109,23 @@
CAConfig *config;
CAConfig *templ;
+ // FIXME: have a look at this
private:
CAImpl() {}
- CAImpl(const CAImpl &impl)
- : COWIntrusiveCountableBase(impl)
+ CAImpl(const CAImpl &)
{}
- CAImpl& operator=(const CAImpl &) { return *this; }
+ CAImpl& operator=(const CAImpl &i)
+ {
+ if(this == &i) return *this;
+
+ caName = i.caName;
+ caPasswd = i.caPasswd;
+ repositoryDir = i.repositoryDir;
+ config = i.config;
+ templ = i.templ;
+
+ return *this;
+ }
};
@@ -150,6 +161,7 @@
CA::CA(const std::string& caName, const std::string& caPasswd, const std::string& repos)
+ : m_impl( new CAImpl(caName, caPasswd, repos))
{
if(caName.empty())
@@ -178,8 +190,6 @@
__("Invalid CA password."), E_INVALID_PASSWD);
}
- m_impl = new CAImpl(caName, caPasswd, repos);
-
m_impl->templ = new CAConfig(repos+"/"+caName+"/openssl.cnf.tmpl");
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CAConfig.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CAConfig.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CAConfig.cpp Sun Jul 4 18:59:33 2010
@@ -23,7 +23,7 @@
#include <fstream>
#include <iostream>
#include <limal/ca-mgm/CAConfig.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "Utils.hpp"
#include "INIParser/INIParser.hpp"
@@ -40,7 +40,7 @@
INI::Section *section;
};
-class CAConfigImpl : public blocxx::COWIntrusiveCountableBase
+class CAConfigImpl
{
public:
CAConfigImpl()
@@ -54,8 +54,7 @@
{}
CAConfigImpl(const CAConfigImpl& impl)
- : COWIntrusiveCountableBase(impl)
- , parser(impl.parser)
+ : parser(impl.parser)
, srcFilename(impl.srcFilename)
{}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CRLData.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CRLData.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CRLData.cpp Sun Jul 4 18:59:33 2010
@@ -24,7 +24,7 @@
#include <limal/ValueRegExCheck.hpp>
#include <limal/Exception.hpp>
#include <blocxx/Format.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "CRLDataImpl.hpp"
#include "DNObject_Priv.hpp"
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CRLDataImpl.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CRLDataImpl.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CRLDataImpl.hpp Sun Jul 4 18:59:33 2010
@@ -24,14 +24,14 @@
#include <limal/ca-mgm/config.h>
#include <limal/ca-mgm/CommonData.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "X509v3CRLExtensions_Priv.hpp"
namespace CA_MGM_NAMESPACE {
-class RevocationEntryImpl : public blocxx::COWIntrusiveCountableBase
+class RevocationEntryImpl
{
public:
RevocationEntryImpl()
@@ -41,8 +41,7 @@
{}
RevocationEntryImpl(const RevocationEntryImpl& impl)
- : COWIntrusiveCountableBase(impl)
- , serial(impl.serial)
+ : serial(impl.serial)
, revocationDate(impl.revocationDate)
, revocationReason(impl.revocationReason)
{}
@@ -60,7 +59,7 @@
};
-class CRLDataImpl : public blocxx::COWIntrusiveCountableBase
+class CRLDataImpl
{
public:
CRLDataImpl()
@@ -77,8 +76,7 @@
{}
CRLDataImpl(const CRLDataImpl& impl)
- : COWIntrusiveCountableBase(impl)
- , version(impl.version)
+ : version(impl.version)
, fingerprint(impl.fingerprint)
, lastUpdate(impl.lastUpdate)
, nextUpdate(impl.nextUpdate)
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CRLDistributionPointsExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CRLDistributionPointsExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CRLDistributionPointsExtension.cpp Sun Jul 4 18:59:33 2010
@@ -23,7 +23,7 @@
#include <limal/ca-mgm/CRLDistributionPointsExtension.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "Utils.hpp"
@@ -33,7 +33,7 @@
using namespace ca_mgm;
using namespace blocxx;
-class CRLDistributionPointsExtImpl : public blocxx::COWIntrusiveCountableBase
+class CRLDistributionPointsExtImpl
{
public:
CRLDistributionPointsExtImpl()
@@ -41,8 +41,7 @@
{}
CRLDistributionPointsExtImpl(const CRLDistributionPointsExtImpl& impl)
- : COWIntrusiveCountableBase(impl)
- , altNameList(impl.altNameList)
+ : altNameList(impl.altNameList)
{}
~CRLDistributionPointsExtImpl() {}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CRLGenerationData.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CRLGenerationData.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CRLGenerationData.cpp Sun Jul 4 18:59:33 2010
@@ -24,7 +24,7 @@
#include <limal/ca-mgm/CRLGenerationData.hpp>
#include <limal/Exception.hpp>
#include <blocxx/Format.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "Utils.hpp"
@@ -34,7 +34,7 @@
using namespace ca_mgm;
using namespace blocxx;
-class CRLGenerationDataImpl : public blocxx::COWIntrusiveCountableBase
+class CRLGenerationDataImpl
{
public:
@@ -50,8 +50,7 @@
{}
CRLGenerationDataImpl(const CRLGenerationDataImpl& impl)
- : COWIntrusiveCountableBase(impl)
- , crlHours(impl.crlHours)
+ : crlHours(impl.crlHours)
, extensions(impl.extensions)
{}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CRLReason.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CRLReason.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CRLReason.cpp Sun Jul 4 18:59:33 2010
@@ -25,7 +25,7 @@
#include <limal/Exception.hpp>
#include <limal/Date.hpp>
#include <limal/String.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "Utils.hpp"
@@ -35,7 +35,7 @@
using namespace ca_mgm;
using namespace blocxx;
-class CRLReasonImpl : public blocxx::COWIntrusiveCountableBase
+class CRLReasonImpl
{
public:
CRLReasonImpl()
@@ -51,8 +51,7 @@
{}
CRLReasonImpl(const CRLReasonImpl& impl)
- : COWIntrusiveCountableBase(impl)
- , reason(impl.reason)
+ : reason(impl.reason)
, compromiseDate(impl.compromiseDate)
, holdInstruction(impl.holdInstruction)
{}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CertificateData.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CertificateData.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CertificateData.cpp Sun Jul 4 18:59:33 2010
@@ -24,7 +24,7 @@
#include <limal/ValueRegExCheck.hpp>
#include <limal/Exception.hpp>
#include <blocxx/Format.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "CertificateDataImpl.hpp"
#include "Utils.hpp"
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CertificateDataImpl.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CertificateDataImpl.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CertificateDataImpl.hpp Sun Jul 4 18:59:33 2010
@@ -24,14 +24,14 @@
#include <limal/ca-mgm/config.h>
#include <limal/ca-mgm/CommonData.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "X509v3CertificateExtensions_Priv.hpp"
namespace CA_MGM_NAMESPACE {
-class CertificateDataImpl : public blocxx::COWIntrusiveCountableBase
+class CertificateDataImpl
{
public:
CertificateDataImpl()
@@ -52,8 +52,7 @@
{}
CertificateDataImpl(const CertificateDataImpl& impl)
- : COWIntrusiveCountableBase(impl)
- , version(impl.version)
+ : version(impl.version)
, serial(impl.serial)
, fingerprint(impl.fingerprint)
, notBefore(impl.notBefore)
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CertificateIssueData.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CertificateIssueData.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CertificateIssueData.cpp Sun Jul 4 18:59:33 2010
@@ -25,7 +25,7 @@
#include <limal/Exception.hpp>
#include <blocxx/Format.hpp>
#include <limal/Date.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "Utils.hpp"
@@ -35,7 +35,7 @@
using namespace ca_mgm;
using namespace blocxx;
-class CertificateIssueDataImpl : public blocxx::COWIntrusiveCountableBase
+class CertificateIssueDataImpl
{
public:
CertificateIssueDataImpl()
@@ -46,8 +46,7 @@
{}
CertificateIssueDataImpl(const CertificateIssueDataImpl& impl)
- : COWIntrusiveCountableBase(impl)
- , notBefore(impl.notBefore)
+ : notBefore(impl.notBefore)
, notAfter(impl.notAfter)
, messageDigest(impl.messageDigest)
, extensions(impl.extensions)
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CertificatePoliciesExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CertificatePoliciesExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CertificatePoliciesExtension.cpp Sun Jul 4 18:59:33 2010
@@ -24,7 +24,7 @@
#include <limal/ValueRegExCheck.hpp>
#include <limal/Exception.hpp>
#include <blocxx/Format.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "Utils.hpp"
@@ -34,7 +34,7 @@
using namespace ca_mgm;
using namespace blocxx;
-class UserNoticeImpl : public blocxx::COWIntrusiveCountableBase
+class UserNoticeImpl
{
public:
UserNoticeImpl()
@@ -44,8 +44,7 @@
{}
UserNoticeImpl(const UserNoticeImpl& impl)
- : COWIntrusiveCountableBase(impl)
- , explicitText(impl.explicitText)
+ : explicitText(impl.explicitText)
, organization(impl.organization)
, noticeNumbers(impl.noticeNumbers)
{}
@@ -67,7 +66,7 @@
};
-class CertificatePolicyImpl : public blocxx::COWIntrusiveCountableBase
+class CertificatePolicyImpl
{
public:
@@ -84,8 +83,7 @@
{}
CertificatePolicyImpl(const CertificatePolicyImpl& impl)
- : COWIntrusiveCountableBase(impl)
- , policyIdentifier(impl.policyIdentifier)
+ : policyIdentifier(impl.policyIdentifier)
, cpsURI(impl.cpsURI)
, noticeList(impl.noticeList)
{}
@@ -103,7 +101,7 @@
std::list<UserNotice> noticeList;
};
-class CertificatePoliciesExtImpl : public blocxx::COWIntrusiveCountableBase
+class CertificatePoliciesExtImpl
{
public:
CertificatePoliciesExtImpl()
@@ -117,8 +115,7 @@
{}
CertificatePoliciesExtImpl(const CertificatePoliciesExtImpl& impl)
- : COWIntrusiveCountableBase(impl)
- , ia5org(impl.ia5org)
+ : ia5org(impl.ia5org)
, policies(impl.policies)
{}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/DNObject.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/DNObject.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/DNObject.cpp Sun Jul 4 18:59:33 2010
@@ -25,7 +25,7 @@
#include <limal/ValueRegExCheck.hpp>
#include <limal/Exception.hpp>
#include <map>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "DNObjectImpl.hpp"
#include "DNObject_Priv.hpp"
Modified: limal-branches/mc-devel/limal-ca-mgm/src/DNObjectImpl.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/DNObjectImpl.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/DNObjectImpl.hpp Sun Jul 4 18:59:33 2010
@@ -25,12 +25,12 @@
#include <limal/ca-mgm/config.h>
#include <limal/ca-mgm/CommonData.hpp>
#include <list>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
namespace CA_MGM_NAMESPACE {
-class RDNObjectImpl : public blocxx::COWIntrusiveCountableBase
+class RDNObjectImpl
{
public:
RDNObjectImpl()
@@ -42,8 +42,7 @@
{}
RDNObjectImpl(const RDNObjectImpl& impl)
- : COWIntrusiveCountableBase(impl)
- , type(impl.type)
+ : type(impl.type)
, value(impl.value)
, prompt(impl.prompt)
, min(impl.min)
@@ -65,7 +64,7 @@
uint32_t max;
};
-class DNObjectImpl : public blocxx::COWIntrusiveCountableBase
+class DNObjectImpl
{
public:
DNObjectImpl()
@@ -73,8 +72,7 @@
{}
DNObjectImpl(const DNObjectImpl& impl)
- : COWIntrusiveCountableBase(impl)
- , dn(impl.dn)
+ : dn(impl.dn)
{}
~DNObjectImpl() {}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/ExtendedKeyUsageExt.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/ExtendedKeyUsageExt.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/ExtendedKeyUsageExt.cpp Sun Jul 4 18:59:33 2010
@@ -24,7 +24,7 @@
#include <limal/ValueRegExCheck.hpp>
#include <limal/Exception.hpp>
#include <blocxx/Format.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "Utils.hpp"
@@ -34,7 +34,7 @@
using namespace ca_mgm;
using namespace blocxx;
-class ExtendedKeyUsageExtImpl : public blocxx::COWIntrusiveCountableBase
+class ExtendedKeyUsageExtImpl
{
public:
ExtendedKeyUsageExtImpl()
@@ -42,8 +42,7 @@
{}
ExtendedKeyUsageExtImpl(const ExtendedKeyUsageExtImpl& impl)
- : COWIntrusiveCountableBase(impl)
- , usage(impl.usage)
+ : usage(impl.usage)
{}
~ExtendedKeyUsageExtImpl() {}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/ExtensionBase.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/ExtensionBase.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/ExtensionBase.cpp Sun Jul 4 18:59:33 2010
@@ -21,7 +21,7 @@
/-*/
#include <limal/ca-mgm/ExtensionBase.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "Utils.hpp"
@@ -31,7 +31,8 @@
using namespace ca_mgm;
using namespace blocxx;
-class ExtensionBaseImpl : public COWIntrusiveCountableBase {
+class ExtensionBaseImpl
+{
public:
@@ -40,8 +41,7 @@
{}
ExtensionBaseImpl(const ExtensionBaseImpl &ebi)
- : COWIntrusiveCountableBase(ebi)
- , present(ebi.present)
+ : present(ebi.present)
, critical(ebi.critical)
{}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/IssuerAlternativeNameExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/IssuerAlternativeNameExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/IssuerAlternativeNameExtension.cpp Sun Jul 4 18:59:33 2010
@@ -23,7 +23,7 @@
#include <limal/ca-mgm/IssuerAlternativeNameExtension.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "Utils.hpp"
@@ -33,7 +33,7 @@
using namespace ca_mgm;
using namespace blocxx;
-class IssuerAlternativeNameExtImpl : public blocxx::COWIntrusiveCountableBase
+class IssuerAlternativeNameExtImpl
{
public:
IssuerAlternativeNameExtImpl()
@@ -48,8 +48,7 @@
{}
IssuerAlternativeNameExtImpl(const IssuerAlternativeNameExtImpl& impl)
- : COWIntrusiveCountableBase(impl)
- , issuerCopy(impl.issuerCopy)
+ : issuerCopy(impl.issuerCopy)
, altNameList(impl.altNameList)
{}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/LiteralValues.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/LiteralValues.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/LiteralValues.cpp Sun Jul 4 18:59:33 2010
@@ -25,7 +25,7 @@
#include <limal/ValueRegExCheck.hpp>
#include <limal/Exception.hpp>
#include <limal/String.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "Utils.hpp"
@@ -36,7 +36,7 @@
using namespace blocxx;
-class LiteralValueImpl : public blocxx::COWIntrusiveCountableBase
+class LiteralValueImpl
{
public:
std::string literalType;
@@ -52,9 +52,8 @@
{}
LiteralValueImpl(const LiteralValueImpl &lv)
- : blocxx::COWIntrusiveCountableBase(lv),
- literalType(lv.literalType),
- literalValue(lv.literalValue)
+ : literalType(lv.literalType)
+ , literalValue(lv.literalValue)
{}
virtual ~LiteralValueImpl() {}
@@ -66,6 +65,7 @@
};
+
LiteralValue::LiteralValue()
: m_impl(new LiteralValueImpl())
{}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/RequestDataImpl.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/RequestDataImpl.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/RequestDataImpl.hpp Sun Jul 4 18:59:33 2010
@@ -24,14 +24,14 @@
#include <limal/ca-mgm/config.h>
#include <limal/ca-mgm/CommonData.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "X509v3RequestExtensions_Priv.hpp"
namespace CA_MGM_NAMESPACE {
-class RequestDataImpl : public blocxx::COWIntrusiveCountableBase
+class RequestDataImpl
{
public:
@@ -50,8 +50,7 @@
{}
RequestDataImpl(const RequestDataImpl& impl)
- : COWIntrusiveCountableBase(impl)
- , version(impl.version)
+ : version(impl.version)
, subject(impl.subject)
, keysize(impl.keysize)
, pubkeyAlgorithm(impl.pubkeyAlgorithm)
Modified: limal-branches/mc-devel/limal-ca-mgm/src/RequestGenerationData.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/RequestGenerationData.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/RequestGenerationData.cpp Sun Jul 4 18:59:33 2010
@@ -25,7 +25,7 @@
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
#include <blocxx/Format.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "Utils.hpp"
@@ -35,7 +35,7 @@
using namespace ca_mgm;
using namespace blocxx;
-class RequestGenerationDataImpl : public blocxx::COWIntrusiveCountableBase
+class RequestGenerationDataImpl
{
public:
RequestGenerationDataImpl()
@@ -48,8 +48,7 @@
{}
RequestGenerationDataImpl(const RequestGenerationDataImpl& impl)
- : COWIntrusiveCountableBase(impl)
- , subject(impl.subject)
+ : subject(impl.subject)
, keysize(impl.keysize)
, messageDigest(impl.messageDigest)
, challengePassword(impl.challengePassword)
Modified: limal-branches/mc-devel/limal-ca-mgm/src/StringExtensions.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/StringExtensions.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/StringExtensions.cpp Sun Jul 4 18:59:33 2010
@@ -25,7 +25,7 @@
#include <limal/ValueRegExCheck.hpp>
#include <limal/Exception.hpp>
#include <blocxx/Format.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "Utils.hpp"
@@ -35,7 +35,7 @@
using namespace ca_mgm;
using namespace blocxx;
-class StringExtensionImpl : public blocxx::COWIntrusiveCountableBase
+class StringExtensionImpl
{
public:
StringExtensionImpl()
@@ -47,8 +47,7 @@
{}
StringExtensionImpl(const StringExtensionImpl& impl)
- : COWIntrusiveCountableBase(impl)
- , value(impl.value)
+ : value(impl.value)
{}
~StringExtensionImpl() {}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/SubjectAlternativeNameExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/SubjectAlternativeNameExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/SubjectAlternativeNameExtension.cpp Sun Jul 4 18:59:33 2010
@@ -23,7 +23,7 @@
#include <limal/ca-mgm/SubjectAlternativeNameExtension.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "Utils.hpp"
@@ -33,7 +33,7 @@
using namespace ca_mgm;
using namespace blocxx;
-class SubjectAlternativeNameExtImpl : public blocxx::COWIntrusiveCountableBase
+class SubjectAlternativeNameExtImpl
{
public:
SubjectAlternativeNameExtImpl()
@@ -48,8 +48,7 @@
{}
SubjectAlternativeNameExtImpl(const SubjectAlternativeNameExtImpl& impl)
- : COWIntrusiveCountableBase(impl)
- , emailCopy(impl.emailCopy)
+ : emailCopy(impl.emailCopy)
, altNameList(impl.altNameList)
{}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/SubjectKeyIdentifierExtension.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/SubjectKeyIdentifierExtension.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/SubjectKeyIdentifierExtension.cpp Sun Jul 4 18:59:33 2010
@@ -25,7 +25,7 @@
#include <limal/ValueRegExCheck.hpp>
#include <limal/Exception.hpp>
#include <blocxx/Format.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "Utils.hpp"
@@ -35,7 +35,7 @@
using namespace ca_mgm;
using namespace blocxx;
-class SubjectKeyIdentifierExtImpl : public blocxx::COWIntrusiveCountableBase
+class SubjectKeyIdentifierExtImpl
{
public:
SubjectKeyIdentifierExtImpl()
@@ -49,8 +49,7 @@
{}
SubjectKeyIdentifierExtImpl(const SubjectKeyIdentifierExtImpl& impl)
- : COWIntrusiveCountableBase(impl)
- , autodetect(impl.autodetect)
+ : autodetect(impl.autodetect)
, keyid(impl.keyid)
{}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLExtensionsImpl.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLExtensionsImpl.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLExtensionsImpl.hpp Sun Jul 4 18:59:33 2010
@@ -24,12 +24,12 @@
#include <limal/ca-mgm/config.h>
#include <limal/ca-mgm/CommonData.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
namespace CA_MGM_NAMESPACE {
-class X509v3CRLExtsImpl : public blocxx::COWIntrusiveCountableBase
+class X509v3CRLExtsImpl
{
public:
X509v3CRLExtsImpl()
@@ -38,9 +38,8 @@
{}
X509v3CRLExtsImpl(const X509v3CRLExtsImpl& impl)
- : COWIntrusiveCountableBase(impl),
- authorityKeyIdentifier(impl.authorityKeyIdentifier),
- issuerAlternativeName(impl.issuerAlternativeName)
+ : authorityKeyIdentifier(impl.authorityKeyIdentifier)
+ , issuerAlternativeName(impl.issuerAlternativeName)
{}
~X509v3CRLExtsImpl() {}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLGenerationExtensions.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLGenerationExtensions.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/X509v3CRLGenerationExtensions.cpp Sun Jul 4 18:59:33 2010
@@ -24,7 +24,7 @@
#include <limal/ca-mgm/X509v3CRLGenerationExtensions.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "Utils.hpp"
@@ -34,7 +34,7 @@
using namespace ca_mgm;
using namespace blocxx;
-class X509v3CRLGenerationExtsImpl : public blocxx::COWIntrusiveCountableBase
+class X509v3CRLGenerationExtsImpl
{
public:
X509v3CRLGenerationExtsImpl()
@@ -49,9 +49,8 @@
{}
X509v3CRLGenerationExtsImpl(const X509v3CRLGenerationExtsImpl& impl)
- : COWIntrusiveCountableBase(impl),
- authorityKeyIdentifier(impl.authorityKeyIdentifier),
- issuerAlternativeName(impl.issuerAlternativeName)
+ : authorityKeyIdentifier(impl.authorityKeyIdentifier)
+ , issuerAlternativeName(impl.issuerAlternativeName)
{}
~X509v3CRLGenerationExtsImpl() {}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateExtensionsImpl.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateExtensionsImpl.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateExtensionsImpl.hpp Sun Jul 4 18:59:33 2010
@@ -36,12 +36,12 @@
#include <limal/ca-mgm/AuthorityInfoAccessExtension.hpp>
#include <limal/ca-mgm/CRLDistributionPointsExtension.hpp>
#include <limal/ca-mgm/CertificatePoliciesExtension.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
namespace CA_MGM_NAMESPACE {
-class X509v3CertificateExtsImpl : public blocxx::COWIntrusiveCountableBase
+class X509v3CertificateExtsImpl
{
public:
X509v3CertificateExtsImpl()
@@ -66,8 +66,7 @@
{}
X509v3CertificateExtsImpl(const X509v3CertificateExtsImpl& impl)
- : COWIntrusiveCountableBase(impl),
- nsBaseUrl(impl.nsBaseUrl),
+ : nsBaseUrl(impl.nsBaseUrl),
nsRevocationUrl(impl.nsRevocationUrl),
nsCaRevocationUrl(impl.nsCaRevocationUrl),
nsRenewalUrl(impl.nsRenewalUrl),
Modified: limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateIssueExtensions.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateIssueExtensions.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/X509v3CertificateIssueExtensions.cpp Sun Jul 4 18:59:33 2010
@@ -24,7 +24,7 @@
#include <limal/ca-mgm/X509v3CertificateIssueExtensions.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/Exception.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "Utils.hpp"
@@ -34,7 +34,7 @@
using namespace ca_mgm;
using namespace blocxx;
-class X509v3CertificateIssueExtsImpl : public blocxx::COWIntrusiveCountableBase
+class X509v3CertificateIssueExtsImpl
{
public:
X509v3CertificateIssueExtsImpl()
@@ -81,8 +81,7 @@
{}
X509v3CertificateIssueExtsImpl(const X509v3CertificateIssueExtsImpl& impl)
- : COWIntrusiveCountableBase(impl),
- nsBaseUrl(impl.nsBaseUrl),
+ : nsBaseUrl(impl.nsBaseUrl),
nsRevocationUrl(impl.nsRevocationUrl),
nsCaRevocationUrl(impl.nsCaRevocationUrl),
nsRenewalUrl(impl.nsRenewalUrl),
Modified: limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensions.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensions.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensions.cpp Sun Jul 4 18:59:33 2010
@@ -22,7 +22,7 @@
#include <limal/ca-mgm/X509v3RequestExtensions.hpp>
#include <limal/Exception.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
#include "X509v3RequestExtensionsImpl.hpp"
#include "Utils.hpp"
Modified: limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensionsImpl.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensionsImpl.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/X509v3RequestExtensionsImpl.hpp Sun Jul 4 18:59:33 2010
@@ -24,12 +24,12 @@
#include <limal/ca-mgm/config.h>
#include <limal/ca-mgm/CommonData.hpp>
-#include <blocxx/COWIntrusiveCountableBase.hpp>
+
namespace CA_MGM_NAMESPACE {
-class X509v3RequestExtsImpl : public blocxx::COWIntrusiveCountableBase
+class X509v3RequestExtsImpl
{
public:
X509v3RequestExtsImpl()
@@ -55,8 +55,7 @@
{}
X509v3RequestExtsImpl(const X509v3RequestExtsImpl& impl)
- : COWIntrusiveCountableBase(impl),
- nsSslServerName(impl.nsSslServerName),
+ : nsSslServerName(impl.nsSslServerName),
nsComment(impl.nsComment),
keyUsage(impl.keyUsage),
nsCertType(impl.nsCertType),
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ByteBuffer.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ByteBuffer.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ByteBuffer.hpp Sun Jul 4 18:59:33 2010
@@ -27,7 +27,7 @@
#define LIMAL_BYTEBUFFER_HPP
#include <limal/ca-mgm/config.h>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
#include <iostream>
extern "C"
{
@@ -257,7 +257,7 @@
#endif
private:
- blocxx::COWIntrusiveReference<ByteBufferImpl> m_impl;
+ ca_mgm::RWCOW_pointer<ByteBufferImpl> m_impl;
};
} // End Of LIMAL_NAMESPACE
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/AuthorityInfoAccessExtension.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/AuthorityInfoAccessExtension.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/AuthorityInfoAccessExtension.hpp Sun Jul 4 18:59:33 2010
@@ -26,7 +26,7 @@
#include <limal/ca-mgm/CommonData.hpp>
#include <limal/ca-mgm/LiteralValues.hpp>
#include <limal/ca-mgm/ExtensionBase.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE {
@@ -135,7 +135,7 @@
#endif
private:
- blocxx::COWIntrusiveReference<AuthorityInformationImpl> m_impl;
+ ca_mgm::RWCOW_pointer<AuthorityInformationImpl> m_impl;
};
@@ -230,7 +230,7 @@
dump() const;
private:
- blocxx::COWIntrusiveReference<AuthorityInfoAccessExtImpl> m_impl;
+ ca_mgm::RWCOW_pointer<AuthorityInfoAccessExtImpl> m_impl;
};
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/AuthorityKeyIdentifierExtension.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/AuthorityKeyIdentifierExtension.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/AuthorityKeyIdentifierExtension.hpp Sun Jul 4 18:59:33 2010
@@ -25,7 +25,7 @@
#include <limal/ca-mgm/config.h>
#include <limal/ca-mgm/CommonData.hpp>
#include <limal/ca-mgm/ExtensionBase.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE {
@@ -88,7 +88,7 @@
dump() const;
protected:
- blocxx::COWIntrusiveReference<AuthorityKeyIdentifierExtImpl> m_impl;
+ ca_mgm::RWCOW_pointer<AuthorityKeyIdentifierExtImpl> m_impl;
void
setKeyID(const std::string& kid);
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/AuthorityKeyIdentifierGenerateExtension.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/AuthorityKeyIdentifierGenerateExtension.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/AuthorityKeyIdentifierGenerateExtension.hpp Sun Jul 4 18:59:33 2010
@@ -25,7 +25,7 @@
#include <limal/ca-mgm/config.h>
#include <limal/ca-mgm/CommonData.hpp>
#include <limal/ca-mgm/ExtensionBase.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE {
@@ -129,7 +129,7 @@
dump() const;
private:
- blocxx::COWIntrusiveReference<AuthorityKeyIdentifierGenerateExtImpl> m_impl;
+ ca_mgm::RWCOW_pointer<AuthorityKeyIdentifierGenerateExtImpl> m_impl;
};
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/BasicConstraintsExtension.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/BasicConstraintsExtension.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/BasicConstraintsExtension.hpp Sun Jul 4 18:59:33 2010
@@ -25,7 +25,7 @@
#include <limal/ca-mgm/config.h>
#include <limal/ca-mgm/CommonData.hpp>
#include <limal/ca-mgm/ExtensionBase.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE {
@@ -103,7 +103,7 @@
virtual std::vector<std::string> dump() const;
private:
- blocxx::COWIntrusiveReference<BasicConstraintsExtImpl> m_impl;
+ ca_mgm::RWCOW_pointer<BasicConstraintsExtImpl> m_impl;
};
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/BitExtensions.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/BitExtensions.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/BitExtensions.hpp Sun Jul 4 18:59:33 2010
@@ -61,7 +61,7 @@
virtual std::vector<std::string> dump() const = 0;
protected:
- //blocxx::COWIntrusiveReference<BitExtensionImpl> m_impl;
+ //ca_mgm::RWCOW_pointer<BitExtensionImpl> m_impl;
ca_mgm::RWCOW_pointer<BitExtensionImpl> m_impl;
};
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CA.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CA.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CA.hpp Sun Jul 4 18:59:33 2010
@@ -37,7 +37,7 @@
#include <limal/ca-mgm/CertificateData.hpp>
#include <limal/ca-mgm/CAConfig.hpp>
#include <limal/ByteBuffer.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE
{
@@ -669,7 +669,7 @@
const std::string& repos = REPOSITORY);
private:
- blocxx::COWIntrusiveReference<CAImpl> m_impl;
+ ca_mgm::RWCOW_pointer<CAImpl> m_impl;
CA();
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CAConfig.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CAConfig.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CAConfig.hpp Sun Jul 4 18:59:33 2010
@@ -29,7 +29,7 @@
#include <limal/ca-mgm/config.h>
#include <limal/ca-mgm/CommonData.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE
@@ -105,7 +105,7 @@
private:
- blocxx::COWIntrusiveReference<CAConfigImpl> m_impl;
+ ca_mgm::RWCOW_pointer<CAConfigImpl> m_impl;
CAConfig();
CAConfig(const CAConfig&);
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLData.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLData.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLData.hpp Sun Jul 4 18:59:33 2010
@@ -28,7 +28,7 @@
#include <limal/ca-mgm/DNObject.hpp>
#include <limal/ca-mgm/X509v3CRLExtensions.hpp>
#include <limal/ByteBuffer.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE {
@@ -67,7 +67,7 @@
dump() const;
protected:
- blocxx::COWIntrusiveReference<RevocationEntryImpl> m_impl;
+ ca_mgm::RWCOW_pointer<RevocationEntryImpl> m_impl;
};
@@ -145,7 +145,7 @@
dump() const;
protected:
- blocxx::COWIntrusiveReference<CRLDataImpl> m_impl;
+ ca_mgm::RWCOW_pointer<CRLDataImpl> m_impl;
CRLData();
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLDistributionPointsExtension.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLDistributionPointsExtension.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLDistributionPointsExtension.hpp Sun Jul 4 18:59:33 2010
@@ -26,7 +26,7 @@
#include <limal/ca-mgm/CommonData.hpp>
#include <limal/ca-mgm/ExtensionBase.hpp>
#include <limal/ca-mgm/LiteralValues.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE {
@@ -68,7 +68,7 @@
dump() const;
private:
- blocxx::COWIntrusiveReference<CRLDistributionPointsExtImpl> m_impl;
+ ca_mgm::RWCOW_pointer<CRLDistributionPointsExtImpl> m_impl;
};
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLGenerationData.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLGenerationData.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLGenerationData.hpp Sun Jul 4 18:59:33 2010
@@ -26,7 +26,7 @@
#include <limal/ca-mgm/config.h>
#include <limal/ca-mgm/CommonData.hpp>
#include <limal/ca-mgm/X509v3CRLGenerationExtensions.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE
{
@@ -82,7 +82,7 @@
dump() const;
private:
- blocxx::COWIntrusiveReference<CRLGenerationDataImpl> m_impl;
+ ca_mgm::RWCOW_pointer<CRLGenerationDataImpl> m_impl;
};
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLReason.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLReason.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CRLReason.hpp Sun Jul 4 18:59:33 2010
@@ -24,7 +24,7 @@
#include <limal/ca-mgm/config.h>
#include <limal/ca-mgm/CommonData.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE {
@@ -119,7 +119,7 @@
dump() const;
private:
- blocxx::COWIntrusiveReference<CRLReasonImpl> m_impl;
+ ca_mgm::RWCOW_pointer<CRLReasonImpl> m_impl;
std::string
checkHoldInstruction(const std::string& hi) const;
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificateData.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificateData.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificateData.hpp Sun Jul 4 18:59:33 2010
@@ -27,7 +27,7 @@
#include <limal/ca-mgm/X509v3CertificateExtensions.hpp>
#include <limal/ca-mgm/DNObject.hpp>
#include <limal/ByteBuffer.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE {
@@ -123,7 +123,7 @@
CertificateData();
- blocxx::COWIntrusiveReference<CertificateDataImpl> m_impl;
+ ca_mgm::RWCOW_pointer<CertificateDataImpl> m_impl;
};
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificateIssueData.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificateIssueData.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificateIssueData.hpp Sun Jul 4 18:59:33 2010
@@ -27,7 +27,7 @@
#include <limal/ca-mgm/CommonData.hpp>
#include <limal/ca-mgm/CA.hpp>
#include <limal/ca-mgm/X509v3CertificateIssueExtensions.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE
{
@@ -127,7 +127,7 @@
dump() const;
private:
- blocxx::COWIntrusiveReference<CertificateIssueDataImpl> m_impl;
+ ca_mgm::RWCOW_pointer<CertificateIssueDataImpl> m_impl;
};
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificatePoliciesExtension.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificatePoliciesExtension.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CertificatePoliciesExtension.hpp Sun Jul 4 18:59:33 2010
@@ -25,7 +25,7 @@
#include <limal/ca-mgm/config.h>
#include <limal/ca-mgm/CommonData.hpp>
#include <limal/ca-mgm/ExtensionBase.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE {
@@ -90,7 +90,7 @@
#endif
private:
- blocxx::COWIntrusiveReference<UserNoticeImpl> m_impl;
+ ca_mgm::RWCOW_pointer<UserNoticeImpl> m_impl;
};
@@ -152,7 +152,7 @@
#endif
private:
- blocxx::COWIntrusiveReference<CertificatePolicyImpl> m_impl;
+ ca_mgm::RWCOW_pointer<CertificatePolicyImpl> m_impl;
std::vector<std::string>
checkCpsURIs(const StringList& cpsURIs) const;
@@ -201,7 +201,7 @@
dump() const;
private:
- blocxx::COWIntrusiveReference<CertificatePoliciesExtImpl> m_impl;
+ ca_mgm::RWCOW_pointer<CertificatePoliciesExtImpl> m_impl;
std::vector<std::string>
checkPolicies(const std::list<CertificatePolicy>& pl) const;
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/DNObject.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/DNObject.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/DNObject.hpp Sun Jul 4 18:59:33 2010
@@ -24,7 +24,7 @@
#include <limal/ca-mgm/config.h>
#include <limal/ca-mgm/CommonData.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE {
@@ -63,7 +63,7 @@
#endif
protected:
- blocxx::COWIntrusiveReference<RDNObjectImpl> m_impl;
+ ca_mgm::RWCOW_pointer<RDNObjectImpl> m_impl;
};
@@ -92,7 +92,7 @@
virtual std::vector<std::string> dump() const;
protected:
- blocxx::COWIntrusiveReference<DNObjectImpl> m_impl;
+ ca_mgm::RWCOW_pointer<DNObjectImpl> m_impl;
private:
std::vector<std::string>
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/ExtendedKeyUsageExt.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/ExtendedKeyUsageExt.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/ExtendedKeyUsageExt.hpp Sun Jul 4 18:59:33 2010
@@ -25,7 +25,7 @@
#include <limal/ca-mgm/config.h>
#include <limal/ca-mgm/CommonData.hpp>
#include <limal/ca-mgm/ExtensionBase.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE {
@@ -131,7 +131,7 @@
dump() const;
private:
- blocxx::COWIntrusiveReference<ExtendedKeyUsageExtImpl> m_impl;
+ ca_mgm::RWCOW_pointer<ExtendedKeyUsageExtImpl> m_impl;
bool
checkValue(const std::string& value) const;
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/ExtensionBase.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/ExtensionBase.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/ExtensionBase.hpp Sun Jul 4 18:59:33 2010
@@ -24,7 +24,7 @@
#include <limal/ca-mgm/config.h>
#include <limal/ca-mgm/CommonData.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE {
@@ -60,7 +60,7 @@
virtual std::vector<std::string> dump() const;
private:
- blocxx::COWIntrusiveReference<ExtensionBaseImpl> m_impl;
+ ca_mgm::RWCOW_pointer<ExtensionBaseImpl> m_impl;
};
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/IssuerAlternativeNameExtension.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/IssuerAlternativeNameExtension.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/IssuerAlternativeNameExtension.hpp Sun Jul 4 18:59:33 2010
@@ -26,7 +26,7 @@
#include <limal/ca-mgm/CommonData.hpp>
#include <limal/ca-mgm/ExtensionBase.hpp>
#include <limal/ca-mgm/LiteralValues.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE {
@@ -83,7 +83,7 @@
dump() const;
private:
- blocxx::COWIntrusiveReference<IssuerAlternativeNameExtImpl> m_impl;
+ ca_mgm::RWCOW_pointer<IssuerAlternativeNameExtImpl> m_impl;
};
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/LiteralValues.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/LiteralValues.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/LiteralValues.hpp Sun Jul 4 18:59:33 2010
@@ -24,7 +24,7 @@
#include <limal/ca-mgm/config.h>
#include <limal/ca-mgm/CommonData.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE {
@@ -131,7 +131,7 @@
#endif
private:
- blocxx::COWIntrusiveReference<LiteralValueImpl> m_impl;
+ ca_mgm::RWCOW_pointer<LiteralValueImpl> m_impl;
};
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/RequestData.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/RequestData.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/RequestData.hpp Sun Jul 4 18:59:33 2010
@@ -27,7 +27,7 @@
#include <limal/ca-mgm/X509v3RequestExtensions.hpp>
#include <limal/ca-mgm/DNObject.hpp>
#include <limal/ByteBuffer.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE {
@@ -105,7 +105,7 @@
dump() const;
protected:
- blocxx::COWIntrusiveReference<RequestDataImpl> m_impl;
+ ca_mgm::RWCOW_pointer<RequestDataImpl> m_impl;
RequestData();
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/RequestGenerationData.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/RequestGenerationData.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/RequestGenerationData.hpp Sun Jul 4 18:59:33 2010
@@ -27,7 +27,7 @@
#include <limal/ca-mgm/CommonData.hpp>
#include <limal/ca-mgm/DNObject.hpp>
#include <limal/ca-mgm/X509v3RequestExtensions.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE
{
@@ -117,7 +117,7 @@
dump() const;
private:
- blocxx::COWIntrusiveReference<RequestGenerationDataImpl> m_impl;
+ ca_mgm::RWCOW_pointer<RequestGenerationDataImpl> m_impl;
};
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/StringExtensions.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/StringExtensions.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/StringExtensions.hpp Sun Jul 4 18:59:33 2010
@@ -25,7 +25,7 @@
#include <limal/ca-mgm/config.h>
#include <limal/ca-mgm/CommonData.hpp>
#include <limal/ca-mgm/ExtensionBase.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE {
@@ -55,7 +55,7 @@
StringExtension& operator=(const StringExtension& extension);
- blocxx::COWIntrusiveReference<StringExtensionImpl> m_impl;
+ ca_mgm::RWCOW_pointer<StringExtensionImpl> m_impl;
};
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/SubjectAlternativeNameExtension.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/SubjectAlternativeNameExtension.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/SubjectAlternativeNameExtension.hpp Sun Jul 4 18:59:33 2010
@@ -26,7 +26,7 @@
#include <limal/ca-mgm/CommonData.hpp>
#include <limal/ca-mgm/ExtensionBase.hpp>
#include <limal/ca-mgm/LiteralValues.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE {
@@ -79,7 +79,7 @@
dump() const;
private:
- blocxx::COWIntrusiveReference<SubjectAlternativeNameExtImpl> m_impl;
+ ca_mgm::RWCOW_pointer<SubjectAlternativeNameExtImpl> m_impl;
};
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/SubjectKeyIdentifierExtension.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/SubjectKeyIdentifierExtension.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/SubjectKeyIdentifierExtension.hpp Sun Jul 4 18:59:33 2010
@@ -25,7 +25,7 @@
#include <limal/ca-mgm/config.h>
#include <limal/ca-mgm/CommonData.hpp>
#include <limal/ca-mgm/ExtensionBase.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE {
@@ -75,7 +75,7 @@
dump() const;
private:
- blocxx::COWIntrusiveReference<SubjectKeyIdentifierExtImpl> m_impl;
+ ca_mgm::RWCOW_pointer<SubjectKeyIdentifierExtImpl> m_impl;
};
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CRLExtensions.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CRLExtensions.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CRLExtensions.hpp Sun Jul 4 18:59:33 2010
@@ -26,7 +26,7 @@
#include <limal/ca-mgm/CommonData.hpp>
#include <limal/ca-mgm/AuthorityKeyIdentifierExtension.hpp>
#include <limal/ca-mgm/IssuerAlternativeNameExtension.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE {
@@ -67,7 +67,7 @@
dump() const;
protected:
- blocxx::COWIntrusiveReference<X509v3CRLExtsImpl> m_impl;
+ ca_mgm::RWCOW_pointer<X509v3CRLExtsImpl> m_impl;
X509v3CRLExts();
};
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CRLGenerationExtensions.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CRLGenerationExtensions.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CRLGenerationExtensions.hpp Sun Jul 4 18:59:33 2010
@@ -27,7 +27,7 @@
#include <limal/ca-mgm/CommonData.hpp>
#include <limal/ca-mgm/AuthorityKeyIdentifierGenerateExtension.hpp>
#include <limal/ca-mgm/IssuerAlternativeNameExtension.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE
{
@@ -86,7 +86,7 @@
dump() const;
private:
- blocxx::COWIntrusiveReference<X509v3CRLGenerationExtsImpl> m_impl;
+ ca_mgm::RWCOW_pointer<X509v3CRLGenerationExtsImpl> m_impl;
};
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CertificateExtensions.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CertificateExtensions.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CertificateExtensions.hpp Sun Jul 4 18:59:33 2010
@@ -36,7 +36,7 @@
#include <limal/ca-mgm/AuthorityInfoAccessExtension.hpp>
#include <limal/ca-mgm/CRLDistributionPointsExtension.hpp>
#include <limal/ca-mgm/CertificatePoliciesExtension.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE {
@@ -121,7 +121,7 @@
dump() const;
protected:
- blocxx::COWIntrusiveReference<X509v3CertificateExtsImpl> m_impl;
+ ca_mgm::RWCOW_pointer<X509v3CertificateExtsImpl> m_impl;
X509v3CertificateExts();
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CertificateIssueExtensions.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CertificateIssueExtensions.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3CertificateIssueExtensions.hpp Sun Jul 4 18:59:33 2010
@@ -37,7 +37,7 @@
#include <limal/ca-mgm/AuthorityInfoAccessExtension.hpp>
#include <limal/ca-mgm/CRLDistributionPointsExtension.hpp>
#include <limal/ca-mgm/CertificatePoliciesExtension.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE
{
@@ -240,7 +240,7 @@
dump() const;
private:
- blocxx::COWIntrusiveReference<X509v3CertificateIssueExtsImpl> m_impl;
+ ca_mgm::RWCOW_pointer<X509v3CertificateIssueExtsImpl> m_impl;
};
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3RequestExtensions.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3RequestExtensions.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/X509v3RequestExtensions.hpp Sun Jul 4 18:59:33 2010
@@ -30,7 +30,7 @@
#include <limal/ca-mgm/BasicConstraintsExtension.hpp>
#include <limal/ca-mgm/SubjectKeyIdentifierExtension.hpp>
#include <limal/ca-mgm/SubjectAlternativeNameExtension.hpp>
-#include <blocxx/COWIntrusiveReference.hpp>
+#include <limal/PtrTypes.hpp>
namespace CA_MGM_NAMESPACE {
@@ -145,7 +145,7 @@
dump() const;
protected:
- blocxx::COWIntrusiveReference<X509v3RequestExtsImpl> m_impl;
+ ca_mgm::RWCOW_pointer<X509v3RequestExtsImpl> m_impl;
};
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt Sun Jul 4 18:59:33 2010
@@ -1,14 +1,14 @@
-d12f85f32848ae7f9f1d8064813aaa53-1278255493 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-68b3a1b7290aadfd42361b1b3c14e69a-1278255496 /C=DE/CN=Test Server Certificate\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1278255501 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1278255504 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1278255508 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-d12f85f32848ae7f9f1d8064813aaa53-1278255517 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-c293624b6a877f401407ce8f8f1f327e-1278255518 /C=DE/L=Nuremberg/O=SUSE Linux GmbH/OU=IT/CN=SUSE User CA/emailAddress=security-team(a)suse.de
-d12f85f32848ae7f9f1d8064813aaa53-1278255520 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
-c1943ae4b9bd7320fae3e29f217483e3-1278255521 /C=DE/CN=Test Request/emailAddress=suse(a)suse.de
-d816690a832b0e52becd255d3a62e975-1278255523 /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse(a)suse.de
-9198f6798d9da70d7cbfb67b610633f5-1278255525 /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse(a)suse.de
-3e248858337c2b46dc67a0f9389376dd-1278255526 /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse(a)suse.de
-bf04fdd95062554800c1556085f47063-1278255529 /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse(a)suse.de
-9797ac11af29f94b82c1e5b0499ab5f2-1278255531 /C=DE/CN=Test Sub CA/emailAddress=suse(a)suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1278262531 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
+68b3a1b7290aadfd42361b1b3c14e69a-1278262532 /C=DE/CN=Test Server Certificate\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1278262536 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1278262541 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1278262545 /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1278262556 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
+c293624b6a877f401407ce8f8f1f327e-1278262557 /C=DE/L=Nuremberg/O=SUSE Linux GmbH/OU=IT/CN=SUSE User CA/emailAddress=security-team(a)suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1278262559 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse(a)suse.de
+c1943ae4b9bd7320fae3e29f217483e3-1278262560 /C=DE/CN=Test Request/emailAddress=suse(a)suse.de
+d816690a832b0e52becd255d3a62e975-1278262564 /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse(a)suse.de
+9198f6798d9da70d7cbfb67b610633f5-1278262565 /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse(a)suse.de
+3e248858337c2b46dc67a0f9389376dd-1278262566 /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse(a)suse.de
+bf04fdd95062554800c1556085f47063-1278262567 /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse(a)suse.de
+9797ac11af29f94b82c1e5b0499ab5f2-1278262569 /C=DE/CN=Test Sub CA/emailAddress=suse(a)suse.de
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt Sun Jul 4 18:59:33 2010
@@ -1,11 +1,11 @@
-V 110704145815Z 01 unknown /C=DE/CN=Test CA/SUSE Inc.\Gmbh/emailAddress=suse(a)suse.de
-V 110704145816Z 02 unknown /C=DE/CN=Test Server Certificate/SUSE Inc.\Gmbh/emailAddress=suse(a)suse.de
-V 110704145819Z 03 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-V 110704145822Z 04 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-V 110704145826Z 05 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
-R 110704145842Z 100704145842Z 06 unknown /C=DE/CN=Test Certificate for revocation/emailAddress=suse(a)suse.de
-R 110704145843Z 100704145844Z,holdInstruction,holdInstructionCallIssuer 07 unknown /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse(a)suse.de
-R 110704145845Z 100704145846Z,keyTime,20100704144206Z 08 unknown /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse(a)suse.de
-R 110704145846Z 100704145848Z,CAkeyTime,20100704144208Z 09 unknown /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse(a)suse.de
-R 110704145849Z 100704145850Z,holdInstruction,1.6.21.43 0A unknown /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse(a)suse.de
-V 120703145851Z 0B unknown /C=DE/CN=Test Sub CA/emailAddress=suse(a)suse.de
+V 110704165532Z 01 unknown /C=DE/CN=Test CA/SUSE Inc.\Gmbh/emailAddress=suse(a)suse.de
+V 110704165532Z 02 unknown /C=DE/CN=Test Server Certificate/SUSE Inc.\Gmbh/emailAddress=suse(a)suse.de
+V 110704165534Z 03 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+V 110704165538Z 04 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+V 110704165543Z 05 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse(a)suse.de
+R 110704165601Z 100704165603Z 06 unknown /C=DE/CN=Test Certificate for revocation/emailAddress=suse(a)suse.de
+R 110704165604Z 100704165604Z,holdInstruction,holdInstructionCallIssuer 07 unknown /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse(a)suse.de
+R 110704165605Z 100704165606Z,keyTime,20100704163926Z 08 unknown /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse(a)suse.de
+R 110704165606Z 100704165607Z,CAkeyTime,20100704163927Z 09 unknown /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse(a)suse.de
+R 110704165607Z 100704165608Z,holdInstruction,1.6.21.43 0A unknown /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse(a)suse.de
+V 120703165609Z 0B unknown /C=DE/CN=Test Sub CA/emailAddress=suse(a)suse.de
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/.rand
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
Binary files - no diff available.
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/…
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem Sun Jul 4 18:59:33 2010
@@ -1,7 +1,7 @@
-----BEGIN X509 CRL-----
MIIC+TCCAeECAQEwDQYJKoZIhvcNAQEFBQAwQzELMAkGA1UEBhMCREUxFzAVBgNV
BAMTDlN0YXRpYyBUZXN0IENBMRswGQYJKoZIhvcNAQkBFgxzdXNlQHN1c2UuZGUX
-DTEwMDcwNDE0NTg1NFoXDTEwMDcwNTE0NTg1NFowgfAwEgIBAxcNMDUwODE4MTQx
+DTEwMDcwNDE2NTYxMloXDTEwMDcwNTE2NTYxMlowgfAwEgIBAxcNMDUwODE4MTQx
MzIzWjAyAgEEFw0wNTA4MTgxNDEzMjVaMB4wCgYDVR0VBAMKAQYwEAYDVR0XBAkG
ByqGSM44AgIwOgIBBRcNMDUwODE4MTQxMzI2WjAmMAoGA1UdFQQDCgEBMBgGA1Ud
GAQRGA8yMDA1MDgxODE1NTY0NlowOgIBBhcNMDUwODE4MTQxMzI4WjAmMAoGA1Ud
@@ -9,10 +9,10 @@
ODE4WjAaMAoGA1UdFQQDCgEGMAwGA1UdFwQFBgMuFSugdzB1MHMGA1UdIwRsMGqA
FDIAwASkKojCPsrVvdhM01KIIH87oUekRTBDMQswCQYDVQQGEwJERTEXMBUGA1UE
AxMOU3RhdGljIFRlc3QgQ0ExGzAZBgkqhkiG9w0BCQEWDHN1c2VAc3VzZS5kZYIJ
-AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQA5akWwtlMM4cAaalAvC4zkhtEO
-hh5UlejNJc2qCQGTM0Hl4VcID8qe33v3SYimvB3xRkanROCpW+9gB5rW0y5ZPE74
-M7tjaGVT01gcbxiOet03QyOXr29WQjgvkvWUD19qr4r3fUhiU8ZTXbjCgDgov1Cj
-Wy6kM+7zyG1dfLRxlzEQ9acxucqfOCSd+21tPUk7vk5DCZZqO4RURZH1wx+NLmJW
-6x4Wj419+1HL5YGspwc0RcE+dhX9Dyj8pCEQKZAJQXmUPvru/nWiJ+Ot0cKB1SZm
-1my8tI8TQUApsulvpDiC9piiNsZeXKfTJtqRVBxWyXECFto/KDE7dNUzrmVK
+AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQB/SLGeASU2Gh53qt0BAqd72oV+
+CRqTtWBPTqWWq725/fjebLqo77+0/vyRrqIge14LeuKe2e2aMsfKDSjHfgW0UF44
+SynM+JGYf7IiBSoE/lOMDtHAWeVrX/Z5F2OgjybVmBKXgox5MLhPMDtV6o2z/8Su
+6PNrO+ef1ibepx0zmXHScfPSWthlyN7PlMTgKapFBcLiHndQ0zWbtCOkETmFaFzo
+Q+x+nBF6cWSHjvcy0aYSzrbEQlPOxXU3zANgzLWwQAgl1ZtlvrnFXrot/67xDNSL
+SeQwPU6CkimwC/M1foZ8s9ew/ly+ejXfmyp1O44wx5UjdKZPWmejX2DY/+gF
-----END X509 CRL-----
--
To unsubscribe, e-mail: limal-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: limal-commit+help(a)opensuse.org
1
0