You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ar...@apache.org on 2012/02/15 17:34:08 UTC

svn commit: r1244577 - /myfaces/trinidad/branches/sobryan_ios_changes/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml

Author: arobinson74
Date: Wed Feb 15 16:34:07 2012
New Revision: 1244577

URL: http://svn.apache.org/viewvc?rev=1244577&view=rev
Log:
Update capabilities to match current trunk version

Modified:
    myfaces/trinidad/branches/sobryan_ios_changes/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml

Modified: myfaces/trinidad/branches/sobryan_ios_changes/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/sobryan_ios_changes/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml?rev=1244577&r1=1244576&r2=1244577&view=diff
==============================================================================
--- myfaces/trinidad/branches/sobryan_ios_changes/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml (original)
+++ myfaces/trinidad/branches/sobryan_ios_changes/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml Wed Feb 15 16:34:07 2012
@@ -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>