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 2011/06/16 22:24:20 UTC

svn commit: r1136652 - in /myfaces/trinidad/trunk/trinidad-impl/src/main: java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java resources/META-INF/agent/android.xml resources/META-INF/agent/capabilities.xml resources/META-INF/agent/ios.xml

Author: arobinson74
Date: Thu Jun 16 20:24:19 2011
New Revision: 1136652

URL: http://svn.apache.org/viewvc?rev=1136652&view=rev
Log:
TRINIDAD-2108 -- add touchScreen capabilities to the agent to be added for iOS and Android agents

Added:
    myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/agent/android.xml   (with props)
    myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/agent/ios.xml   (with props)
Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java
    myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml   (contents, props changed)

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java?rev=1136652&r1=1136651&r2=1136652&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java Thu Jun 16 20:24:19 2011
@@ -24,6 +24,7 @@ import java.util.Map;
 import org.apache.myfaces.trinidad.context.Agent;
 import org.apache.myfaces.trinidad.context.Version;
 
+
 /**
  * Extension of public Agent interface. Defines constants/method for AdInternal use.
  * Keeping this Interace as is (from before), but extends the public
@@ -68,6 +69,13 @@ public abstract class TrinidadAgent impl
   static public final CapabilityKey CAP_HEIGHT =
           CapabilityKey.getCapabilityKey("height", true);
 
+  /**
+   * Touch-screen capability, indicating the agent supports TouchEvent and GestureEvent
+   * events.
+   */
+  static public final CapabilityKey CAP_TOUCH_SCREEN =
+          CapabilityKey.getCapabilityKey("touchScreen", true);
+
   //
   // XHTML Modularization
   //
@@ -173,9 +181,9 @@ public abstract class TrinidadAgent impl
 
   static public final CapabilityKey CAP_IS_JDEV_JAVASCRIPT_VE = CapabilityKey
     .getCapabilityKey("-adfinternal-isJDevJavascriptVE", true);
-  
+
   // If this capability flag is true, it means that the request is from an agent
-  // that is running in a narrow-screen PDA. Trinidad optimizes its rendering 
+  // that is running in a narrow-screen PDA. Trinidad optimizes its rendering
   // for narrow-screen PDAs to reduce the overall width of the page rendered.
   static public final CapabilityKey CAP_NARROW_SCREEN = CapabilityKey
     .getCapabilityKey("narrowScreen", true);
@@ -218,7 +226,7 @@ public abstract class TrinidadAgent impl
   // no styling is supported
   static public final Object STYLES_NONE               =
           CapabilityValue.getCapabilityValue (CAP_STYLE_ATTRIBUTES, "none");
-  // only the 'style' attribute is supported. The 'class' attribute is not 
+  // only the 'style' attribute is supported. The 'class' attribute is not
   // supported.
   static public final Object STYLES_STYLE_ONLY              =
           CapabilityValue.getCapabilityValue (CAP_STYLE_ATTRIBUTES, "style_only");
@@ -238,6 +246,18 @@ public abstract class TrinidadAgent impl
   static public final Object SELECTORS_MULTIPLE        =
           CapabilityValue.getCapabilityValue (CAP_CSS_SELECTORS, "multiple");
 
+  // Values for CAP_TOUCH_SCREEN
+  /**
+   * Agent only supports single finger touch events
+   */
+  static public final Object TOUCH_SCREEN_SINGLE =
+          CapabilityValue.getCapabilityValue (CAP_TOUCH_SCREEN, "single");
+  /**
+   * Agent supports multiple finger touch events and gestures
+   */
+  static public final Object TOUCH_SCREEN_MULTIPLE =
+          CapabilityValue.getCapabilityValue (CAP_TOUCH_SCREEN, "multiple");
+
   /**
    * Application constant for Desktop devices
    */
@@ -258,7 +278,7 @@ public abstract class TrinidadAgent impl
    * Application constant for voice
    */
   static public final int TYPE_VOICE = 3;
-  
+
   /**
    * Application constant for web crawlers
    */
@@ -268,7 +288,7 @@ public abstract class TrinidadAgent impl
    * Enumeration representing an Application
    */
   public static enum Application
-  {           
+  {
     /**
      * Application enum when the user agent isn't known.
      */
@@ -396,13 +416,13 @@ public abstract class TrinidadAgent impl
       _agentName = agentName;
 
       StateHolder.NAME_TO_APPLICATION.put(applicationName, this);
-      
+
       Map<String, Application> agentToApplication = StateHolder.AGENT_TO_APPLICATION;
-      agentToApplication.put(agentName, this); 
-      
+      agentToApplication.put(agentName, this);
+
       // if we have an alias for this agent name, register that as well
       if (agentAlias != null)
-        agentToApplication.put(agentAlias, this); 
+        agentToApplication.put(agentAlias, this);
     }
 
     /**
@@ -422,10 +442,10 @@ public abstract class TrinidadAgent impl
     {
       return _agentName;
     }
-    
+
     private final String _applicationName;
     private final String _agentName;
-    
+
     /**
      * Holds the maps of agent name and application name to Application object.  By
      * using a separate class, we avoid restrictions on Enums refrerencing static
@@ -437,8 +457,8 @@ public abstract class TrinidadAgent impl
       static public final Map<String, Application> AGENT_TO_APPLICATION = new HashMap<String, Application>();
     }
   }
-  
-  
+
+
   /**
    * Application constant for an entirely unknown application.
    */
@@ -535,27 +555,27 @@ public abstract class TrinidadAgent impl
    * Application constant for email.
    */
   static public final int APPLICATION_EMAIL = Application.EMAIL.ordinal();
-  
+
   /**
    * Application constant for opera.
    */
   static public final int APPLICATION_OPERA = Application.OPERA.ordinal();
-  
+
   /**
    * Application constant for Google web crawler.
    */
   static public final int APPLICATION_GOOGLEBOT = Application.GOOGLEBOT.ordinal();
-  
+
   /**
    * Application constant for Bing web crawler.
    */
   static public final int APPLICATION_MSNBOT = Application.MSNBOT.ordinal();
-  
+
   /**
    * Application constant for Oracle SES.
    */
   static public final int APPLICATION_ORACLE_SES = Application.ORACLE_SES.ordinal();
-  
+
   /**
    * OS constant for an unknown operating system.
    */
@@ -610,12 +630,12 @@ public abstract class TrinidadAgent impl
    * OS constant for generic PDA
    */
   static public final int OS_GENERICPDA   = 10;
-  
+
   /**
    * OS constant for Android
    */
   static public final int OS_ANDROID  = 11;
-  
+
   /**
    * Name Constant for Netfront agent
    */
@@ -664,57 +684,57 @@ public abstract class TrinidadAgent impl
    * Name Constant for Palm Web clipping (Elaine) agent
    */
   public static final String AGENT_ELAINE = "elaine";
-  
+
   /*
-   * Skin family for BlackBerry browsers whose version > 4.5 
-   */ 
+   * Skin family for BlackBerry browsers whose version > 4.5
+   */
   public static final String SKIN_BLACKBERRY = "blackberry";
-  
+
   /*
-   * Skin family for BlackBerry browsers whose version <=4.5 
+   * Skin family for BlackBerry browsers whose version <=4.5
    */
   public static final String SKIN_BLACKBERRY_MINIMAL = "blackberryminimal";
-  
+
   /*
    * Skin family for all the default mobile browsers
    */
   public static final String SKIN_GENERIC_PDA = "genericpda";
-  
-  /* 
+
+  /*
    * Skin family for all Safari browsers running in the iOS platform (iPhones/iPod/iPad)
    */
   public static final String SKIN_WEBKIT_IPHONE = "iPhonewebkit";
-  
-  /* 
+
+  /*
    * Skin family for all Safari browsers running in linux platform
    */
   public static final String SKIN_WEBKIT_LINUX = "linuxwebkit";
-  
-  /* 
+
+  /*
    * Skin family for all Safari browsers running in Mac platform
    */
   public static final String SKIN_WEBKIT_MAC = "macwebkit";
-  
-  /* 
+
+  /*
    * Skin family for all Safari browsers running in Nokia S60
    */
   public static final String SKIN_WEBKIT_NOKIA = "nokiawebkit";
-  
-  /* 
+
+  /*
    * Skin family for all Safari browsers running in windows platforms
    */
   public static final String SKIN_WEBKIT_WINDOWS = "windowswebkit";
-  
-  /* 
+
+  /*
    * Skin family for all Safari browsers running in unknown platforms
    */
   public static final String SKIN_WEBKIT_DEFAULT = "defaultwebkit";
-   
+
   /*
-   * Skin family for Windows Mobile browsers 
+   * Skin family for Windows Mobile browsers
    */
   public static final String SKIN_WINDOWS_MOBILE = "windowsmobile";
-  
+
   /**
    * Returns the type of agent to which we're rendering.  Currently,
    * only web browsers are understood.
@@ -735,7 +755,7 @@ public abstract class TrinidadAgent impl
    * if a version number couldn't be identified.
    */
   public abstract int getAgentMajorVersion();
-  
+
   /**
    * Returns the Version identifier to use for comparing the Version of this Agent to other
    * Versions.
@@ -754,15 +774,15 @@ public abstract class TrinidadAgent impl
   public abstract Object getCapability(CapabilityKey key);
 
   public abstract Object clone();
-  
+
   /*
    * @return <code>String</code> object that represents an agent's
-   * skin-family, which is based upon the agent's CSS-support.     
+   * skin-family, which is based upon the agent's CSS-support.
    * Agents with the same name can have different skin families
    * if agents' versions or platforms are different.
    */
   public abstract String getSkinFamilyType();
-  
+
   /**
    * Convenienc method for cloning by subclases.
    */

Added: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/agent/android.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/agent/android.xml?rev=1136652&view=auto
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/agent/android.xml (added)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/agent/android.xml Thu Jun 16 20:24:19 2011
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<capabilityData xmlns="http://myfaces.apache.org/trinidad/agent/capabilities">
+  <capability name="touchScreen" value="single"/>
+</capabilityData>

Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/agent/android.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml?rev=1136652&r1=1136651&r2=1136652&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml Thu Jun 16 20:24:19 2011
@@ -1,171 +1,185 @@
-<?xml version="1.0"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-     
--->
-<capabilitiesDocument xmlns="http://myfaces.apache.org/trinidad/agent/capabilities">
-  <agentCapabilities>
-
-    <capabilities id="htmlBasic">
-      <include src="htmlBasic.xml"/>
-    </capabilities>
-
-    <capabilities id="html" default="true" >
-      <include refid="htmlBasic"/>
-      <include src="html.xml"/>
-    </capabilities>
-
-    <capabilities id="pda" platforms="palm">
-      <include refid="htmlBasic"/>
-      <include src ="pdaHtml.xml"/>
-    </capabilities>
-
-    <capabilities id="iecaps">
-      <include refid="html"/>
-      <include src="ie.xml"/>
-    </capabilities>
-
-    <capabilities id="iewindows" agents="ie" platforms="windows">
-      <include refid="iecaps"/>
-    </capabilities>
-
-    <capabilities id="iemac" agents="ie" platforms="mac">
-      <include refid="iecaps"/>
-      <include src="iemac.xml"/>
-    </capabilities>
-
-    <capabilities id="ie55win" agents="ie/5.5+" platforms="windows">
-      <include refid="iecaps"/>
-      <include src="ie55win.xml"/>
-    </capabilities>
-
-    <capabilities id="ie7win" agents="ie/7+" platforms="windows">
-      <include refid="ie55win"/>
-      <include src="ie7win.xml"/>
-    </capabilities>
-
-    <capabilities id="ie8win" agents="ie/8+" platforms="windows">
-      <include refid="ie55win"/>
-      <include src="ie8win.xml"/>
-    </capabilities>
-
-    <capabilities id="gecko" agents="gecko">
-      <include refid="html" />
-      <include src="gecko.xml" />
-    </capabilities>
-    
-    
-    <capabilities id="email" agents="email">
-      <include refid="html" />
-      <include src="email.xml" />
-    </capabilities>
-    
-    <capabilities id="googlebot" agents="googlebot">
-      <include refid="html" />
-      <include src="email.xml" />
-    </capabilities>
-    
-    <capabilities id="msnbot" agents="msnbot">
-      <include refid="html" />
-      <include src="email.xml" />
-    </capabilities>
-    
-    <capabilities id="oracle_ses" agents="oracle_ses">
-      <include refid="html" />
-      <include src="email.xml" />
-    </capabilities>
-
-    <capabilities id="webkit" agents="webkit">
-      <include refid="html" />
-      <include src="webkit.xml"/>
-    </capabilities>
-
-    <capabilities id="webkit312" agents="webkit/312.1+">
-      <include refid="webkit" />
-      <include src="webkit312.xml"/>
-    </capabilities>
-
-    <capabilities id="nokia_s60" agents="nokia_s60">
-      <include refid="webkit312"/>
-      <include src="nokia_S60.xml"/>
-    </capabilities>
-
-    <capabilities id="netscape" agents="netscape">
-      <include refid="html" />
-      <include src="netscape.xml"/>
-    </capabilities>
-    
-    <!-- Netfront browser is treated as basic HTML browser for 
-         performance
-    <capabilities id="netfront" agents="netfront/3+ webpro blazer/3+">
-      <include refid="pda" />
-      <include src="netfront.xml" />
-    </capabilities>
-    -->
-
-    <capabilities id="pixo" agents="pixo">
-      <include refid="pda" />
-      <include src="pixo.xml" />
-    </capabilities>
-
-    <!-- Windows Mobile 5 only (No PPR support) -->
-    <capabilities id="pocketie" agents="ie" platforms="ppc">
-      <include refid="pda"/>
-      <include src="pocketie.xml"/>
-    </capabilities>
-
-    <!-- Windows Mobile 6 only -->
-    <capabilities id="wm6" agents="ie/6+" platforms="ppc">
-      <include refid="pocketie"/>
-      <include src="wm6.xml"/>
-    </capabilities>
-   
-   
-    <!-- BlackBerry Browser pre-4.0; 3.6 and 3.7 include support for
-    XHTML Basic; 3.2 and 3.3 support cHTML; we do not provide
-    explicit support for these browsers, but we use the "pda"
-    capabilities because it provides a stripped set of features
-    close to XHTML Basic -->
-    <capabilities id="blackberry" agents="blackberry" platforms="blackberry">
-      <include refid="htmlBasic"/>
-      <include src="pdaGeneric.xml"/>
-    </capabilities>
-
-    
-    <!-- BlackBerry Browser BlackBerry Curve and Perl devices -->
-    <!-- BlackBerry Curve and Perl are treated as basic HTML browsers for 
-         performance
-    <capabilities id="blackberry4" agents="blackberry/4+" platforms="blackberry">
-      <include refid="pda"/>
-      <include src="blackberry4.xml"/>
-    </capabilities>
-    -->
-
-    <!-- BlackBerry Browser BlackBerry Bold devices -->
-    <capabilities id="blackberryBold" agents="blackberry/4.6+" platforms="blackberry">
-      <include refid="html"/>
-      <include src="blackberry9000.xml"/>
-    </capabilities>
-
-    <capabilities id="genericpda" agents="genericpda">
-      <include refid="htmlBasic"/>
-      <include src="pdaGeneric.xml"/>
-    </capabilities>
-
-  </agentCapabilities>
-</capabilitiesDocument>
+<?xml version="1.0"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<capabilitiesDocument xmlns="http://myfaces.apache.org/trinidad/agent/capabilities">
+  <agentCapabilities>
+
+    <capabilities id="htmlBasic">
+      <include src="htmlBasic.xml"/>
+    </capabilities>
+
+    <capabilities id="html" default="true" >
+      <include refid="htmlBasic"/>
+      <include src="html.xml"/>
+    </capabilities>
+
+    <capabilities id="pda" platforms="palm">
+      <include refid="htmlBasic"/>
+      <include src ="pdaHtml.xml"/>
+    </capabilities>
+
+    <capabilities id="iecaps">
+      <include refid="html"/>
+      <include src="ie.xml"/>
+    </capabilities>
+
+    <capabilities id="iewindows" agents="ie" platforms="windows">
+      <include refid="iecaps"/>
+    </capabilities>
+
+    <capabilities id="iemac" agents="ie" platforms="mac">
+      <include refid="iecaps"/>
+      <include src="iemac.xml"/>
+    </capabilities>
+
+    <capabilities id="ie55win" agents="ie/5.5+" platforms="windows">
+      <include refid="iecaps"/>
+      <include src="ie55win.xml"/>
+    </capabilities>
+
+    <capabilities id="ie7win" agents="ie/7+" platforms="windows">
+      <include refid="ie55win"/>
+      <include src="ie7win.xml"/>
+    </capabilities>
+
+    <capabilities id="ie8win" agents="ie/8+" platforms="windows">
+      <include refid="ie55win"/>
+      <include src="ie8win.xml"/>
+    </capabilities>
+
+    <capabilities id="gecko" agents="gecko">
+      <include refid="html" />
+      <include src="gecko.xml" />
+    </capabilities>
+
+
+    <capabilities id="email" agents="email">
+      <include refid="html" />
+      <include src="email.xml" />
+    </capabilities>
+
+    <capabilities id="googlebot" agents="googlebot">
+      <include refid="html" />
+      <include src="email.xml" />
+    </capabilities>
+
+    <capabilities id="msnbot" agents="msnbot">
+      <include refid="html" />
+      <include src="email.xml" />
+    </capabilities>
+
+    <capabilities id="oracle_ses" agents="oracle_ses">
+      <include refid="html" />
+      <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"/>
+    </capabilities>
+
+    <capabilities id="webkit312" agents="webkit/312.1+">
+      <include refid="webkit" />
+      <include src="webkit312.xml"/>
+    </capabilities>
+
+    <capabilities id="nokia_s60" agents="nokia_s60">
+      <include refid="webkit312"/>
+      <include src="nokia_S60.xml"/>
+    </capabilities>
+
+    <capabilities id="netscape" agents="netscape">
+      <include refid="html" />
+      <include src="netscape.xml"/>
+    </capabilities>
+
+    <!-- Netfront browser is treated as basic HTML browser for
+         performance
+    <capabilities id="netfront" agents="netfront/3+ webpro blazer/3+">
+      <include refid="pda" />
+      <include src="netfront.xml" />
+    </capabilities>
+    -->
+
+    <capabilities id="pixo" agents="pixo">
+      <include refid="pda" />
+      <include src="pixo.xml" />
+    </capabilities>
+
+    <!-- Windows Mobile 5 only (No PPR support) -->
+    <capabilities id="pocketie" agents="ie" platforms="ppc">
+      <include refid="pda"/>
+      <include src="pocketie.xml"/>
+    </capabilities>
+
+    <!-- Windows Mobile 6 only -->
+    <capabilities id="wm6" agents="ie/6+" platforms="ppc">
+      <include refid="pocketie"/>
+      <include src="wm6.xml"/>
+    </capabilities>
+
+
+    <!-- BlackBerry Browser pre-4.0; 3.6 and 3.7 include support for
+    XHTML Basic; 3.2 and 3.3 support cHTML; we do not provide
+    explicit support for these browsers, but we use the "pda"
+    capabilities because it provides a stripped set of features
+    close to XHTML Basic -->
+    <capabilities id="blackberry" agents="blackberry" platforms="blackberry">
+      <include refid="htmlBasic"/>
+      <include src="pdaGeneric.xml"/>
+    </capabilities>
+
+
+    <!-- BlackBerry Browser BlackBerry Curve and Perl devices -->
+    <!-- BlackBerry Curve and Perl are treated as basic HTML browsers for
+         performance
+    <capabilities id="blackberry4" agents="blackberry/4+" platforms="blackberry">
+      <include refid="pda"/>
+      <include src="blackberry4.xml"/>
+    </capabilities>
+    -->
+
+    <!-- BlackBerry Browser BlackBerry Bold devices -->
+    <capabilities id="blackberryBold" agents="blackberry/4.6+" platforms="blackberry">
+      <include refid="html"/>
+      <include src="blackberry9000.xml"/>
+    </capabilities>
+
+    <capabilities id="genericpda" agents="genericpda">
+      <include refid="htmlBasic"/>
+      <include src="pdaGeneric.xml"/>
+    </capabilities>
+
+  </agentCapabilities>
+</capabilitiesDocument>

Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/agent/ios.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/agent/ios.xml?rev=1136652&view=auto
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/agent/ios.xml (added)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/agent/ios.xml Thu Jun 16 20:24:19 2011
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<capabilityData xmlns="http://myfaces.apache.org/trinidad/agent/capabilities">
+  <capability name="touchScreen" value="multiple"/>
+</capabilityData>

Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/agent/ios.xml
------------------------------------------------------------------------------
    svn:eol-style = native