--- a/symbian3/mw/websrv/package_definition_3.0.xml	Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/websrv/package_definition_3.0.xml	Wed Feb 03 20:06:22 2010 +0000
@@ -21,33 +21,36 @@
       <component id="wsdescription" filter="s60" name="WS Service Description">
         <unit bldFile="webservices/wsdescription/group"/>
       </component>
-      <component id="wshttpchanneltransportplugin" filter="s60" name="WS HTTP Channel Transport Plugin" class="plugin">
-        <unit bldFile="webservices/wshttpchanneltransportplugin/group"/>
-      </component>
       <component id="wsconnection" filter="s60" name="WS Service Connection">
         <unit bldFile="webservices/wsconnection/group"/>
       </component>
-      <component id="wshostletconnection" filter="s60" name="WS Hostlet Connection">
-        <unit bldFile="webservices/wshostletconnection/group"/>
+      <component id="wsmessages" filter="s60" name="WS Messages">
+        <unit bldFile="webservices/wsmessages/group"/>
       </component>
       <component id="wscredentialmanager" filter="s60" name="WS Credential Manager">
         <unit bldFile="webservices/wscredentialmanager/group"/>
       </component>
+      <component id="wsframework" filter="s60" name="WS Framework">
+        <unit bldFile="webservices/wsframework/group"/>
+      </component>
+      <component id="wshttpchanneltransportplugin" filter="s60" name="WS HTTP Channel Transport Plugin" class="plugin">
+        <unit bldFile="webservices/wshttpchanneltransportplugin/group"/>
+      </component>
+      <component id="wsconnectionagent" filter="s60" name="WS Connection Agent">
+        <unit bldFile="webservices/wsconnectionagent/group"/>
+      </component>
+      <component id="wsprovider" filter="s60" name="WS Provider">
+        <unit bldFile="webservices/wsprovider/group"/>
+      </component>
+      <component id="wshostletconnection" filter="s60" name="WS Hostlet Connection">
+        <unit bldFile="webservices/wshostletconnection/group"/>
+      </component>
       <component id="wsmanager" filter="s60" name="WS Service Manager">
         <unit bldFile="webservices/wsmanager/group"/>
       </component>
       <component id="wsidentitymanager" filter="s60" name="WS Identity Manager">
         <unit bldFile="webservices/wsidentitymanager/group"/>
       </component>
-      <component id="wsframework" filter="s60" name="WS Framework">
-        <unit bldFile="webservices/wsframework/group"/>
-      </component>
-      <component id="wsmessages" filter="s60" name="WS Messages">
-        <unit bldFile="webservices/wsmessages/group"/>
-      </component>
-      <component id="wsconnectionagent" filter="s60" name="WS Connection Agent">
-        <unit bldFile="webservices/wsconnectionagent/group"/>
-      </component>
       <component id="idwsfplugin" filter="s60" name="ID-WSF Plugin" class="plugin">
         <unit bldFile="webservices/idwsfplugin/group"/>
       </component>
@@ -66,9 +69,6 @@
       <component id="wscore" filter="s60" name="WS Core Service Manager">
         <unit bldFile="webservices/wscore/group"/>
       </component>
-      <component id="wsprovider" filter="s60" name="WS Provider">
-        <unit bldFile="webservices/wsprovider/group"/>
-      </component>
       <component id="wslocaltransportplugin" filter="s60" name="WS Local Transport Plugin" class="plugin">
         <unit bldFile="webservices/wslocaltransportplugin/group"/>
       </component>
@@ -76,51 +76,29 @@
         <unit bldFile="webservices/wshostlettransportplugin/group"/>
       </component>
       <component id="wsstar" filter="s60" name="WS Star">
-        <!-- <unit bldFile="webservices/wsstar/group"/> -->
+      	<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
+        <unit bldFile="webservices/wsstar/wsstarpolicy/group"/>
+        <unit bldFile="webservices/wsstar/wsstarplugin/group"/>
+        <unit bldFile="webservices/wsstar/wsstarmessagehandlers/group"/>
       </component>
       <component id="wsoviplugin" filter="s60" name="WS Ovi Plugin">
         <unit bldFile="webservices/wsoviplugin/group"/>
       </component>
+      <component id="wsoviplugin" filter="s60" name="WS Ovi Plugin">
+        <unit bldFile="webservices/wsoviplugin/group"/>
+      </component>      
       <component id="webservices_build" filter="s60" name="Web Services Build">
+      	<!-- need to split into self-contained components -->
         <unit bldFile="webservices/group"/>
       </component>
     </collection>
     <collection id="websrv_info" name="Web Services Info" level="specific">
+      <component id="websrv_bld" filter="s60" name="Web Services Build">
+      	<!-- need to include common .hrh in each unit -->
+        <unit bldFile="group"/>
+      </component>
       <component id="websrv_pub" filter="s60" name="Web Services Public Interfaces" class="api">
         <unit bldFile="websrv_pub/group"/>
-        	<!-- should these be #included? -->
-        <!-- <unit bldFile="websrv_pub/hostlet_connection_api/tsrc/bc/hostconn/group"/> -->
-        <!-- <unit bldFile="websrv_pub/hostlet_connection_api/tsrc/group"/> -->
-        <!-- <unit bldFile="websrv_pub/hostlet_connection_api/tsrc/hostconn/group"/> -->
-        <!-- <unit bldFile="websrv_pub/hostlet_connection_api/tsrc/hostconntester/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/bc/connection/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/bc/senutils/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/connection/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/senconnectiontester/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/senconnectiontimeoutstester/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/senlayeredpropertiestester/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/senutils/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/senutilstestcases/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/wspolicytester/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/wsstarmessagehandlertester/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_description_api/tsrc/bc/senservdesc/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_description_api/tsrc/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_description_api/tsrc/senservdesc/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_description_api/tsrc/senservdesctester/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_manager_api/tsrc/bc/senservicemanager/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_manager_api/tsrc/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_manager_api/tsrc/senservicemanager/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_manager_api/tsrc/senservicemanagertester/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_messaging_api/tsrc/bc/newsoapclasses/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_messaging_api/tsrc/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_messaging_api/tsrc/newsoapclasses/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_messaging_api/tsrc/newsoapclassestester/group"/> -->
-        <!-- <unit bldFile="websrv_pub/xml_extensions_api/tsrc/group"/> -->
-        <!-- <unit bldFile="websrv_pub/xml_extensions_api/tsrc/senxml/group"/> -->
-        <!-- <unit bldFile="websrv_pub/xml_extensions_api/tsrc/senxmltester/group"/> -->
-        <!-- <unit bldFile="websrv_pub/xml_fragment_api/tsrc/group"/> -->
-        <!-- <unit bldFile="websrv_pub/xml_fragment_api/tsrc/senfragmenttester/group"/> -->
       </component>
     </collection>
   </package>