Remove all 2.0 pkgdefs in symbian4 and rename all 3.0 pkgdefs to package_definition.xml
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="websrv" name="Web Services" levels="plugin framework server generic specific">
<collection id="websrv_pub" name="Web Services Public Interfaces" level="specific">
<component id="web_service_description_api" name="Web Service Description API" class="api" filter="s60">
<meta rel="Api" href="websrv_pub/web_service_description_api/web_service_description_api.metaxml"/>
<unit bldFile="websrv_pub/web_service_description_api/group"/>
</component>
<component id="web_service_connection_api" name="Web Service Connection API" class="api" filter="s60">
<meta rel="Api" href="websrv_pub/web_service_connection_api/web_service_connection_api.metaxml"/>
<unit bldFile="websrv_pub/web_service_connection_api/group"/>
</component>
<component id="web_service_manager_api" name="Web Service Manager API" class="api" filter="s60">
<meta rel="Api" href="websrv_pub/web_service_manager_api/web_service_manager_api.metaxml"/>
<unit bldFile="websrv_pub/web_service_manager_api/group"/>
</component>
<component id="hostlet_connection_api" name="Hostlet Connection API" class="api" filter="s60">
<meta rel="Api" href="websrv_pub/hostlet_connection_api/hostlet_connection_api.metaxml"/>
<unit bldFile="websrv_pub/hostlet_connection_api/group"/>
</component>
<component id="web_service_messaging_api" name="Web Service Messaging API" class="api" filter="s60">
<meta rel="Api" href="websrv_pub/web_service_messaging_api/web_service_messaging_api.metaxml"/>
<unit bldFile="websrv_pub/web_service_messaging_api/group"/>
</component>
<component id="xml_extensions_api" name="XML Extensions API" class="api" filter="s60">
<meta rel="Api" href="websrv_pub/xml_extensions_api/xml_extensions_api.metaxml"/>
<unit bldFile="websrv_pub/xml_extensions_api/group"/>
</component>
<component id="xml_fragment_api" name="XML Fragment API" class="api" filter="s60">
<meta rel="Api" href="websrv_pub/xml_fragment_api/xml_fragment_api.metaxml"/>
<unit bldFile="websrv_pub/xml_fragment_api/group"/>
</component>
</collection>
<collection id="webservices" name="Web Services Framework" level="generic">
<!-- consider breaking this collection into more meaningful subsets -->
<component id="wsnotifierplugins" filter="s60" name="WS Notifier Plugins" class="plugin">
<unit bldFile="webservices/wsnotifierplugins/group"/>
</component>
<component id="wslogger" filter="s60" name="WS Logger">
<unit bldFile="webservices/wslogger/group"/>
</component>
<component id="wsxml" filter="s60" name="WS XML Extensions">
<unit bldFile="webservices/wsxml/group"/>
</component>
<component id="wsutils" filter="s60" name="WS Utils">
<unit bldFile="webservices/wsutils/group"/>
</component>
<component id="wsfragment" filter="s60" name="WS Fragment">
<unit bldFile="webservices/wsfragment/group"/>
</component>
<component id="wsdescription" filter="s60" name="WS Service Description">
<unit bldFile="webservices/wsdescription/group"/>
</component>
<component id="wsconnection" filter="s60" name="WS Service Connection">
<unit bldFile="webservices/wsconnection/group"/>
</component>
<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="idwsfplugin" filter="s60" name="ID-WSF Plugin" class="plugin">
<unit bldFile="webservices/idwsfplugin/group"/>
</component>
<component id="wsibasicplugin" filter="s60" name="WS-I Basic Plugin" class="plugin">
<unit bldFile="webservices/wsibasicplugin/group"/>
</component>
<component id="wsrestplugin" filter="s60" name="WS REST Plugin" class="plugin">
<unit bldFile="webservices/wsrestplugin/group"/>
</component>
<component id="idwsfsecuritymechanism" filter="s60" name="ID-WSF Security Mechanism">
<unit bldFile="webservices/idwsfsecuritymechanism/group"/>
</component>
<component id="wspasswordtransforms" filter="s60" name="WS Password Transforms">
<unit bldFile="webservices/wspasswordtransforms/group"/>
</component>
<component id="wscore" filter="s60" name="WS Core Service Manager">
<unit bldFile="webservices/wscore/group"/>
</component>
<component id="wslocaltransportplugin" filter="s60" name="WS Local Transport Plugin" class="plugin">
<unit bldFile="webservices/wslocaltransportplugin/group"/>
</component>
<component id="wshostlettransportplugin" filter="s60" name="WS Hostlet Transport Plugin" class="plugin">
<unit bldFile="webservices/wshostlettransportplugin/group"/>
</component>
<component id="wsstar" filter="s60" name="WS Star">
<!-- 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="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>
</collection>
</package>
</SystemDefinition>