--- a/javamanager/javacaptain/extensionplugins/javacertstore/inc/javacertstore.h	Tue May 11 16:07:20 2010 +0300
+++ b/javamanager/javacaptain/extensionplugins/javacertstore/inc/javacertstore.h	Tue May 25 12:34:19 2010 +0300
@@ -41,11 +41,14 @@
 const char KFileSeparator = '\\';
 const char KJavaCertsDir[] = "security\\trustroots\\device\\certificates";
 const char KJavaCertsStateDir[] = "security\\trustroots\\device\\state";
+const char KJavaRootsListDir[] = "security\\trustroots";
 #else //__SYMBIAN32__
 const char KFileSeparator = '/';
 const char KJavaCertsDir[] = "security/trustroots/device/certificates";
 const char KJavaCertsStateDir[] = "security/trustroots/device/state";
+const char KJavaRootsListDir[] = "security/trustroots";
 #endif //__SYMBIAN32__
+const char KJavaRootsListName[] = "midprootslist";
 const char KMetadataSuffix[] = ".metadata";
 const char KStateSuffix[] = ".state";
 const char KCertSuffix1[] = ".der";
@@ -106,16 +109,18 @@
     void queryCerts(java::comms::CommsMessage& aMessage);
     void loadCertsMetadata();
     void loadCertsMetadata(std::string aCertsLocation);
+    void loadCertsMetadata(std::string aCertsLocation, bool primaryPath);
     void unloadCertsMetadata();
-    bool readMetadataFromFiles(const std::string& certFileName, CERT_METADATA *);
+    bool readMetadataFromFiles(const std::string& aCertsLocation, const std::string& certFileName, CERT_METADATA *);
     void writeMetadataIntoFile(CERT_METADATA * metadata);
     int encodeState(bool, bool, int);
     void manageCert(const std::string&, int);
     std::string readCert(const std::string& certFileName, long *);
+    void readCert(const std::string& aCertsLocation, const std::string& aCertFileName);
     long replyWithContent(java::comms::CommsMessage& aReplyMessage, const CERT_METADATA&, int format = DER_FORMAT);
     void assignProtectionDomain(std::vector<std::string>, CERT_METADATA *);
     void addCertMetadataToCache(CERT_METADATA* metadata, bool overwrite);
-    bool mkDirAll(const char* dirPath);
+    bool mkDirAll(const char* dirPath, const std::string& aBaseDir);
 
 private:
     CoreInterface* iCore;