myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sobr...@apache.org
Subject svn commit: r1335696 [2/2] - in /myfaces/trinidad/branches/2.0.0.1-branch: trinidad-examples/trinidad-components-showcase/src/main/webapp/skins/ trinidad-examples/trinidad-demo/src/main/webapp/skins/beach/ trinidad-examples/trinidad-demo/src/main/webap...
Date Tue, 08 May 2012 18:58:00 GMT
Modified: myfaces/trinidad/branches/2.0.0.1-branch/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/2.0.0.1-branch/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml?rev=1335696&r1=1335695&r2=1335696&view=diff
==============================================================================
--- myfaces/trinidad/branches/2.0.0.1-branch/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml
(original)
+++ myfaces/trinidad/branches/2.0.0.1-branch/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml
Tue May  8 18:58:00 2012
@@ -1,180 +1,203 @@
-<?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="gecko4" agents="gecko/4+">
-      <include refid="gecko" />
-      <include src="gecko4.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="webkit533" agents="webkit/533+">
-      <include refid="webkit312" />
-      <include src="webkit533.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="gecko4" agents="gecko/4+">
+      <include refid="gecko" />
+      <include src="gecko4.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="webkit533" agents="webkit/533+">
+      <include refid="webkit312" />
+      <include src="webkit533.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>
+
+    <!-- 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>

Modified: myfaces/trinidad/branches/2.0.0.1-branch/trinidad-impl/src/main/resources/META-INF/agent/htmlBasic.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/2.0.0.1-branch/trinidad-impl/src/main/resources/META-INF/agent/htmlBasic.xml?rev=1335696&r1=1335695&r2=1335696&view=diff
==============================================================================
--- myfaces/trinidad/branches/2.0.0.1-branch/trinidad-impl/src/main/resources/META-INF/agent/htmlBasic.xml
(original)
+++ myfaces/trinidad/branches/2.0.0.1-branch/trinidad-impl/src/main/resources/META-INF/agent/htmlBasic.xml
Tue May  8 18:58:00 2012
@@ -24,8 +24,9 @@
   <capability name="textPresentation" value="false"/>  
   <capability name="tables" value="basic"/>
   <capability name="frames" value="false"/>  
-  <capability name="iframes" value="false"/>  
-  <capability name="-adfinternal-id" value="true"/>    
+  <capability name="iframes" value="false"/>
+  <capability name="touchScreen" value="none" />
+  <capability name="-adfinternal-id" value="true"/>
   <capability name="-adfinternal-advancedForms" value="false"/>
   <capability name="-adfinternal-target" value="false"/>  
   <capability name="-adfinternal-intrinsicEvents" value="false"/>

Added: myfaces/trinidad/branches/2.0.0.1-branch/trinidad-impl/src/main/resources/META-INF/agent/ios.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/2.0.0.1-branch/trinidad-impl/src/main/resources/META-INF/agent/ios.xml?rev=1335696&view=auto
==============================================================================
--- myfaces/trinidad/branches/2.0.0.1-branch/trinidad-impl/src/main/resources/META-INF/agent/ios.xml
(added)
+++ myfaces/trinidad/branches/2.0.0.1-branch/trinidad-impl/src/main/resources/META-INF/agent/ios.xml
Tue May  8 18:58:00 2012
@@ -0,0 +1,25 @@
+<?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"/>
+<capability name="-adfinternal-supportsDisabledOptions" value="false"/>
+</capabilityData>
+

Modified: myfaces/trinidad/branches/2.0.0.1-branch/trinidad-impl/src/main/xrts/org/apache/myfaces/trinidadinternal/resource/LoggerBundle.xrts
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/2.0.0.1-branch/trinidad-impl/src/main/xrts/org/apache/myfaces/trinidadinternal/resource/LoggerBundle.xrts?rev=1335696&r1=1335695&r2=1335696&view=diff
==============================================================================
--- myfaces/trinidad/branches/2.0.0.1-branch/trinidad-impl/src/main/xrts/org/apache/myfaces/trinidadinternal/resource/LoggerBundle.xrts
(original)
+++ myfaces/trinidad/branches/2.0.0.1-branch/trinidad-impl/src/main/xrts/org/apache/myfaces/trinidadinternal/resource/LoggerBundle.xrts
Tue May  8 18:58:00 2012
@@ -1153,4 +1153,6 @@ The skin {0} specified on the requestMap
 <!-- SESSION_SERIALIZATION_ATTRIBUTE -->
 <resource key="SESSION_SERIALIZATION_ATTRIBUTE">Session attribute:{0} </resource>
 
+<resource key="INVALID_AGENT_PROPERTY">Not a valid @agent CSS property rule: {0}: {1}</resource>
+
 </resources>



Mime
View raw message