[myfaces-trinidad] 05/06: Update capabilities to match current trunk version

[de...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

deki pushed a commit to branch sobryan_ios_changes
in repository https://gitbox.apache.org/repos/asf/myfaces-trinidad.git

commit cb382915bed73419b3be23525a9a43d556e47eb5
Author: Andrew Robinson <ar...@apache.org>
AuthorDate: Wed Feb 15 16:34:07 2012 +0000

    Update capabilities to match current trunk version
---
 .../main/resources/META-INF/agent/capabilities.xml | 37 ++++++++++++++--------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml b/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml
index ce45bc0..5960f49 100644
--- a/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml
+++ b/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml
@@ -94,20 +94,6 @@
       <include src="email.xml" />
     </capabilities>
 
-    <capabilities id="ios" agents="webkit/500+" platforms="ipad iphone ipod">
-      <!-- note, version included to give it a higher score than the webkit312 below -->
-      <include refid="html" />
-      <include src="webkit312.xml"/>
-      <include src="ios.xml"/>
-    </capabilities>
-
-    <capabilities id="android" agents="webkit/500+" platforms="android">
-      <!-- note, version included to give it a higher score than the webkit312 below -->
-      <include refid="html" />
-      <include src="webkit312.xml"/>
-      <include src="android.xml"/>
-    </capabilities>
-
     <capabilities id="webkit" agents="webkit">
       <include refid="html" />
       <include src="webkit.xml"/>
@@ -190,5 +176,28 @@
       <include src="pdaGeneric.xml"/>
     </capabilities>
 
+    <!-- The following blocks are for touch screen agents. The multiple version selectors are
+         present due to the fact that the agent version selector is given much greater weight
+         than the platform selector. -->
+    <capabilities id="ios312" agents="webkit/312.1+" platforms="ipad iphone ipod">
+      <include refid="webkit312" />
+      <include src="ios.xml"/>
+    </capabilities>
+
+    <capabilities id="android312" agents="webkit/312.1+" platforms="android">
+      <include refid="webkit312" />
+      <include src="android.xml"/>
+    </capabilities>
+
+    <capabilities id="ios533" agents="webkit/533+" platforms="ipad iphone ipod">
+      <include refid="webkit533" />
+      <include src="ios.xml"/>
+    </capabilities>
+
+    <capabilities id="android533" agents="webkit/533+" platforms="android">
+      <include refid="webkit533" />
+      <include src="android.xml"/>
+    </capabilities>
+
   </agentCapabilities>
 </capabilitiesDocument>

-- 
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.