diff -r 6482b2868773 -r 753e9b859ae7 package_definition.xml
--- a/package_definition.xml	Fri Sep 17 08:33:20 2010 +0300
+++ b/package_definition.xml	Mon Oct 04 00:53:08 2010 +0300
@@ -11,59 +11,47 @@
       <component id="deflatefilter" filter="s60" name="Deflate Filter" class="plugin">
         <unit bldFile="httpfilters/deflatefilter/group"/>
       </component>
-      <component id="httpfilteracceptheader" filter="s60" name="Accept Header Filter" class="plugin">
-        <unit bldFile="httpfilters/httpfilteracceptheader/group"/>
-      </component>
       <component id="httpfilterauthentication" filter="s60" name="Authentication Filter" class="plugin">
         <unit bldFile="httpfilters/httpfilterauthentication/group"/>
       </component>
-      <component id="httpfilterconnhandler" filter="s60" name="Connection Handler Fitler" class="plugin">
-        <unit bldFile="httpfilters/httpfilterconnhandler/group"/>
-      </component>
       <component id="httpfilteriop" filter="s60" name="HTTP IOP Filter" class="plugin">
         <unit bldFile="httpfilters/httpfilteriop/group"/>
       </component>
-      <component id="httpfilterproxy" filter="s60" name="HTTP Proxy Filter" class="plugin">
-        <unit bldFile="httpfilters/httpfilterproxy/group"/>
-      </component>
-      <component id="uaproffilter" filter="s60" name="UAProf Filter" class="plugin">
-        <unit bldFile="httpfilters/uaproffilter/group"/>
-      </component>
     </collection>
     <collection id="applayerprotocols" name="Application Layer Protocols" level="server">
-      <component id="httptransportfw" name="HTTP Transport Framework" introduced="6.2" purpose="optional">
+      <component id="httptransportfw" filter="s60" name="HTTP Transport Framework" introduced="6.2" purpose="optional">
         <unit bldFile="applayerprotocols/httptransportfw/group" mrp="applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
       </component>
-      <component id="httpexamples" name="HTTP Examples" introduced="6.2" purpose="development">
+      <component id="httpexamples" filter="s60" name="HTTP Examples" introduced="6.2" purpose="development" >
         <unit bldFile="applayerprotocols/httpexamples/group" mrp="applayerprotocols/httpexamples/group/http_examples.mrp"/>
       </component>
-      <component id="wappushsupport" name="WAP Push Support" introduced="6.2" purpose="optional">
+      <component id="wappushsupport" filter="s60" name="WAP Push Support" introduced="6.2" purpose="optional">
         <unit bldFile="applayerprotocols/wappushsupport/Group" mrp="applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
       </component>
-      <component id="wapbase" name="WAP Base" introduced="6.0" purpose="optional">
+      <component id="wapbase" filter="s60" name="WAP Base" introduced="6.0" purpose="optional">
         <unit bldFile="applayerprotocols/wapbase/Group" mrp="applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
       </component>
-      <component id="ftpengine" name="FTP Engine" introduced="6.0" purpose="optional">
+      <component id="ftpengine" filter="s60" name="FTP Engine" introduced="6.0" purpose="optional">
         <unit bldFile="applayerprotocols/ftpengine/group" mrp="applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
       </component>
-      <component id="telnetengine" name="Telnet Engine" introduced="6.0" purpose="optional">
+      <component id="telnetengine" filter="s60" name="Telnet Engine" introduced="6.0" purpose="optional">
         <unit bldFile="applayerprotocols/telnetengine/group" mrp="applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
       </component>
-      <component id="httpserviceapi" name="HTTP Service API" introduced="TB9.2" purpose="optional">
+      <component id="httpserviceapi" filter="s60" name="HTTP Service API" introduced="TB9.2" purpose="optional">
         <unit bldFile="applayerprotocols/httpservice/group" mrp="applayerprotocols/httpservice/group/http_service.mrp"/>
       </component>
     </collection>
     <collection id="applayerpluginsandutils" name="Application Layer Plugins and Utils" level="framework">
-      <component id="uripermissionservices" name="URI Permission Services" introduced="^2" purpose="optional">
+      <component id="uripermissionservices" filter="s60" name="URI Permission Services" introduced="^2" purpose="optional">
         <unit bldFile="applayerpluginsandutils/uripermissionservices/group" mrp="applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
       </component>
-      <component id="bookmarksupport" name="Bookmark Support" introduced="9.1" purpose="optional">
+      <component id="bookmarksupport" filter="s60" name="Bookmark Support" introduced="9.1" purpose="optional">
         <unit bldFile="applayerpluginsandutils/bookmarksupport/group" mrp="applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
       </component>
-      <component id="httpprotocolplugins" name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" class="plugin">
+      <component id="httpprotocolplugins" filter="s60" name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" class="plugin">
         <unit bldFile="applayerpluginsandutils/httpprotocolplugins/group" mrp="applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
       </component>
-      <component id="httptransportplugins" name="HTTP Transport Plugins" introduced="6.2" purpose="optional" class="plugin">
+      <component id="httptransportplugins" filter="s60" name="HTTP Transport Plugins" introduced="6.2" purpose="optional" class="plugin">
         <unit bldFile="applayerpluginsandutils/httptransportplugins/group" mrp="applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
       </component>
     </collection>