Author: mcalmer
Date: Tue Aug 10 18:58:04 2010
New Revision: 2693
URL: http://svn.opensuse.org/viewcvs/limal?rev=2693&view=rev
Log:
remove blocxx references from ini parser 2
Modified:
limal-branches/mc-devel/limal-ca-mgm/src/INIParser/INIParser.hpp
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/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/INIParser/INIParser.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/INIParser/INIParser.hpp?rev=2693&r1=2692&r2=2693&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/INIParser/INIParser.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/INIParser/INIParser.hpp Tue Aug 10 18:58:04 2010
@@ -397,7 +397,6 @@
* @code
* #include "INIParser/INIParser.hpp"
*
- * using namespace blocxx;
* using namespace ca_mgm;
* using namespace ca_mgm::INI;
*
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/src/INIParser/IniFile.cpp?rev=2693&r1=2692&r2=2693&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.cpp Tue Aug 10 18:58:04 2010
@@ -26,7 +26,6 @@
using std::map;
using std::multimap;
using std::pair;
-using namespace blocxx;
std::string pathToString(const std::vectorstd::string&p)
{
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/src/INIParser/IniFile.h?rev=2693&r1=2692&r2=2693&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.h (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniFile.h Tue Aug 10 18:58:04 2010
@@ -231,7 +231,6 @@
// were never actuially used
/** The parser, queried about global settings */
- //blocxx::IntrusiveReference<IniParser> ip;
const IniParser *ip;
/**
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=2693&r1=2692&r2=2693&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 Tue Aug 10 18:58:04 2010
@@ -27,7 +27,6 @@
using std::ifstream;
using std::ofstream;
-using namespace blocxx;
int assert_dir( const std::string & spath)
{
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/src/INIParser/IniParser.h?rev=2693&r1=2692&r2=2693&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniParser.h (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/INIParser/IniParser.h Tue Aug 10 18:58:04 2010
@@ -19,7 +19,6 @@
#include
#include
#include
-#include
#include <iosfwd>
#include <fstream>
@@ -132,7 +131,7 @@
/**
* Contains info from scrconf file and ini file read routines.
*/
-class IniParser: public blocxx::IntrusiveCountableBase
+class IniParser
{
private:
/**
@@ -269,7 +268,7 @@
IniSection inifile;
// apparently the uninitialized members are filled in
// by the grammar definition
- IniParser () : blocxx::IntrusiveCountableBase(),
+ IniParser () :
linecomments (), comments (),
sections (), params (), rewrites (),
started (false), multiple_files (false),
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=2693&r1=2692&r2=2693&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 Tue Aug 10 18:58:04 2010
@@ -1,14 +1,14 @@
-d12f85f32848ae7f9f1d8064813aaa53-1281458957 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de
-68b3a1b7290aadfd42361b1b3c14e69a-1281458958 /C=DE/CN=Test Server Certificate\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1281458963 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1281458966 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1281458969 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
-d12f85f32848ae7f9f1d8064813aaa53-1281458978 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de
-c293624b6a877f401407ce8f8f1f327e-1281458979 /C=DE/L=Nuremberg/O=SUSE Linux GmbH/OU=IT/CN=SUSE User CA/emailAddress=security-team@suse.de
-d12f85f32848ae7f9f1d8064813aaa53-1281458980 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de
-c1943ae4b9bd7320fae3e29f217483e3-1281458981 /C=DE/CN=Test Request/emailAddress=suse@suse.de
-d816690a832b0e52becd255d3a62e975-1281458984 /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse@suse.de
-9198f6798d9da70d7cbfb67b610633f5-1281458986 /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse@suse.de
-3e248858337c2b46dc67a0f9389376dd-1281458988 /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse@suse.de
-bf04fdd95062554800c1556085f47063-1281458989 /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse@suse.de
-9797ac11af29f94b82c1e5b0499ab5f2-1281458992 /C=DE/CN=Test Sub CA/emailAddress=suse@suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1281459437 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de
+68b3a1b7290aadfd42361b1b3c14e69a-1281459439 /C=DE/CN=Test Server Certificate\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1281459443 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1281459448 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1281459452 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1281459461 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de
+c293624b6a877f401407ce8f8f1f327e-1281459462 /C=DE/L=Nuremberg/O=SUSE Linux GmbH/OU=IT/CN=SUSE User CA/emailAddress=security-team@suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1281459464 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de
+c1943ae4b9bd7320fae3e29f217483e3-1281459465 /C=DE/CN=Test Request/emailAddress=suse@suse.de
+d816690a832b0e52becd255d3a62e975-1281459467 /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse@suse.de
+9198f6798d9da70d7cbfb67b610633f5-1281459468 /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse@suse.de
+3e248858337c2b46dc67a0f9389376dd-1281459469 /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse@suse.de
+bf04fdd95062554800c1556085f47063-1281459470 /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse@suse.de
+9797ac11af29f94b82c1e5b0499ab5f2-1281459472 /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=2693&r1=2692&r2=2693&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 Tue Aug 10 18:58:04 2010
@@ -1,11 +1,11 @@
-V 110810164918Z 01 unknown /C=DE/CN=Test CA/SUSE Inc.\Gmbh/emailAddress=suse@suse.de
-V 110810164918Z 02 unknown /C=DE/CN=Test Server Certificate/SUSE Inc.\Gmbh/emailAddress=suse@suse.de
-V 110810164920Z 03 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
-V 110810164923Z 04 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
-V 110810164926Z 05 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
-R 110810164942Z 100810164943Z 06 unknown /C=DE/CN=Test Certificate for revocation/emailAddress=suse@suse.de
-R 110810164944Z 100810164946Z,holdInstruction,holdInstructionCallIssuer 07 unknown /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse@suse.de
-R 110810164946Z 100810164947Z,keyTime,20100810163307Z 08 unknown /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse@suse.de
-R 110810164948Z 100810164948Z,CAkeyTime,20100810163308Z 09 unknown /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse@suse.de
-R 110810164949Z 100810164951Z,holdInstruction,1.6.21.43 0A unknown /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse@suse.de
-V 120809164952Z 0B unknown /C=DE/CN=Test Sub CA/emailAddress=suse@suse.de
+V 110810165718Z 01 unknown /C=DE/CN=Test CA/SUSE Inc.\Gmbh/emailAddress=suse@suse.de
+V 110810165719Z 02 unknown /C=DE/CN=Test Server Certificate/SUSE Inc.\Gmbh/emailAddress=suse@suse.de
+V 110810165721Z 03 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
+V 110810165726Z 04 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
+V 110810165730Z 05 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
+R 110810165745Z 100810165746Z 06 unknown /C=DE/CN=Test Certificate for revocation/emailAddress=suse@suse.de
+R 110810165747Z 100810165747Z,holdInstruction,holdInstructionCallIssuer 07 unknown /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse@suse.de
+R 110810165748Z 100810165749Z,keyTime,20100810164109Z 08 unknown /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse@suse.de
+R 110810165749Z 100810165750Z,CAkeyTime,20100810164110Z 09 unknown /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse@suse.de
+R 110810165750Z 100810165751Z,holdInstruction,1.6.21.43 0A unknown /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse@suse.de
+V 120809165752Z 0B unknown /C=DE/CN=Test Sub CA/emailAddress=suse@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/testsuite/TestRepos/Test_CA2/.rand?rev=2693&r1=2692&r2=2693&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=2693&r1=2692&r2=2693&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 Tue Aug 10 18:58:04 2010
@@ -1,7 +1,7 @@
-----BEGIN X509 CRL-----
MIIC+TCCAeECAQEwDQYJKoZIhvcNAQEFBQAwQzELMAkGA1UEBhMCREUxFzAVBgNV
BAMTDlN0YXRpYyBUZXN0IENBMRswGQYJKoZIhvcNAQkBFgxzdXNlQHN1c2UuZGUX
-DTEwMDgxMDE2NDk1M1oXDTEwMDgxMTE2NDk1M1owgfAwEgIBAxcNMDUwODE4MTQx
+DTEwMDgxMDE2NTc1NloXDTEwMDgxMTE2NTc1NlowgfAwEgIBAxcNMDUwODE4MTQx
MzIzWjAyAgEEFw0wNTA4MTgxNDEzMjVaMB4wCgYDVR0VBAMKAQYwEAYDVR0XBAkG
ByqGSM44AgIwOgIBBRcNMDUwODE4MTQxMzI2WjAmMAoGA1UdFQQDCgEBMBgGA1Ud
GAQRGA8yMDA1MDgxODE1NTY0NlowOgIBBhcNMDUwODE4MTQxMzI4WjAmMAoGA1Ud
@@ -9,10 +9,10 @@
ODE4WjAaMAoGA1UdFQQDCgEGMAwGA1UdFwQFBgMuFSugdzB1MHMGA1UdIwRsMGqA
FDIAwASkKojCPsrVvdhM01KIIH87oUekRTBDMQswCQYDVQQGEwJERTEXMBUGA1UE
AxMOU3RhdGljIFRlc3QgQ0ExGzAZBgkqhkiG9w0BCQEWDHN1c2VAc3VzZS5kZYIJ
-AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQBL2rnMcrdmYLFb3Oee65AeDjSk
-3Fd3QkXZtv4tHhy7+LGRWb6iwCz3JUzAmha6aXqHBxfN8GhWK3eRdodoZpB2CqwD
-SbrHeZgrbP6/KS5BpXOR6CuwAB8sjIFurKtHEmFTn2Ds9kEGyTna00Sy8EpliIve
-07Zyor6WCU7gOeahHaC5/A9LY8y59mxFkVzezLcsDgzH6apkBUqLzTk+M22Aa55O
-pHcaEIidav8IbYs+8VmbsaavXPANxUVQ6ffGwdmSukGfyVlVwZx6gu6jhVKkp1rk
-n0yFjMy3bIclm9OR/RL8RCevysoRcW5m9jCq9I5VALRENu4/W7SlpRqXgHox
+AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQAh1CRJ1UwRveR/F/PzdMB2YAdv
+bp/7RtxfevhLOO7KMcSBtM947OpU7EmKuSDtOtBpy57GnBjtHLgDYMxyt0VvGXxw
+ubJB7KUP/bZAUIWkC7ZBMa5U14M1JwQLewONTsmNr1nCzCE8a3UyzTHk4Zd0wQVV
+SrrD3dJBjqdIkBmJD3XhdnCOBaWCdrW6k83O22ssMLT6C7jey3v8bmHc3okOGbW9
+ICosZsMYdqywob4LZhSy6AOWWdSGaQg1y1eNiCCxZlEK/jdu7uZflSvYJf0V+b5b
+5mK0Ch0UkFkyoj9PPm9fVBWOb7DNuECBo5H4klB+SCBiYuLqOBQQRqP93lSq
-----END X509 CRL-----
--
To unsubscribe, e-mail: limal-commit+unsubscribe@opensuse.org
For additional commands, e-mail: limal-commit+help@opensuse.org