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:29:56 UTC
svn commit: r1244572 - in /myfaces/trinidad/branches/sobryan_ios_changes: ./
trinidad-impl/src/main/resources/META-INF/agent/
Author: arobinson74
Date: Wed Feb 15 16:29:56 2012
New Revision: 1244572
URL: http://svn.apache.org/viewvc?rev=1244572&view=rev
Log:
Fix EOL of capabilities.xml
Added:
myfaces/trinidad/branches/sobryan_ios_changes/trinidad-impl/src/main/resources/META-INF/agent/android.xml
- copied unchanged from r1136652, myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/agent/android.xml
myfaces/trinidad/branches/sobryan_ios_changes/trinidad-impl/src/main/resources/META-INF/agent/ios.xml
- copied unchanged from r1136652, myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/agent/ios.xml
Modified:
myfaces/trinidad/branches/sobryan_ios_changes/ (props changed)
myfaces/trinidad/branches/sobryan_ios_changes/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml (contents, props changed)
Propchange: myfaces/trinidad/branches/sobryan_ios_changes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 15 16:29:56 2012
@@ -8,4 +8,4 @@
/myfaces/trinidad/branches/jwaldman_StyleMap:754977-770778
/myfaces/trinidad/branches/trinidad-1.2.x:923447,923460,929241
/myfaces/trinidad/branches/trinidad-2.0.x:823098-895949
-/myfaces/trinidad/trunk:819601,819622,834147,886881,888973,893043,896231-908455,908699-921461,1096803,1096816,1096825,1102811-1102874,1125570,1153209-1153956,1174341-1176534,1179011-1182480,1200460-1201790
+/myfaces/trinidad/trunk:819601,819622,834147,886881,888973,893043,896231-908455,908699-921461,1096803,1096816,1096825,1102811-1102874,1125570,1136652,1148845,1153209-1153956,1174341-1176534,1179011-1182480,1200460-1201790
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=1244572&r1=1244571&r2=1244572&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:29:56 2012
@@ -1,194 +1,194 @@
-<?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="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="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="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="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>
Propchange: myfaces/trinidad/branches/sobryan_ios_changes/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml
------------------------------------------------------------------------------
svn:eol-style = native