--- a/data/feed/sis/replace.pkg	Mon Jun 28 15:34:19 2010 +0300
+++ b/data/feed/sis/replace.pkg	Mon Aug 23 14:05:40 2010 +0300
@@ -1,7 +1,7 @@
 ;Language
 &EN
 ; Header
-#{#replace#}, (#replaceuid#), 1,0,0
+#{"#replace#"}, (0x#replaceuid#), 1,0,0
 ;Localized Vendor Name
 %{"Company"}
 ;Unique Vendor name
@@ -11,8 +11,8 @@
 "..\hsps\00\widgetconfiguration.xml" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\widgetconfiguration.xml"
 "..\hsps\00\manifest.dat"            - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\manifest.dat"
 ; HSPS - Resources for locale 0
-"..\xuikon\00\locale.dtd"            - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\locale.dtd"
-"\epoc32\data\z\private\200159c0\install\#replace#\xuikon\00\#replace#.o0000" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\#replace#.o0000"
+; "..\xuikon\00\locale.dtd"            - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\locale.dtd"
+"\epoc32\data\z\private\200159c0\install\#replace#_#replaceuid#\xuikon\00\#replace#.o0000" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\#replace#.o0000"
 ; HSPS - Backup
 "backup_registration.xml"            - "c:\private\10202D56\import\packages\#replaceuid#\backup_registration.xml"
 ; HSPS - trigger for post installations by the HSPS server

--- a/data/graphiciconstext/sis/replace.pkg	Mon Jun 28 15:34:19 2010 +0300
+++ b/data/graphiciconstext/sis/replace.pkg	Mon Aug 23 14:05:40 2010 +0300
@@ -1,7 +1,7 @@
 ;Language
 &EN
 ; Header
-#{#replace#}, (#replaceuid#), 1,0,0
+#{"#replace#"}, (0x#replaceuid#), 1,0,0
 ;Localized Vendor Name
 %{"Company"}
 ;Unique Vendor name
@@ -11,8 +11,8 @@
 "..\hsps\00\widgetconfiguration.xml" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\widgetconfiguration.xml"
 "..\hsps\00\manifest.dat"            - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\manifest.dat"
 ; HSPS - Resources for locale 0
-"..\xuikon\00\locale.dtd"            - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\locale.dtd"
-"\epoc32\data\z\private\200159c0\install\#replace#\xuikon\00\#replace#.o0000" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\#replace#.o0000"
+; "..\xuikon\00\locale.dtd"            - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\locale.dtd"
+"\epoc32\data\z\private\200159c0\install\#replace#_#replaceuid#\xuikon\00\#replace#.o0000" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\#replace#.o0000"
 ; HSPS - Backup
 "backup_registration.xml"            - "c:\private\10202D56\import\packages\#replaceuid#\backup_registration.xml"
 ; HSPS - trigger for post installations by the HSPS server

--- a/data/graphictext/sis/replace.pkg	Mon Jun 28 15:34:19 2010 +0300
+++ b/data/graphictext/sis/replace.pkg	Mon Aug 23 14:05:40 2010 +0300
@@ -1,7 +1,7 @@
 ;Language
 &EN
 ; Header
-#{#replace#}, (#replaceuid#), 1,0,0
+#{"#replace#"}, (0x#replaceuid#), 1,0,0
 ;Localized Vendor Name
 %{"Company"}
 ;Unique Vendor name
@@ -11,8 +11,8 @@
 "..\hsps\00\widgetconfiguration.xml" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\widgetconfiguration.xml"
 "..\hsps\00\manifest.dat"            - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\manifest.dat"
 ; HSPS - Resources for locale 0
-"..\xuikon\00\locale.dtd"            - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\locale.dtd"
-"\epoc32\data\z\private\200159c0\install\#replace#\xuikon\00\#replace#.o0000" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\#replace#.o0000"
+; "..\xuikon\00\locale.dtd"            - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\locale.dtd"
+"\epoc32\data\z\private\200159c0\install\#replace#_#replaceuid#\xuikon\00\#replace#.o0000" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\#replace#.o0000"
 ; HSPS - Backup
 "backup_registration.xml"            - "c:\private\10202D56\import\packages\#replaceuid#\backup_registration.xml"
 ; HSPS - trigger for post installations by the HSPS server

--- a/data/iconstext/sis/replace.pkg	Mon Jun 28 15:34:19 2010 +0300
+++ b/data/iconstext/sis/replace.pkg	Mon Aug 23 14:05:40 2010 +0300
@@ -1,7 +1,7 @@
 ;Language
 &EN
 ; Header
-#{#replace#}, (#replaceuid#), 1,0,0
+#{"#replace#"}, (0x#replaceuid#), 1,0,0
 ;Localized Vendor Name
 %{"Company"}
 ;Unique Vendor name
@@ -11,8 +11,8 @@
 "..\hsps\00\widgetconfiguration.xml" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\widgetconfiguration.xml"
 "..\hsps\00\manifest.dat"            - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\manifest.dat"
 ; HSPS - Resources for locale 0
-"..\xuikon\00\locale.dtd"            - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\locale.dtd"
-"\epoc32\data\z\private\200159c0\install\#replace#\xuikon\00\#replace#.o0000" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\#replace#.o0000"
+; "..\xuikon\00\locale.dtd"            - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\locale.dtd"
+"\epoc32\data\z\private\200159c0\install\#replace#_#replaceuid#\xuikon\00\#replace#.o0000" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\#replace#.o0000"
 ; HSPS - Backup
 "backup_registration.xml"            - "c:\private\10202D56\import\packages\#replaceuid#\backup_registration.xml"
 ; HSPS - trigger for post installations by the HSPS server

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/data/testpublisher/data/testpublisher_0xe5555555_fs.xml	Mon Aug 23 14:05:40 2010 +0300
@@ -0,0 +1,34 @@
+<!--TODO : FILENAME FORMAT [template_type]_[widget_uid]_fs.xml  -->
+
+<?xml version="1.0" encoding="UTF-8"?>
+<cps:content xmlns:cps="http://" version="1.0">
+    <!-- PUBLISHER REGISTRY -->
+    <cps:publisher>
+        <cps:data_item key="publisher" type="string" value="#replaceuid#:#replace#"/> <!-- Value must be same as publisher uses-->
+        <cps:data_item key="content_type" type="string" value="all"/> <!-- should NOT be changed -->  
+        <cps:data_item key="content_id" type="string8" value="all"/> <!-- should NOT be changed    -->
+        <cps:data_item key="action_map" type="map">                        
+            <cps:data_item key="active" type="map">
+                <cps:data_item key="plugin_id" type="integer" value="0x10282E5F"/><!-- should NOT be changed -->
+                <cps:data_item key="data" type="map">
+                    <cps:data_item key="application_uid" type="integer" value="0xe5555555"/> <!-- Publisher application uid -->
+                    <cps:data_item key="apa_command" type="string" value="apa_command_background"/>
+                    <cps:data_item key="launch_method" type="string" value="cmd_line"/>
+                    <cps:data_item key="type" type="string" value="launch_application"/>
+                </cps:data_item>           
+            </cps:data_item>
+        </cps:data_item>
+
+        <cps:data_item key="ACL" type="map">                       
+            <cps:data_item key="write" type="map">
+                <cps:data_item key="UID" type="string" value="0xe5555555"/> <!--Publisher application uid -->
+            </cps:data_item>   
+            <cps:data_item key="delete" type="map">
+                <cps:data_item key="UID" type="string" value="0xe5555555:0x10282E5A"/>
+                <!--Publisher app and ContentHarvester UIDs - (content harvester UID must be provided
+                in order to allow SWI content harvester plug-in to remove widget information from CPS)
+                if a widget was removed or it was installed on MMC and MMC was removed -->
+                </cps:data_item>   
+        </cps:data_item>       
+    </cps:publisher>
+</cps:content>

--- a/data/testpublisher/group/testpublisher.mmp	Mon Jun 28 15:34:19 2010 +0300
+++ b/data/testpublisher/group/testpublisher.mmp	Mon Aug 23 14:05:40 2010 +0300
@@ -66,6 +66,7 @@
 LIBRARY        commonengine.lib
 LIBRARY        aknnotify.lib
 LIBRARY        liwServiceHandler.lib
+LIBRARY        fbscli.lib
  
 
 LANG SC

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/data/testpublisher/sis/TestPublisher.pkg	Mon Aug 23 14:05:40 2010 +0300
@@ -0,0 +1,46 @@
+; Installation file for TestPublisher application
+;
+; This is an auto-generated PKG file by Carbide.
+; This file uses variables specific to Carbide builds that will not work
+; on command-line builds. If you want to use this generated PKG file from the
+; command-line tools you will need to modify the variables with the appropriate
+; values: $(EPOCROOT), $(PLATFORM), $(TARGET)
+;
+;Language - standard language definitions
+&EN
+
+; standard SIS file header
+#{"TestPublisher"},(0xE5555555),1,0,0
+
+;Localised Vendor name
+%{"Vendor-EN"}
+
+;Unique Vendor name
+:"Vendor"
+
+;Supports Series 60 v 3.0
+[0x101F7961], 0, 0, 0, {"Series60ProductID"}
+
+;Files to install
+;You should change the source paths to match that of your environment
+;<source> <destination>
+"\epoc32\release\armv5\urel\TestPublisher_0xE5555555.exe"		-"!:\sys\bin\TestPublisher_0xE5555555.exe"
+"\epoc32\data\z\resource\apps\TestPublisher_0xE5555555.rsc"		-"!:\resource\apps\TestPublisher_0xE5555555.rsc"
+"\epoc32\data\z\private\10003a3f\apps\TestPublisher_0xE5555555_reg.rsc"	-"!:\private\10003a3f\import\apps\TestPublisher_0xE5555555_reg.rsc"
+"\epoc32\data\z\resource\apps\TestPublisher_0xE5555555.mif" -"!:\resource\apps\TestPublisher_0xE5555555.mif"
+
+; Add any installation notes if applicable
+;"TestPublisher.txt"		-"!:\private\E5555555\TestPublisher.txt"
+
+;required for application to be covered by backup/restore facility 
+"..\sis\backup_registration.xml"		-"!:\private\E5555555\backup_registration.xml"
+
+; required to startup the publisher automatically
+"..\data\testpublisher_0xe5555555_fs.xml" - "!:\private\10282E5A\import\fs\testpublisher_0xe5555555_fs.xml"
+
+; graphics
+"..\gfx\cricket.png" - "c:\data\installs\cricket.png"
+"..\gfx\f1.png" - "c:\data\installs\f1.png"
+"..\gfx\rss.png" - "c:\data\installs\rss.png"
+"..\gfx\rss_small.png" - "c:\data\installs\rss_small.png"
+"..\gfx\tennis.png" - "c:\data\installs\tennis.png"
\ No newline at end of file

--- a/data/testpublisher/sis/TestPublisher_S60_3_X_v_1_0_0.pkg	Mon Jun 28 15:34:19 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-; Installation file for TestPublisher application
-;
-; This is an auto-generated PKG file by Carbide.
-; This file uses variables specific to Carbide builds that will not work
-; on command-line builds. If you want to use this generated PKG file from the
-; command-line tools you will need to modify the variables with the appropriate
-; values: $(EPOCROOT), $(PLATFORM), $(TARGET)
-;
-;Language - standard language definitions
-&EN
-
-; standard SIS file header
-#{"TestPublisher"},(0xE5555555),1,0,0
-
-;Localised Vendor name
-%{"Vendor-EN"}
-
-;Unique Vendor name
-:"Vendor"
-
-;Supports Series 60 v 3.0
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-;Files to install
-;You should change the source paths to match that of your environment
-;<source> <destination>
-"$(EPOCROOT)Epoc32\release\$(PLATFORM)\$(TARGET)\TestPublisher_0xE5555555.exe"		-"!:\sys\bin\TestPublisher_0xE5555555.exe"
-"$(EPOCROOT)Epoc32\data\z\resource\apps\TestPublisher_0xE5555555.rsc"		-"!:\resource\apps\TestPublisher_0xE5555555.rsc"
-"$(EPOCROOT)Epoc32\data\z\private\10003a3f\apps\TestPublisher_0xE5555555_reg.rsc"	-"!:\private\10003a3f\import\apps\TestPublisher_0xE5555555_reg.rsc"
-"$(EPOCROOT)Epoc32\data\z\resource\apps\TestPublisher_0xE5555555.mif" -"!:\resource\apps\TestPublisher_0xE5555555.mif"
-"..\help\TestPublisher_0xE5555555.hlp"							 -"!:\resource\help\TestPublisher_0xE5555555.hlp"
-
-; Add any installation notes if applicable
-;"TestPublisher.txt"		-"!:\private\E5555555\TestPublisher.txt"
-
-;required for application to be covered by backup/restore facility 
-"..\sis\backup_registration.xml"		-"!:\private\E5555555\backup_registration.xml"

--- a/data/testpublisher/src/testpublisherappUi.cpp	Mon Jun 28 15:34:19 2010 +0300
+++ b/data/testpublisher/src/testpublisherappUi.cpp	Mon Aug 23 14:05:40 2010 +0300
@@ -31,8 +31,6 @@
 #include "TestPublisherAppUi.h"
 #include "TestPublisherAppView.h"
 
-_LIT( KText, "Test publisher!");
-
 // ============================ MEMBER FUNCTIONS ===============================
 
 

--- a/data/text/sis/replace.pkg	Mon Jun 28 15:34:19 2010 +0300
+++ b/data/text/sis/replace.pkg	Mon Aug 23 14:05:40 2010 +0300
@@ -1,7 +1,7 @@
 ;Language
 &EN
 ; Header
-#{#replace#}, (#replaceuid#), 1,0,0
+#{"#replace#"}, (0x#replaceuid#), 1,0,0
 ;Localized Vendor Name
 %{"Company"}
 ;Unique Vendor name
@@ -11,8 +11,8 @@
 "..\hsps\00\widgetconfiguration.xml" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\widgetconfiguration.xml"
 "..\hsps\00\manifest.dat"            - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\manifest.dat"
 ; HSPS - Resources for locale 0
-"..\xuikon\00\locale.dtd"            - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\locale.dtd"
-"\epoc32\data\z\private\200159c0\install\#replace#\xuikon\00\#replace#.o0000" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\#replace#.o0000"
+; "..\xuikon\00\locale.dtd"            - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\locale.dtd"
+"\epoc32\data\z\private\200159c0\install\#replace#_#replaceuid#\xuikon\00\#replace#.o0000" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\#replace#.o0000"
 ; HSPS - Backup
 "backup_registration.xml"            - "c:\private\10202D56\import\packages\#replaceuid#\backup_registration.xml"
 ; HSPS - trigger for post installations by the HSPS server

--- a/data/widget/sis/replace.pkg	Mon Jun 28 15:34:19 2010 +0300
+++ b/data/widget/sis/replace.pkg	Mon Aug 23 14:05:40 2010 +0300
@@ -1,7 +1,7 @@
 ;Language
 &EN
 ; Header
-#{#replace#}, (#replaceuid#), 1,0,0
+#{"#replace#"}, (0x#replaceuid#), 1,0,0
 ;Localized Vendor Name
 %{"Company"}
 ;Unique Vendor name
@@ -11,8 +11,8 @@
 "..\hsps\00\widgetconfiguration.xml" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\widgetconfiguration.xml"
 "..\hsps\00\manifest.dat"            - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\manifest.dat"
 ; HSPS - Resources for locale 0
-"..\xuikon\00\locale.dtd"            - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\locale.dtd"
-"\epoc32\data\z\private\200159c0\install\#replace#\xuikon\00\#replace#.o0000" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\#replace#.o0000"
+; "..\xuikon\00\locale.dtd"            - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\locale.dtd"
+"\epoc32\data\z\private\200159c0\install\#replace#_#replaceuid#\xuikon\00\#replace#.o0000" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\#replace#.o0000"
 ; HSPS - Backup
 "backup_registration.xml"            - "c:\private\10202D56\import\packages\#replaceuid#\backup_registration.xml"
 ; HSPS - trigger for post installations by the HSPS server

--- a/publishercreator.cpp	Mon Jun 28 15:34:19 2010 +0300
+++ b/publishercreator.cpp	Mon Aug 23 14:05:40 2010 +0300
@@ -80,8 +80,8 @@
     dir.mkpath( iUi.widgetName() + "/testpublisher/sis");
     QFile::copy ( "data/testpublisher/sis/backup_registration.xml",
                   iUi.widgetName() + "/testpublisher/sis/backup_registration.xml");
-    QFile::copy ( "data/testpublisher/sis/TestPublisher_S60_3_X_v_1_0_0.pkg",
-                  iUi.widgetName() + "/testpublisher/sis/TestPublisher_S60_3_X_v_1_0_0.pkg");
+    QFile::copy ( "data/testpublisher/sis/TestPublisher.pkg",
+                  iUi.widgetName() + "/testpublisher/sis/TestPublisher.pkg");
 
     dir.mkpath( iUi.widgetName() + "/testpublisher/src");
     QFile::copy ( "data/testpublisher/src/testpublisher.cpp",
@@ -98,4 +98,7 @@
     iUi.replaceData("data/testpublisher/src/testpublisherappview.cpp",
                 iUi.widgetName() + "/testpublisher/src/testpublisherappview.cpp" );
 
+    iUi.replaceData("data/testpublisher/data/testpublisher_0xe5555555_fs.xml",
+                iUi.widgetName() + "/testpublisher/data/testpublisher_0xe5555555_fs.xml");
+
 }