diff -r e4ed1060deb1 -r a15e6baef510 package_definition.xml
--- a/package_definition.xml	Mon Mar 15 12:44:44 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="vpnclient" name="VPN Client" levels="engine ui api">
-    <collection id="vpnengine" name="VPN Engine" level="engine">
-    	<!-- too many components in this collection.
-    		Probably best to group the binaries together into larger components
-    		or maybe split the collection into more reasonable groups  -->
-      <component id="eventmediatorapi" filter="s60" name="Event Mediator API">
-        <unit bldFile="vpnengine/eventmediatorapi/group"/>
-      </component>
-      <component id="eventviewer" filter="s60" name="Event Viewer">
-        <unit bldFile="vpnengine/eventviewer/group"/>
-      </component>
-      <component id="vpnins" filter="s60" name="VPN Installer">
-        <unit bldFile="vpnengine/vpnins/group"/>
-      </component>
-      <component id="acuagenttransport" filter="s60" name="ACU Agent Transport">
-        <unit bldFile="vpnengine/acuagenttransport/group"/>
-      </component>
-      <component id="acupluginlib" filter="s60" name="ACU Plugin Library">
-        <unit bldFile="vpnengine/acupluginlib/group"/>
-      </component>
-      <component id="ikepolparser" filter="s60" name="IKE Policy Parser">
-        <unit bldFile="vpnengine/ikepolparser/group"/>
-      </component>
-      <component id="utlbase64" filter="s60" name="Base64 Utilities">
-        <unit bldFile="vpnengine/utlbase64/group"/>
-      </component>
-      <component id="utlcrypto" filter="s60" name="Crypto Utilities">
-        <unit bldFile="vpnengine/utlcrypto/group"/>
-      </component>
-      <component id="utlxml" filter="s60" name="XML Utilities">
-        <unit bldFile="vpnengine/utlxml/group"/>
-      </component>
-      <component id="utlpkcs10" filter="s60" name="PKCS#10 Utilities">
-        <unit bldFile="vpnengine/utlpkcs10/group"/>
-      </component>
-      <component id="pkiserviceapi" filter="s60" name="PKI Service API">
-        <unit bldFile="vpnengine/pkiserviceapi/group"/>
-      </component>
-      <component id="acuagentcrypto" filter="s60" name="ACU Agent Crypto">
-        <unit bldFile="vpnengine/acuagentcrypto/group"/>
-      </component>
-      <component id="vpnextapi" filter="s60" name="VPN Extension API">
-        <unit bldFile="vpnengine/vpnextapi/group"/>
-      </component>
-      <component id="ikecert" filter="s60" name="IKE Certificate Management">
-        <unit bldFile="vpnengine/ikecert/group"/>
-      </component>
-      <component id="kmdapi" filter="s60" name="Key Management Daemon API">
-        <unit bldFile="vpnengine/kmdapi/group"/>
-      </component>
-      <component id="kmdserver" filter="s60" name="Key Management Daemon Server">
-        <unit bldFile="vpnengine/kmdserver/group"/>
-      </component>
-      <component id="ikeutils" filter="s60" name="Internet Key Exchange Utils">
-        <unit bldFile="vpnengine/ikeutils/group"/>
-      </component>
-      <component id="ikev1lib" filter="s60" name="IKEv1 Library">
-        <unit bldFile="vpnengine/ikev1lib/group"/>
-      </component>
-      <component id="ikev2lib" filter="s60" name="IKEv2 Library">
-        <unit bldFile="vpnengine/ikev2lib/group"/>
-      </component>
-      <component id="acuagentmessage" filter="s60" name="ACU Agent Message">
-        <unit bldFile="vpnengine/acuagentmessage/group"/>
-      </component>
-      <component id="acuagent" filter="s60" name="Automatic Content Update Agent">
-        <unit bldFile="vpnengine/acuagent/group"/>
-      </component>
-      <component id="vpnawapi" filter="s60" name="VPN ACU Wrapper API">
-        <unit bldFile="vpnengine/vpnawapi/group"/>
-      </component>
-      <component id="vpnipsecpolparser" filter="s60" name="VPN IPsec Policy Parser">
-        <unit bldFile="vpnengine/vpnipsecpolparser/group"/>
-      </component>
-      <component id="sit" filter="s60" name="Socket Interaction Thread">
-        <unit bldFile="vpnengine/sit/group"/>
-      </component>
-      <component id="acuins" filter="s60" name="ACU Installer">
-        <unit bldFile="vpnengine/acuins/group"/>
-      </component>
-      <component id="vpntcwrapper" filter="s60" name="VPN Terminal Control Wrapper">
-        <unit bldFile="vpnengine/vpntcwrapper/group"/>
-      </component>
-      <component id="eventmediator" filter="s60" name="Event Mediator">
-        <unit bldFile="vpnengine/eventmediator/group"/>
-      </component>
-      <component id="ipsecacuplugin" filter="s60" name="IPsec ACU Plugin" class="plugin">
-        <unit bldFile="vpnengine/ipsecacuplugin/group"/>
-      </component>
-      <component id="pkiservice" filter="s60" name="PKI Service">
-        <unit bldFile="vpnengine/pkiservice/group"/>
-      </component>
-      <component id="vpnconnagt" filter="s60" name="VPN Connection Agent">
-        <unit bldFile="vpnengine/vpnconnagt/group"/>
-      </component>
-      <component id="vpnmanager" filter="s60" name="VPN Manager">
-        <unit bldFile="vpnengine/vpnmanager/group"/>
-      </component>
-      <component id="vpncleaner" filter="s60" name="VPN Cleaner">
-        <unit bldFile="vpnengine/vpncleaner/group"/>
-      </component>
-      <component id="utlpkcs12" filter="s60" name="PKCS#12 Utilities">
-        <unit bldFile="vpnengine/utlpkcs12/group"/>
-      </component>
-      <component id="dmadengine" filter="s60" name="DM Adapter Engine">
-        <unit bldFile="vpnengine/dmadengine/group"/>
-      </component>
-      <component id="dmadipsecvpn" filter="s60" name="IPsec VPN DM Adapter" class="plugin">
-        <unit bldFile="vpnengine/dmadipsecvpn/group"/>
-      </component>
-      <component id="dmadpki" filter="s60" name="PKI DM Adapter" class="plugin">
-        <unit bldFile="vpnengine/dmadpki/group"/>
-      </component>
-      <component id="ikesocketplugin" filter="s60" name="IKE Socket Plugin" class="plugin">
-        <unit bldFile="vpnengine/ikesocketplugin/group"/>
-      </component>
-      <component id="vpnnif" filter="s60" name="VPN NIF"/>
-    </collection>
-    <collection id="vpnui" name="VPN UI" level="ui">
-      <component id="vpnecomnotifier" filter="s60" name="VPN ECOM Notifier" class="plugin">
-        <unit bldFile="vpnui/vpnecomnotifier/group"/>
-      </component>
-      <component id="vpndialogmanager" filter="s60" name="VPN Dialog Manager">
-        <unit bldFile="vpnui/vpndialogmanager/group"/>
-      </component>
-      <component id="vpnmanagementui" filter="s60" name="VPN Management UI" class="plugin">
-        <unit bldFile="vpnui/vpnmanagementui/group"/>
-      </component>
-      <component id="vpnpolins" filter="s60" name="VPN Policy Installer">
-        <unit bldFile="vpnui/vpnpolins/group"/>
-      </component>
-      <component id="vpnpolicyrecognizer" filter="s60" name="VPN Policy Recognizer" class="plugin">
-        <unit bldFile="vpnui/vpnpolicyrecognizer/group"/>
-      </component>
-    </collection>
-    <collection id="vpnapiimpl" name="VPN API Implementation" level="api">
-      <component id="vpnapi" filter="s60" name="VPN API">
-        <unit bldFile="vpnapiimpl/group"/>
-      </component>
-    </collection>
-    <collection id="vpnclient_sis" name="VPN Client SIS" level="api">
-      <component id="ce_sis" filter="s60" name="CE SIS">
-        <unit bldFile="vpnclient_sis/ce_sis/group"/>
-      </component>
-      <component id="stub_sis" filter="s60" name="Stub SIS">
-        <unit bldFile="vpnclient_sis/stub_sis/group"/>
-      </component>
-      <component id="vpnclient_sis_build" filter="s60" name="VPN Client SIS Build">
-        <unit bldFile="vpnclient_sis/group"/>
-      </component>
-    </collection>
-    <collection id="vpnclient_info" name="VPN Client Info" level="api">
-      <component id="vpnclient_help" filter="s60" name="VPN Client Help">
-        <unit bldFile="help/group"/>
-      </component>
-      <component id="vpnclient_build" filter="s60" name="VPN Client Build">
-      	<!-- should split this up into the other components-->
-        <unit bldFile="group"/>
-      </component>
-      <component id="vpnc_plat" filter="s60" class="api" name="VPN Client Platform Interfaces">
-        <unit bldFile="vpnc_plat/vpnapi/group"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>