diff -r 5cc91383ab1e -r 7333d7932ef7 secureswitools/swisistools/source/interpretsislib/xmlgenerator.h
--- a/secureswitools/swisistools/source/interpretsislib/xmlgenerator.h	Thu Aug 19 10:02:49 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/xmlgenerator.h	Tue Aug 31 15:21:33 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of the License "Eclipse Public License v1.0"
@@ -38,7 +38,20 @@
 #include <xercesc/sax/ErrorHandler.hpp>
 #include <xercesc/dom/DOM.hpp>
 
+#include "parameterlist.h"
 
+using namespace std;
+
+#define AppRegistrationInfo XmlDetails::TScrPreProvisionDetail::TApplicationRegistrationInfo
+#define ApplicationAttribute XmlDetails::TScrPreProvisionDetail::TApplicationRegistrationInfo::TAppAttribute 
+#define AppDataType XmlDetails::TScrPreProvisionDetail::TApplicationRegistrationInfo::TDataType 
+#define AppServiceInfo XmlDetails::TScrPreProvisionDetail::TApplicationRegistrationInfo::TAppServiceInfo 
+#define AppLocalizableInfo XmlDetails::TScrPreProvisionDetail::TApplicationRegistrationInfo::TAppLocalizableInfo
+#define AppLocalizableAttribute XmlDetails::TScrPreProvisionDetail::TApplicationRegistrationInfo::TAppLocalizableInfo::TLocalizableAttribute 
+#define AppViewData XmlDetails::TScrPreProvisionDetail::TApplicationRegistrationInfo::TAppLocalizableInfo::TViewData 
+#define AppViewDataAttributes XmlDetails::TScrPreProvisionDetail::TApplicationRegistrationInfo::TAppLocalizableInfo::TViewData::TViewDataAttributes 
+#define AppProperty XmlDetails::TScrPreProvisionDetail::TApplicationRegistrationInfo::TAppProperty 
+#define AppOpaqueDataType XmlDetails::TScrPreProvisionDetail::TApplicationRegistrationInfo::TOpaqueDataType
 #define ComponentLocalizable XmlDetails::TScrPreProvisionDetail::TComponentLocalizable
 #define ComponentProperty XmlDetails::TScrPreProvisionDetail::TComponentProperty
 #define ComponentFile XmlDetails::TScrPreProvisionDetail::TComponentFile
@@ -46,6 +59,7 @@
 #define ComponentDependency XmlDetails::TScrPreProvisionDetail::TComponentDependency
 #define ComponentDependencyDetail XmlDetails::TScrPreProvisionDetail::TComponentDependency::TComponentDependencyDetail
 
+
 class CXmlGenerator
 	{
 
@@ -64,14 +78,18 @@
 		/**
 		 * Retrieves software environment details, from the supplied xml file. 
 		 */
-		void WritePreProvisionDetails(const std::wstring aXmlFileName, const XmlDetails::TScrPreProvisionDetail& aPreProvisionDetail);
+		void WritePreProvisionDetails(const std::wstring aXmlFileName, 
+											const XmlDetails::TScrPreProvisionDetail& aPreProvisionDetail,
+											int& aRomApplication
+										);
 		
 		
 	private:	
 
 		void WriteComponent(	XERCES_CPP_NAMESPACE::DOMElement* aRootElement, 
 								XERCES_CPP_NAMESPACE::DOMDocument* aDocument, 
-								const XmlDetails::TScrPreProvisionDetail::TComponent& aComponent
+								const XmlDetails::TScrPreProvisionDetail::TComponent& aComponent,
+								int& aRomApplication
 							);
 
 		void WriteComponentVersion	(	
@@ -94,6 +112,71 @@
 						const std::vector<ComponentProperty>& aComponentProperties 
 					);
 
+		void WriteAppRegInfo	
+					( 
+						XERCES_CPP_NAMESPACE::DOMElement* aRootElement, 
+						XERCES_CPP_NAMESPACE::DOMDocument* aDocument, 
+						const std::vector<AppRegistrationInfo>& aAppRegInfo 
+					);
+
+
+		void WriteAppAttributes	
+					( 
+						XERCES_CPP_NAMESPACE::DOMElement* aRootElement, 
+						XERCES_CPP_NAMESPACE::DOMDocument* aDocument, 
+						const std::vector<ApplicationAttribute>& aAppAttributes 
+					);
+
+		void WriteAppProperty	
+					( 
+						XERCES_CPP_NAMESPACE::DOMElement* aRootElement, 
+						XERCES_CPP_NAMESPACE::DOMDocument* aDocument, 
+						const std::vector<AppProperty>& aAppProperty 
+					);
+
+		void WriteAppServiceInfo 
+					( 
+						XERCES_CPP_NAMESPACE::DOMElement* aRootElement, 
+						XERCES_CPP_NAMESPACE::DOMDocument* aDocument, 
+						const std::vector<AppServiceInfo>& aAppServiceInfo,
+						const std::vector<AppOpaqueDataType>& aAppOpaqueData
+					);
+
+		void WriteAppDataType 
+					( 
+						XERCES_CPP_NAMESPACE::DOMElement* aRootElement, 
+						XERCES_CPP_NAMESPACE::DOMDocument* aDocument, 
+						const std::vector<AppDataType>& aAppDataType 
+					);
+
+		void WriteAppLocalizableInfo 
+					( 
+						XERCES_CPP_NAMESPACE::DOMElement* aRootElement, 
+						XERCES_CPP_NAMESPACE::DOMDocument* aDocument, 
+						const std::vector<AppLocalizableInfo>& aAppLocalizableInfo 
+					);
+
+		void WriteAppLocalizableAttribute 
+					( 
+						XERCES_CPP_NAMESPACE::DOMElement* aRootElement, 
+						XERCES_CPP_NAMESPACE::DOMDocument* aDocument, 
+						const std::vector<AppLocalizableAttribute>& aAppLocalizableAttribute 
+					);
+
+		void WriteAppLocalizableViewData 
+					( 
+						XERCES_CPP_NAMESPACE::DOMElement* aRootElement, 
+						XERCES_CPP_NAMESPACE::DOMDocument* aDocument, 
+						const std::vector<AppViewData>& aAppViewData 
+					);
+
+		void WriteAppLocalizableViewDataAttributes 
+					 ( 
+ 						XERCES_CPP_NAMESPACE::DOMElement* aRootElement, 
+						XERCES_CPP_NAMESPACE::DOMDocument* aDocument, 
+						const std::vector<AppViewDataAttributes>& aAppViewDataAttributes 
+					 );
+
 		void WriteComponentFiles	
 					( 
 						XERCES_CPP_NAMESPACE::DOMElement* aRootElement, 
@@ -118,19 +201,18 @@
 		void AddChildElement(	
 								XERCES_CPP_NAMESPACE::DOMElement* aRootElement, 
 								XERCES_CPP_NAMESPACE::DOMDocument* aDocument, 
-								const wchar_t* aElementName, 
-								const wchar_t* aTextValue 
+								const XMLCh* aElementName, 
+								const XMLCh* aTextValue 
 							);
 
 		XERCES_CPP_NAMESPACE::DOMElement* AddTag	
 							(	
 								XERCES_CPP_NAMESPACE::DOMElement* aRootElement, 
 								XERCES_CPP_NAMESPACE::DOMDocument* aDocument, 
-								const wchar_t* aTagName
+								const XMLCh* aTagName
 							);
 
 		void SetWriterFeatures(XERCES_CPP_NAMESPACE::DOMWriter* aDomWriter);
-
 	};