# HG changeset patch
# User hgs
# Date 1285185547 14400
# Node ID 6078840978b1522c695b22e56bc4b762dc25f347
# Parent  1d51612454b59d45683274f55b2793cfebaf507e
201037_01

diff -r 1d51612454b5 -r 6078840978b1 bookmarks/conf/BookmarkData.confml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bookmarks/conf/BookmarkData.confml	Wed Sep 22 15:59:07 2010 -0400
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="http://www.s60.com/xml/confml/2"
+    xsi:schemaLocation="http://www.s60.com/xml/confml/2 http://www.s60.com/xml/confml/1#//confml2"
+    name="data">
+    <data>
+        <BookmarkItems>
+            <RemoveNokiaBookmarks>false</RemoveNokiaBookmarks>
+            <RemoveNokiaThirdPartyBookmarks>false</RemoveNokiaThirdPartyBookmarks>
+            <TopPriorityBookmarkItem extensionPolicy="replace">
+                <Name>Tre IOP XHTML</Name>
+                <URL>http://rave.cellulardata.com/xhtml/index.xhtml</URL>
+            </TopPriorityBookmarkItem>
+            <CustomerBookmarkItem extensionPolicy="replace">
+                <Name>Geocaching.hu</Name>
+                <URL>http://geocaching.hu/wap</URL>
+            </CustomerBookmarkItem>
+            <CustomerBookmarkItem>
+                <Name>Test sites</Name>
+                <URL></URL>
+            </CustomerBookmarkItem>
+            <CustomerBookmarkItem>
+                <Name>DDT</Name>
+                <URL>http://ammo.factory.cellulardata.com:8000/ddt</URL>
+            </CustomerBookmarkItem>
+            <CustomerBookmarkItem>
+                <Name>DDT (no cookies)</Name>
+                <URL>http://ammo.factory.cellulardata.com:8000/ddtnc</URL>
+            </CustomerBookmarkItem>
+            <CustomerBookmarkItem>
+                <Name>Digdown</Name>
+                <URL>http://digdown1.extra.wirelessfuture.com/ddtnc</URL>
+            </CustomerBookmarkItem>
+            <CustomerBookmarkItem>
+                <Name>DLS 2.0 S60</Name>
+                <URL>http://trsrv42.wirelessfuture.com/content/s60/index.wml</URL>
+            </CustomerBookmarkItem>
+            <CustomerBookmarkItem>
+                <Name>DLS 2.0 IOP</Name>
+                <URL>http://www.it.cellulardata.com/iop/dls20/index.wml</URL>
+            </CustomerBookmarkItem>
+            <CustomerBookmarkItem>
+                <Name>Wirelessfuture</Name>
+                <URL>http://trsrv29.extra.wirelessfuture.com/drm/index.wml</URL>
+            </CustomerBookmarkItem>
+            <NokiaBookmarkItem extensionPolicy="append">
+                <Name>User agent</Name>
+                <URL>http://testsuite.nokia-boston.com/content/wml_ua/wmlheader.asp</URL>
+                <Tag1>Tag1</Tag1>
+            </NokiaBookmarkItem>
+            <NokiaBookmarkItem>
+                <Name>Google</Name>
+                <URL>http://www.google.com</URL>
+            </NokiaBookmarkItem>
+            <NokiaBookmarkItem>
+                <Name>Eco</Name>
+                <URL>http://wap.eco.hu</URL>
+            </NokiaBookmarkItem>
+            <NokiaBookmarkItem>
+                <Name>Stop!</Name>
+                <URL>http://wap.stop.hu</URL>
+                <Tag1>Tag1</Tag1>
+            </NokiaBookmarkItem>
+            <NokiaBookmarkItem>
+                <Name>Report Browser Bugs</Name>
+                <URL>http://waplabdc.nokia-boston.com/browser/users/Kimono/errorEmail/error.asp</URL>
+            </NokiaBookmarkItem>
+            <NokiaBookmarkItem>
+                <Name>OSS Browser Report</Name>
+                <URL>http://waplabdc.nokia-boston.com/browser/users/OSSBrowser/errorEmail/error.asp</URL>
+            </NokiaBookmarkItem>
+            <NokiaBookmarkItem>
+                <Name>Google</Name>
+                <URL>Http://www.google.com</URL>
+            </NokiaBookmarkItem>
+            <NokiaBookmarkItem>
+                <Name/>
+                <URL/>
+            </NokiaBookmarkItem>
+            <ThirdPartyBookmarkItem extensionPolicy="append">
+                <Name>XHTML -IOP</Name>
+                <URL>http://rave.cellulardata.com/xhtml/index.xhtml</URL>
+            </ThirdPartyBookmarkItem>
+            <ThirdPartyBookmarkItem>
+                <Name>TCG</Name>
+                <URL>http://testsuite.nokia-boston.com</URL>
+            </ThirdPartyBookmarkItem>
+            <ThirdPartyBookmarkItem>
+                <Name>Widgets</Name>
+                <URL>http://widgets.nokia-boston.com</URL>
+            </ThirdPartyBookmarkItem>
+            <ThirdPartyBookmarkItem>
+                <Name>S60 Acceptance Test</Name>
+                <URL>http://testsuite.nokia-boston.com/s60accept/qstart.asp</URL>
+            </ThirdPartyBookmarkItem>
+            <CustomerTopPriorityBookmarkItem
+                extensionPolicy="replace">
+                <Name>Tre IOP WML</Name>
+                <URL>http://195.134.227.137/1.wml</URL>
+            </CustomerTopPriorityBookmarkItem>
+        </BookmarkItems>
+    </data>
+</configuration>
diff -r 1d51612454b5 -r 6078840978b1 bookmarks/conf/BookmarkItems.gcfml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bookmarks/conf/BookmarkItems.gcfml	Wed Sep 22 15:59:07 2010 -0400
@@ -0,0 +1,272 @@
+<file xmlns="http://www.s60.com/xml/genconfml/1" name="bookmarks.xml"
+    target="private/10008d39">
+    <setting ref="BookmarkItems/*"/>
+    <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        version="1.0" xmlns:xi="http://www.w3.org/2001/xinclude">
+        <xsl:output encoding="UTF-8" method="xbel" indent="yes"
+            omit-xml-declaration="yes"/>
+        <xsl:template match="configuration/data">
+            <xbel version="1.0">
+
+                <!-- Customer Top Priority Bookmark -->
+                <xsl:comment> ======= Customer Top Priority Bookmark Item ======= </xsl:comment>
+                
+                <xsl:for-each
+                    select="BookmarkItems/CustomerTopPriorityBookmarkItem[URL and URL!='']">
+                    <bookmark>
+                        <xsl:attribute name="href"><xsl:value-of
+                            select="URL"/></xsl:attribute>
+                        <title>
+                            <xsl:value-of select="Name"/>
+                        </title>
+                        <xsl:if test="Tag1!='' or Tag2!='' or Tag3!='' or Tag4!=''">
+                            <info>
+                                <metadata owner="http://www.nokia.com/bookmarks.xsd">
+                                    <tags>
+                                        <xsl:if test="Tag1!=''">
+                                            <tag>
+                                                <xsl:value-of
+                                                    select="Tag1"/>
+                                            </tag>
+                                        </xsl:if>
+                                        <xsl:if test="Tag2!=''">
+                                            <tag>
+                                                <xsl:value-of
+                                                    select="Tag2"/>
+                                            </tag>
+                                        </xsl:if>
+                                        <xsl:if test="Tag3!=''">
+                                            <tag>
+                                                <xsl:value-of
+                                                    select="Tag3"/>
+                                            </tag>
+                                        </xsl:if>
+                                        <xsl:if test="Tag4!=''">
+                                            <tag>
+                                                <xsl:value-of
+                                                    select="Tag4"/>
+                                            </tag>
+                                        </xsl:if>
+                                    </tags>
+                                </metadata>
+                            </info>
+                        </xsl:if>
+                    </bookmark>
+                </xsl:for-each>
+
+                <!-- Top Priority Bookmark -->
+                
+                <xsl:comment> ======= Top Priority Bookmark Item ======= </xsl:comment>
+                
+                <xsl:for-each
+                    select="BookmarkItems/TopPriorityBookmarkItem[URL and URL!='']">
+                    <bookmark>
+                        <xsl:attribute name="href"><xsl:value-of
+                            select="URL"/></xsl:attribute>
+                        <title>
+                            <xsl:value-of select="Name"/>
+                        </title>
+                        <xsl:if test="Tag1!='' or Tag2!='' or Tag3!='' or Tag4!=''">
+                            <info>
+                                <metadata owner="http://www.nokia.com/bookmarks.xsd">
+                                    <tags>
+                                        <xsl:if test="Tag1!=''">
+                                            <tag>
+                                                <xsl:value-of
+                                                    select="Tag1"/>
+                                            </tag>
+                                        </xsl:if>
+                                        <xsl:if test="Tag2!=''">
+                                            <tag>
+                                                <xsl:value-of
+                                                    select="Tag2"/>
+                                            </tag>
+                                        </xsl:if>
+                                        <xsl:if test="Tag3!=''">
+                                            <tag>
+                                                <xsl:value-of
+                                                    select="Tag3"/>
+                                            </tag>
+                                        </xsl:if>
+                                        <xsl:if test="Tag4!=''">
+                                            <tag>
+                                                <xsl:value-of
+                                                    select="Tag4"/>
+                                            </tag>
+                                        </xsl:if>
+                                    </tags>
+                                </metadata>
+                            </info>
+                        </xsl:if>
+                    </bookmark>
+                </xsl:for-each>
+
+                <!-- Customer Bookmarks -->
+                <xsl:comment> ======= Customer Bookmark Items ======= </xsl:comment>
+                
+                <xsl:for-each
+                    select="BookmarkItems/CustomerBookmarkItem[URL and URL!='']">
+                    <bookmark>
+                        <xsl:attribute name="href">
+                            <xsl:value-of select="URL"/>
+                        </xsl:attribute>
+                        <title>
+                            <xsl:value-of select="Name"/>
+                        </title>
+                        <xsl:if test="Tag1!='' or Tag2!='' or Tag3!='' or Tag4!=''">
+                            <info>
+                                <metadata owner="http://www.nokia.com/bookmarks.xsd">
+                                    <tags>
+                                        <xsl:if test="Tag1!=''">
+                                            <tag>
+                                                <xsl:value-of
+                                                    select="Tag1"/>
+                                            </tag>
+                                        </xsl:if>
+                                        <xsl:if test="Tag2!=''">
+                                            <tag>
+                                                <xsl:value-of
+                                                    select="Tag2"/>
+                                            </tag>
+                                        </xsl:if>
+                                        <xsl:if test="Tag3!=''">
+                                            <tag>
+                                                <xsl:value-of
+                                                    select="Tag3"/>
+                                            </tag>
+                                        </xsl:if>
+                                        <xsl:if test="Tag4!=''">
+                                            <tag>
+                                                <xsl:value-of
+                                                    select="Tag4"/>
+                                            </tag>
+                                        </xsl:if>
+                                    </tags>
+                                </metadata>
+                            </info>
+                        </xsl:if>
+                    </bookmark>
+                </xsl:for-each>
+                <xsl:comment> ======= End Customer Bookmark Items ======= </xsl:comment>
+
+                <!-- Nokia Bookmarks -->
+                <xsl:choose>
+                    <xsl:when test="BookmarkItems/RemoveNokiaBookmarks='false'">
+                    
+                        <xsl:comment> ======= Nokia Bookmark Items ======= </xsl:comment>
+                    
+                        <xsl:for-each
+                            select="BookmarkItems/NokiaBookmarkItem[URL and URL!='']">
+                            <bookmark>
+                                <xsl:attribute name="href">
+                                    <xsl:value-of select="URL"/>
+                                </xsl:attribute>
+                                <title>
+                                    <xsl:value-of select="Name"/>
+                                </title>
+                                <xsl:if
+                                    test="Tag1!='' or Tag2!='' or Tag3!='' or Tag4!=''">
+                                    <info>
+                                        <metadata owner="http://www.nokia.com/bookmarks.xsd">
+                                            <tags>
+                                                <xsl:if test="Tag1!=''">
+                                                    <tag>
+                                                        <xsl:value-of
+                                                            select="Tag1"/>
+                                                    </tag>
+                                                </xsl:if>
+                                                <xsl:if test="Tag2!=''">
+                                                    <tag>
+                                                        <xsl:value-of
+                                                            select="Tag2"/>
+                                                    </tag>
+                                                </xsl:if>
+                                                <xsl:if test="Tag3!=''">
+                                                    <tag>
+                                                        <xsl:value-of
+                                                            select="Tag3"/>
+                                                    </tag>
+                                                </xsl:if>
+                                                <xsl:if test="Tag4!=''">
+                                                    <tag>
+                                                        <xsl:value-of
+                                                            select="Tag4"/>
+                                                    </tag>
+                                                </xsl:if>
+                                            </tags>
+                                        </metadata>
+                                    </info>
+                                </xsl:if>
+                            </bookmark>
+                        </xsl:for-each>
+                        <xsl:comment> ======= End Nokia Bookmark Items ======= </xsl:comment>
+                    </xsl:when>
+                    <xsl:otherwise>
+                    
+                        <xsl:comment> ======= Nokia Bookmarks Removed ======= </xsl:comment>
+                        
+                    </xsl:otherwise>
+                </xsl:choose>
+
+                <!-- Third Party Bookmarks -->
+                <xsl:choose>
+                    <xsl:when
+                        test="BookmarkItems/RemoveNokiaThirdPartyBookmarks='false'">
+                        
+                        <xsl:comment> ======= Third Party Bookmark Items ======= </xsl:comment>
+                        
+                        <xsl:for-each
+                            select="BookmarkItems/ThirdPartyBookmarkItem[URL and URL!='']">
+                            <bookmark>
+                                <xsl:attribute name="href"><xsl:value-of
+                                    select="URL"/></xsl:attribute>
+                                <title>
+                                    <xsl:value-of select="Name"/>
+                                </title>
+                                <xsl:if
+                                    test="Tag1!='' or Tag2!='' or Tag3!='' or Tag4!=''">
+                                    <info>
+                                        <metadata owner="http://www.nokia.com/bookmarks.xsd">
+                                            <tags>
+                                                <xsl:if test="Tag1!=''">
+                                                    <tag>
+                                                        <xsl:value-of
+                                                            select="Tag1"/>
+                                                    </tag>
+                                                </xsl:if>
+                                                <xsl:if test="Tag2!=''">
+                                                    <tag>
+                                                        <xsl:value-of
+                                                            select="Tag2"/>
+                                                    </tag>
+                                                </xsl:if>
+                                                <xsl:if test="Tag3!=''">
+                                                    <tag>
+                                                        <xsl:value-of
+                                                            select="Tag3"/>
+                                                    </tag>
+                                                </xsl:if>
+                                                <xsl:if test="Tag4!=''">
+                                                    <tag>
+                                                        <xsl:value-of
+                                                            select="Tag4"/>
+                                                    </tag>
+                                                </xsl:if>
+                                            </tags>
+                                        </metadata>
+                                    </info>
+                                </xsl:if>
+                            </bookmark>
+                        </xsl:for-each>
+                        <xsl:comment> ======= End Third Party Bookmark Items ======= </xsl:comment>
+                    </xsl:when>
+                    <xsl:otherwise>
+                    
+                        <xsl:comment> ======= Third Party Bookmarks Removed ======= </xsl:comment>
+                    
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xbel>
+        </xsl:template>
+    </xsl:stylesheet>
+</file>
diff -r 1d51612454b5 -r 6078840978b1 bookmarks/conf/CI_bookmarks.confml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bookmarks/conf/CI_bookmarks.confml	Wed Sep 22 15:59:07 2010 -0400
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration xmlns="http://www.s60.com/xml/confml/2" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xs="http://www.w3.org/2001/XMLSchema" name="BrowserBookmarks">
+  <feature ref="BookmarkItems" name="BookmarkItems">
+    <setting ref="RemoveNokiaBookmarks" name="Remove All Nokia bookmarks" type="boolean">
+      <desc>If selected all Nokia bookmarks are removed.</desc>
+    </setting>
+    <setting ref="RemoveNokiaThirdPartyBookmarks" name="Remove All Third party bookmarks" type="boolean">
+      <desc>If selected all Third party bookmarks are removed.</desc>
+    </setting>
+    <setting ref="NokiaBookmarkItem" mapKey="Name" mapValue="Name" name="BookmarkItem" type="sequence" minOccurs="0" maxOccurs="16">
+      <desc>TBD</desc>
+      <setting ref="Name" name="Name Of The New Entry" type="string">
+        <desc>Text field containing name for the Bookmark. Must be unique.</desc>
+      </setting>
+      <setting ref="URL" name="URL Of The Bookmark" type="string">
+        <xs:pattern value="((ftp|wap|http(|s))://([\w-]+\.)+[\w-]+(:[0-9]{1,5})?(/[\w- ./?%&amp;=]*)?|)"/>
+        <desc>Text of the full URL for a Bookmark.(e.g. http://my.server.com)</desc>
+      </setting>
+    </setting>
+    <setting ref="ThirdPartyBookmarkItem" mapKey="Name" mapValue="Name" name="Third Party BookmarkItem" type="sequence" minOccurs="0" maxOccurs="16">
+      <desc>Add Description.</desc>
+      <setting ref="Name" name="Name Of The New Entry" type="string">
+        <desc>Text field containing name for the Bookmark. Must be unique.</desc>
+      </setting>
+      <setting ref="URL" name="URL Of The Bookmark" type="string">
+        <xs:pattern value="((ftp|wap|http(|s))://([\w-]+\.)+[\w-]+(:[0-9]{1,5})?(/[\w- ./?%&amp;=]*)?|)"/>
+        <desc>Text of the full URL for a Bookmark.(e.g. http://my.server.com)</desc>
+      </setting>
+    </setting>
+    <setting ref="CustomerBookmarkItem" mapKey="Name" mapValue="Name" name="Customer BookmarkItem" type="sequence" minOccurs="0" maxOccurs="99">
+      <desc>Add Description.</desc>
+      <setting ref="Name" name="Name Of The New Entry" type="string">
+        <desc>Text field containing name for the Bookmark. Must be unique.</desc>
+      </setting>
+      <setting ref="URL" name="URL Of The Bookmark" type="string">
+        <xs:pattern value="((ftp|wap|http(|s))://([\w-]+\.)+[\w-]+(:[0-9]{1,5})?(/[\w- ./?%&amp;=]*)?|)"/>
+        <desc>Text of the full URL for a Bookmark. (e.g. http://my.server.com)</desc>
+      </setting>
+    </setting>
+    <setting ref="TopPriorityBookmarkItem" mapKey="Name" mapValue="Name" name="Top Priority BookmarkItem" type="sequence" minOccurs="0" maxOccurs="1">
+      <desc>Add Description.</desc>
+      <setting ref="Name" name="Name Of The New Entry" type="string">
+        <desc>Text field containing name for the Bookmark. Must be unique.</desc>
+      </setting>
+      <setting ref="URL" name="URL Of The Bookmark" type="string">
+        <xs:pattern value="((ftp|wap|http(|s))://([\w-]+\.)+[\w-]+(:[0-9]{1,5})?(/[\w- ./?%&amp;=]*)?|)"/>
+        <desc>Text of the full URL for a Bookmark. (e.g. http://my.server.com)</desc>
+      </setting>
+    </setting>
+    <setting ref="CustomerTopPriorityBookmarkItem" mapKey="Name" mapValue="Name" name="Customer Top Priority BookmarkItem" type="sequence" minOccurs="0" maxOccurs="1">
+      <desc>Add Description.</desc>
+      <setting ref="Name" name="Name Of The New Entry" type="string">
+        <desc>Text field containing name for the Bookmark. Must be unique.</desc>
+      </setting>
+      <setting ref="URL" name="URL Of The Bookmark" type="string">
+        <xs:pattern value="((ftp|wap|http(|s))://([\w-]+\.)+[\w-]+(:[0-9]{1,5})?(/[\w- ./?%&amp;=]*)?|)"/>
+        <desc>Text of the full URL for a Bookmark. (e.g. http://my.server.com)</desc>
+      </setting>
+    </setting>
+  </feature>
+  <!--<xi:include href="./BookmarkData.confml"/>-->
+  <data>
+        <BookmarkItems>
+            <RemoveNokiaBookmarks>false</RemoveNokiaBookmarks>
+            <RemoveNokiaThirdPartyBookmarks>false</RemoveNokiaThirdPartyBookmarks>
+            <TopPriorityBookmarkItem extensionPolicy="replace">
+                <Name>Tre IOP XHTML</Name>
+                <URL>http://rave.cellulardata.com/xhtml/index.xhtml</URL>
+            </TopPriorityBookmarkItem>
+            <CustomerBookmarkItem extensionPolicy="replace">
+                <Name>Geocaching.hu</Name>
+                <URL>http://geocaching.hu/wap</URL>
+            </CustomerBookmarkItem>
+            <CustomerBookmarkItem>
+                <Name>Test sites</Name>
+                <URL></URL>
+            </CustomerBookmarkItem>
+            <CustomerBookmarkItem>
+                <Name>DDT</Name>
+                <URL>http://ammo.factory.cellulardata.com:8000/ddt</URL>
+            </CustomerBookmarkItem>
+            <CustomerBookmarkItem>
+                <Name>DDT (no cookies)</Name>
+                <URL>http://ammo.factory.cellulardata.com:8000/ddtnc</URL>
+            </CustomerBookmarkItem>
+            <CustomerBookmarkItem>
+                <Name>Digdown</Name>
+                <URL>http://digdown1.extra.wirelessfuture.com/ddtnc</URL>
+            </CustomerBookmarkItem>
+            <CustomerBookmarkItem>
+                <Name>DLS 2.0 S60</Name>
+                <URL>http://trsrv42.wirelessfuture.com/content/s60/index.wml</URL>
+            </CustomerBookmarkItem>
+            <CustomerBookmarkItem>
+                <Name>DLS 2.0 IOP</Name>
+                <URL>http://www.it.cellulardata.com/iop/dls20/index.wml</URL>
+            </CustomerBookmarkItem>
+            <CustomerBookmarkItem>
+                <Name>Wirelessfuture</Name>
+                <URL>http://trsrv29.extra.wirelessfuture.com/drm/index.wml</URL>
+            </CustomerBookmarkItem>
+            <NokiaBookmarkItem extensionPolicy="append">
+                <Name>User agent</Name>
+                <URL>http://testsuite.nokia-boston.com/content/wml_ua/wmlheader.asp</URL>
+                <Tag1>Tag1</Tag1>
+            </NokiaBookmarkItem>
+            <NokiaBookmarkItem>
+                <Name>Google</Name>
+                <URL>http://www.google.com</URL>
+            </NokiaBookmarkItem>
+            <NokiaBookmarkItem>
+                <Name>Eco</Name>
+                <URL>http://wap.eco.hu</URL>
+            </NokiaBookmarkItem>
+            <NokiaBookmarkItem>
+                <Name>Stop!</Name>
+                <URL>http://wap.stop.hu</URL>
+                <Tag1>Tag1</Tag1>
+            </NokiaBookmarkItem>
+            <NokiaBookmarkItem>
+                <Name>Report Browser Bugs</Name>
+                <URL>http://waplabdc.nokia-boston.com/browser/users/Kimono/errorEmail/error.asp</URL>
+            </NokiaBookmarkItem>
+            <NokiaBookmarkItem>
+                <Name>OSS Browser Report</Name>
+                <URL>http://waplabdc.nokia-boston.com/browser/users/OSSBrowser/errorEmail/error.asp</URL>
+            </NokiaBookmarkItem>
+            <NokiaBookmarkItem>
+                <Name>Google</Name>
+                <URL>Http://www.google.com</URL>
+            </NokiaBookmarkItem>
+            <NokiaBookmarkItem>
+                <Name/>
+                <URL/>
+            </NokiaBookmarkItem>
+            <ThirdPartyBookmarkItem extensionPolicy="append">
+                <Name>XHTML -IOP</Name>
+                <URL>http://rave.cellulardata.com/xhtml/index.xhtml</URL>
+            </ThirdPartyBookmarkItem>
+            <ThirdPartyBookmarkItem>
+                <Name>TCG</Name>
+                <URL>http://testsuite.nokia-boston.com</URL>
+            </ThirdPartyBookmarkItem>
+            <ThirdPartyBookmarkItem>
+                <Name>Widgets</Name>
+                <URL>http://widgets.nokia-boston.com</URL>
+            </ThirdPartyBookmarkItem>
+            <ThirdPartyBookmarkItem>
+                <Name>S60 Acceptance Test</Name>
+                <URL>http://testsuite.nokia-boston.com/s60accept/qstart.asp</URL>
+            </ThirdPartyBookmarkItem>
+            <CustomerTopPriorityBookmarkItem
+                extensionPolicy="replace">
+                <Name>Tre IOP WML</Name>
+                <URL>http://195.134.227.137/1.wml</URL>
+            </CustomerTopPriorityBookmarkItem>
+        </BookmarkItems>
+    </data>
+</configuration>
diff -r 1d51612454b5 -r 6078840978b1 bookmarks/conf/bookmarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bookmarks/conf/bookmarks.xml	Wed Sep 22 15:59:07 2010 -0400
@@ -0,0 +1,38 @@
+<xbel version="1.0">
+	<bookmark href="http://testsuite.nokia-boston.com" >
+		<title>TCG</title>
+	</bookmark>
+	<bookmark href="http://iop1.nokia-boston.com/index.html" >
+		<title>Browser 8.x NFT</title>
+	</bookmark>
+	<bookmark href="http://browser.nokia.com/testing/" >
+		<title>Browser Testing Center</title>
+	</bookmark>
+	<bookmark href="http://testsuite.nokia-boston.com/HTML5/index.html" >
+		<title>HTML 5 test page</title>
+	</bookmark>	
+	<bookmark href="http://www.nokia.com" >
+		<title>Nokia</title>
+	</bookmark>
+	<bookmark href="http://www.ovi.com" >
+		<title>OVI</title>
+	</bookmark>
+	<bookmark href="http://www.google.com" >
+		<title>Google</title>
+	</bookmark>
+	<bookmark href="http://www.gmail.com" >
+		<title>GMail</title>
+	</bookmark>
+	<bookmark href="http://www.cnn.com" >
+		<title>CNN</title>
+	</bookmark>
+	<bookmark href="http://www.whatsmayuseragent.com" >
+		<title>What's my user agent?</title>
+	</bookmark>
+	<bookmark href="http://www.youtube.com" >
+		<title>Youtube</title>
+	</bookmark>
+	<bookmark href="http://www.iltasanomat.fi" >
+		<title>Iltasanomat</title>
+	</bookmark>
+</xbel>
diff -r 1d51612454b5 -r 6078840978b1 package_definition.xml
--- a/package_definition.xml	Fri Sep 17 12:10:47 2010 -0400
+++ b/package_definition.xml	Wed Sep 22 15:59:07 2010 -0400
@@ -5,6 +5,9 @@
     <component id="bookmarksengine_build" name="Bookmarks Engine Build" introduced="^4" filter="s60">
       <unit bldFile="bookmarksengine" qt:proFile="bookmarksengine.pro"/>
     </component>
+    <component id="bookmarks_build" name="Bookmarks Build" introduced="^4" filter="s60">
+      <unit bldFile="bookmarks" qt:proFile="bookmarks.pro"/>
+    </component>        
   </collection>
  </package>
 </SystemDefinition>