Author: mcalmer
Date: Sun Jul 4 10:45:20 2010
New Revision: 2677
URL: http://svn.opensuse.org/viewcvs/limal?rev=2677&view=rev
Log:
remove blocxx/Format
Modified:
limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniParser.cpp
limal-branches/mc-devel/limal-ca-mgm/src/LDAPUrlImpl.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/Url.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/testsuite/CAConfig.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_CA1/serial
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/INIParser/IniParser.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniParser.cpp?rev=2677&r1=2676&r2=2677&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniParser.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniParser.cpp Sun Jul 4 10:45:20 2010
@@ -15,7 +15,7 @@
#include
#include
#include <cassert>
-#include
+
#include "INIParser/IniParser.h"
#include "INIParser/IniFile.h"
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/src/LDAPUrlImpl.cpp?rev=2677&r1=2676&r2=2677&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/LDAPUrlImpl.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/LDAPUrlImpl.cpp Sun Jul 4 10:45:20 2010
@@ -101,8 +101,8 @@
else
{
BLOCXX_THROW(ca_mgm::url::UrlNotSupportedException,
- Format(__("Unable to parse LDAP URL query string '%1'."),
- getQueryString()).c_str()
+ str::form(__("Unable to parse LDAP URL query string '%s'."),
+ getQueryString().c_str()).c_str()
);
}
return pmap;
@@ -142,8 +142,8 @@
if( !found)
{
BLOCXX_THROW(UrlNotSupportedException,
- Format(__("Invalid LDAP URL query parameter '%1'."),
- p->first).c_str()
+ str::form(__("Invalid LDAP URL query parameter '%s'."),
+ p->first.c_str()).c_str()
);
}
}
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/src/Logger.cpp?rev=2677&r1=2676&r2=2677&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/Logger.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/Logger.cpp Sun Jul 4 10:45:20 2010
@@ -18,13 +18,13 @@
/-*/
#include
#include
-
+#include
#include
#include
#include
#include
#include
-#include
+
#include "Utils.hpp"
@@ -325,9 +325,9 @@
if( !filename.startsWith(BLOCXX_FILENAME_SEPARATOR))
{
BLOCXX_THROW(ca_mgm::ValueException,
- Format(__("The specified log file name '%1' "
+ str::form(__("The specified log file name '%s' "
"is not absolute"),
- filename).c_str()
+ 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/src/OpenSSLUtils.cpp?rev=2677&r1=2676&r2=2677&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.cpp Sun Jul 4 10:45:20 2010
@@ -24,8 +24,8 @@
#include
#include
#include
-#include
-#include
+#include
+#include
#include
#include
#include
@@ -2440,7 +2440,7 @@
if( r != 0 )
{
- LOGIT_ERROR(Format("Can not create directory: %s (%s [%d])",
+ LOGIT_ERROR(str::form("Can not create directory: %s (%s [%d])",
pi.toString().c_str(), ::strerror(r), r));
BLOCXX_THROW(ca_mgm::SystemException,
str::form(__("Cannot create directory: %s (%s [%d])."),
@@ -2488,7 +2488,7 @@
{
path::removeDirRecursive(repository + "/" + caName);
- LOGIT_ERROR(Format("Can not create directory: %s (%s [%d])",
+ LOGIT_ERROR(str::form("Can not create directory: %s (%s [%d])",
dir.c_str(), ::strerror(r), r));
BLOCXX_THROW(ca_mgm::SystemException,
str::form(__("Cannot create directory: %s (%s [%d])."),
@@ -2502,7 +2502,7 @@
{
path::removeDirRecursive(repository + "/" + caName);
- LOGIT_ERROR(Format("Can not create directory: %s (%s [%d])",
+ LOGIT_ERROR(str::form("Can not create directory: %s (%s [%d])",
dir.c_str(), ::strerror(r), r));
BLOCXX_THROW(ca_mgm::SystemException,
str::form(__("Cannot create directory: %s (%s [%d])."),
@@ -2516,7 +2516,7 @@
{
path::removeDirRecursive(repository + "/" + caName);
- LOGIT_ERROR(Format("Can not create directory: %s (%s [%d])",
+ LOGIT_ERROR(str::form("Can not create directory: %s (%s [%d])",
dir.c_str(), ::strerror(r), r));
BLOCXX_THROW(ca_mgm::SystemException,
str::form(__("Cannot create directory: %s (%s [%d])."),
@@ -2530,7 +2530,7 @@
{
path::removeDirRecursive(repository + "/" + caName);
- LOGIT_ERROR(Format("Can not create directory: %s (%s [%d])",
+ LOGIT_ERROR(str::form("Can not create directory: %s (%s [%d])",
dir.c_str(), ::strerror(r), r));
BLOCXX_THROW(ca_mgm::SystemException,
str::form(__("Cannot create directory: %s (%s [%d])."),
@@ -2544,7 +2544,7 @@
{
path::removeDirRecursive(repository + "/" + caName);
- LOGIT_ERROR(Format("Can not create directory: %s (%s [%d])",
+ LOGIT_ERROR(str::form("Can not create directory: %s (%s [%d])",
dir.c_str(), ::strerror(r), r));
BLOCXX_THROW(ca_mgm::SystemException,
str::form(__("Cannot create directory: %s (%s [%d])."),
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/src/Url.cpp?rev=2677&r1=2676&r2=2677&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/Url.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/Url.cpp Sun Jul 4 10:45:20 2010
@@ -18,8 +18,8 @@
/-*/
#include
-#include
-#include
+#include
+#include
#include "UrlByScheme.hpp"
#include "Utils.hpp"
@@ -120,15 +120,15 @@
catch(const blocxx::Exception &e)
{
BLOCXX_THROW_SUBEX(url::UrlParsingException,
- Format(__("Unable to parse url string '%1'."),
- urlString).c_str(), e
+ str::form(__("Unable to parse url string '%s'."),
+ urlString.c_str()).c_str(), e
);
}
catch( ... )
{
BLOCXX_THROW(url::UrlParsingException,
- Format(__("Unable to parse url string '%1'."),
- urlString).c_str()
+ str::form(__("Unable to parse url string '%s'."),
+ urlString.c_str()).c_str()
);
}
}
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/src/Utils.hpp?rev=2677&r1=2676&r2=2677&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp Sun Jul 4 10:45:20 2010
@@ -33,7 +33,7 @@
#include
#include
-#include
+
#include
#include
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/src/limal/Exception.hpp?rev=2677&r1=2676&r2=2677&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/Exception.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/Exception.hpp Sun Jul 4 10:45:20 2010
@@ -26,7 +26,7 @@
* BloCxx provides several macros helping to throw exceptions:
* @code
* #include
- * #include
+ *
*
* BLOCXX_THROW_ERRNO_MSG(ca_mgm::SystemException,
* "Can't do this and that");
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/testsuite/CAConfig.cc?rev=2677&r1=2676&r2=2677&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CAConfig.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CAConfig.cc Sun Jul 4 10:45:20 2010
@@ -2,7 +2,7 @@
#include
#include
#include
-#include
+
#include
#include
#include
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/testsuite/TestRepos/Test_CA1/cam.txt?rev=2677&r1=2676&r2=2677&view=diff
==============================================================================
--- 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 10:45:20 2010
@@ -0,0 +1,14 @@
+d12f85f32848ae7f9f1d8064813aaa53-1278233041 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de
+68b3a1b7290aadfd42361b1b3c14e69a-1278233042 /C=DE/CN=Test Server Certificate\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1278233047 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1278233050 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1278233053 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1278233062 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de
+c293624b6a877f401407ce8f8f1f327e-1278233063 /C=DE/L=Nuremberg/O=SUSE Linux GmbH/OU=IT/CN=SUSE User CA/emailAddress=security-team@suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1278233064 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de
+c1943ae4b9bd7320fae3e29f217483e3-1278233065 /C=DE/CN=Test Request/emailAddress=suse@suse.de
+d816690a832b0e52becd255d3a62e975-1278233071 /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse@suse.de
+9198f6798d9da70d7cbfb67b610633f5-1278233072 /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse@suse.de
+3e248858337c2b46dc67a0f9389376dd-1278233074 /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse@suse.de
+bf04fdd95062554800c1556085f47063-1278233075 /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse@suse.de
+9797ac11af29f94b82c1e5b0499ab5f2-1278233077 /C=DE/CN=Test Sub CA/emailAddress=suse@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/testsuite/TestRepos/Test_CA1/index.txt?rev=2677&r1=2676&r2=2677&view=diff
==============================================================================
--- 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 10:45:20 2010
@@ -0,0 +1,11 @@
+V 110704084402Z 01 unknown /C=DE/CN=Test CA/SUSE Inc.\Gmbh/emailAddress=suse@suse.de
+V 110704084402Z 02 unknown /C=DE/CN=Test Server Certificate/SUSE Inc.\Gmbh/emailAddress=suse@suse.de
+V 110704084405Z 03 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
+V 110704084408Z 04 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
+V 110704084410Z 05 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
+R 110704084429Z 100704084430Z 06 unknown /C=DE/CN=Test Certificate for revocation/emailAddress=suse@suse.de
+R 110704084431Z 100704084432Z,holdInstruction,holdInstructionCallIssuer 07 unknown /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse@suse.de
+R 110704084432Z 100704084433Z,keyTime,20100704082753Z 08 unknown /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse@suse.de
+R 110704084434Z 100704084434Z,CAkeyTime,20100704082754Z 09 unknown /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse@suse.de
+R 110704084435Z 100704084436Z,holdInstruction,1.6.21.43 0A unknown /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse@suse.de
+V 120703084437Z 0B unknown /C=DE/CN=Test Sub CA/emailAddress=suse@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/testsuite/TestRepos/Test_CA1/serial?rev=2677&r1=2676&r2=2677&view=diff
==============================================================================
--- 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 Sun Jul 4 10:45:20 2010
@@ -1 +1 @@
-01
\ No newline at end of file
+0C
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/testsuite/TestRepos/Test_CA2/.rand?rev=2677&r1=2676&r2=2677&view=diff
==============================================================================
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/testsuite/TestRepos/Test_CA2/crl/crl.pem?rev=2677&r1=2676&r2=2677&view=diff
==============================================================================
--- 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 10:45:20 2010
@@ -1,7 +1,7 @@
-----BEGIN X509 CRL-----
MIIC+TCCAeECAQEwDQYJKoZIhvcNAQEFBQAwQzELMAkGA1UEBhMCREUxFzAVBgNV
BAMTDlN0YXRpYyBUZXN0IENBMRswGQYJKoZIhvcNAQkBFgxzdXNlQHN1c2UuZGUX
-DTEwMDcwNDA4Mjc1MVoXDTEwMDcwNTA4Mjc1MVowgfAwEgIBAxcNMDUwODE4MTQx
+DTEwMDcwNDA4NDQ0MVoXDTEwMDcwNTA4NDQ0MVowgfAwEgIBAxcNMDUwODE4MTQx
MzIzWjAyAgEEFw0wNTA4MTgxNDEzMjVaMB4wCgYDVR0VBAMKAQYwEAYDVR0XBAkG
ByqGSM44AgIwOgIBBRcNMDUwODE4MTQxMzI2WjAmMAoGA1UdFQQDCgEBMBgGA1Ud
GAQRGA8yMDA1MDgxODE1NTY0NlowOgIBBhcNMDUwODE4MTQxMzI4WjAmMAoGA1Ud
@@ -9,10 +9,10 @@
ODE4WjAaMAoGA1UdFQQDCgEGMAwGA1UdFwQFBgMuFSugdzB1MHMGA1UdIwRsMGqA
FDIAwASkKojCPsrVvdhM01KIIH87oUekRTBDMQswCQYDVQQGEwJERTEXMBUGA1UE
AxMOU3RhdGljIFRlc3QgQ0ExGzAZBgkqhkiG9w0BCQEWDHN1c2VAc3VzZS5kZYIJ
-AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQA8nxx5XN7PiXfFL0Fd1I/Ou3RY
-47yBu1nD6pUzhMdZYIPNrDI2tZxnF5AZy8GtUPYPqqFNQ/yJerz5ArgajafahCbu
-NdUUQEjgHstCmuJhgzkEbQuajGBu/1qZFKX30JNv1ESHQP05RitACycId2L8a7aP
-qT9u1Wbe2iFblGFiMN3gkGfY2sChhAtGU28BHRsjWSdIh+ZuprpEWx8ovgfayJoI
-+9lIohsFycpMgT2HTsF4ywdTHAgqGVK5QQvzPtg7VeoUyzUGahnr3hSKqFGQyH5L
-4amgVJV11aW/Ufj3X56eIUBolzS3SdZXidb2O7kYThjtJJ9lxuLUaz6MvSD7
+AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQB1Wa18UU3oJDglcoFThZ3juDqa
+1joBTZoH/RSbMXuyfruKZXrCZrsAbTSX/1Hcd+bZFui2sBlRbFUL7DkSwlC3LMqs
+m0GUIBmnu1yxGqtNldJAwNyVOoBaK/bCWpbLjtQoigBmQ8s/Wy/ig+1tJvmPV2mE
+8TEvP3mZksTHDuVws3jfUwlsvoXidSe/HHzGgoTqGgfEQi4sGBbJUkxQd6zlW4X2
+zLQqaSGcJbkKHBFs53F1dVTu2ak9vSdbTL5h8nGjZhCbQiRp+oKKGQl4JDrfglBV
+QHBwpBZ+7nbsp6YMOl7VlMwglyoqEwozqt5i9Aj1LEUV62EJ+4cYbD3TbHER
-----END X509 CRL-----
--
To unsubscribe, e-mail: limal-commit+unsubscribe@opensuse.org
For additional commands, e-mail: limal-commit+help@opensuse.org
