--- a/CompilerCompatibility/os/security/package_definition.xml Mon Mar 15 18:47:03 2010 +0000
+++ b/CompilerCompatibility/os/security/package_definition.xml Tue Mar 16 16:25:56 2010 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
+ <!ELEMENT SystemDefinition (systemModel)>
<!ATTLIST SystemDefinition
name CDATA #REQUIRED
schema CDATA #REQUIRED>
@@ -49,131 +49,87 @@
prebuilt NMTOKEN #IMPLIED
late (Y|N) #IMPLIED
priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y|N) #REQUIRED
- targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- root CDATA #IMPLIED
- command CDATA #REQUIRED>
]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
<systemModel>
<layer name="os" long-name="OS" levels="hw services">
<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authorisation" long-name="Authorisation" level="utilities">
-<component name="userpromptservice" long-name="User Prompt Service" introduced="tb92" purpose="mandatory">
-<unit bldFile="/sf/os/security/authorisation/userpromptservice/group" mrp="/sf/os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
-</component>
-<component name="userpromptutils" long-name="User Prompt Utils" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/security/authorisation/userpromptutils/group" mrp="/sf/os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
-</component>
-</collection>
-<collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
-<unit bldFile="/sf/os/security/contentmgmt/contentaccessfwfordrm/group" mrp="/sf/os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-</component>
-<component name="cafrecogniserconfig" long-name="CAF Recogniser Config" introduced="9.1" purpose="mandatory">
-<unit bldFile="/sf/os/security/contentmgmt/cafrecogniserconfig" mrp="/sf/os/security/contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp"/>
-</component>
-<component name="referencedrmagent" long-name="Reference DRM Agent" introduced="8.0" purpose="development">
-<unit bldFile="/sf/os/security/contentmgmt/referencedrmagent/RefTestAgent/group" mrp="/sf/os/security/contentmgmt/referencedrmagent/RefTestAgent/group/security_rta.mrp"/>
-</component>
-</collection>
-<collection name="crypto" long-name="Crypto Libraries" level="libraries">
-<component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/security/crypto/weakcryptospi/group" mrp="/sf/os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
-</component>
-<component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/os/security/crypto/weakcryptospi/strong" mrp="/sf/os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
-</component>
-</collection>
-<collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-<component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
-<unit bldFile="/sf/os/security/cryptomgmtlibs/securityutils/group" mrp="/sf/os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-</component>
-<component name="securitytestfw" long-name="Security Test Framework" deprecated="tb92" introduced="7.0" purpose="development">
-<unit mrp="/sf/os/security/cryptomgmtlibs/securitytestfw/group/security_testframework.mrp"/>
-</component>
-<component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
-<unit mrp="/sf/os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-</component>
-<component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
-<unit bldFile="/sf/os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="/sf/os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-</component>
-<component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
-<unit bldFile="/sf/os/security/cryptomgmtlibs/securitycommonutils/group" mrp="/sf/os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
-</component>
-</collection>
-<collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-<component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
-<unit bldFile="/sf/os/security/securityanddataprivacytools/securityconfig/group" mrp="/sf/os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-</component>
-<component name="securitytools" long-name="Security Tools" introduced="tb92" purpose="optional" class="PC">
-<unit bldFile="/sf/os/security/securityanddataprivacytools/securitytools/group" mrp="/sf/os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-</component>
-</collection>
-<collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
-<component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/security/cryptoplugins/cryptospiplugins/group" mrp="/sf/os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
-</component>
-</collection>
-<collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-<component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
-<unit bldFile="/sf/os/security/cryptoservices/certificateandkeymgmt/group" mrp="/sf/os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-</component>
-<component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
-<unit bldFile="/sf/os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="/sf/os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-</component>
-<component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
-<unit bldFile="/sf/os/security/cryptoservices/asnpkcs/group" mrp="/sf/os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-</component>
-</collection>
-<collection name="authenticationservices" long-name="Authentication Services" level="utilities">
-</collection>
-<collection name="security_info" long-name="OS Security Info" level="utilities">
-<component name="security_metadata" long-name="OS Security Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/os/security/security_info/security_metadata/security_metadata.mrp"/>
-</component>
-</collection>
-</block>
+ <collection name="authenticationservices" long-name="Authentication Services" level="utilities">
+ <component name="authenticationserver" long-name="Authentication Server" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/security/authenticationservices/authenticationserver/group" mrp="/sf/os/security/authenticationservices/authenticationserver/group/security_authserver.mrp"/>
+ </component>
+ </collection>
+ <collection name="authorisation" long-name="Authorisation" level="utilities">
+ <component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
+ <unit bldFile="/sf/os/security/authorisation/userpromptservice/group" mrp="/sf/os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
+ </component>
+ <component name="userpromptutils" long-name="User Prompt Utils" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/security/authorisation/userpromptutils/group" mrp="/sf/os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
+ </component>
+ </collection>
+ <collection name="contentmgmt" long-name="Content Management" level="utilities">
+ <component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
+ <unit bldFile="/sf/os/security/contentmgmt/contentaccessfwfordrm/group" mrp="/sf/os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
+ </component>
+ <component name="cafrecogniserconfig" long-name="CAF Recogniser Config" introduced="9.1" purpose="mandatory">
+ <unit bldFile="/sf/os/security/contentmgmt/cafrecogniserconfig" mrp="/sf/os/security/contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp"/>
+ </component>
+ </collection>
+ <collection name="crypto" long-name="Crypto Libraries" level="libraries">
+ <component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/security/crypto/weakcryptospi/group" mrp="/sf/os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
+ </component>
+ <component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
+ <unit bldFile="/sf/os/security/crypto/weakcryptospi/strong" mrp="/sf/os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
+ </component>
+ </collection>
+ <collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
+ <component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
+ <unit bldFile="/sf/os/security/cryptomgmtlibs/securityutils/group" mrp="/sf/os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
+ </component>
+ <component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc">
+ <unit mrp="/sf/os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
+ </component>
+ <component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional">
+ <unit bldFile="/sf/os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="/sf/os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
+ </component>
+ <component name="securitycommonutils" long-name="Security Common Utils" introduced="8.0" purpose="mandatory">
+ <unit bldFile="/sf/os/security/cryptomgmtlibs/securitycommonutils/group" mrp="/sf/os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
+ </component>
+ </collection>
+ <collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
+ <component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional">
+ <unit bldFile="/sf/os/security/securityanddataprivacytools/securityconfig/group" mrp="/sf/os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
+ </component>
+ <component name="securitytools" long-name="Security Tools" introduced="^3" purpose="optional" class="PC">
+ <unit bldFile="/sf/os/security/securityanddataprivacytools/securitytools/group" mrp="/sf/os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
+ </component>
+ </collection>
+ <collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
+ <component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" plugin="Y">
+ <unit bldFile="/sf/os/security/cryptoplugins/cryptospiplugins/group" mrp="/sf/os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
+ </component>
+ </collection>
+ <collection name="cryptoservices" long-name="Crypto Services" level="plugins">
+ <component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional">
+ <unit bldFile="/sf/os/security/cryptoservices/certificateandkeymgmt/group" mrp="/sf/os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
+ </component>
+ <component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
+ <unit bldFile="/sf/os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="/sf/os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
+ </component>
+ <component name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
+ <unit mrp="/sf/os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
+ </component>
+ <component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
+ <unit bldFile="/sf/os/security/cryptoservices/asnpkcs/group" mrp="/sf/os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
+ </component>
+ </collection>
+ <collection name="security_info" long-name="OS Security Info" level="utilities">
+ <component name="security_metadata" long-name="OS Security Metadata" introduced="^2" purpose="development" class="config PC">
+ <unit mrp="/sf/os/security/security_info/security_metadata/security_metadata.mrp"/>
+ </component>
+ </collection>
+ </block>
</layer>
</systemModel>
</SystemDefinition>
\ No newline at end of file