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/09/07 22:26:15 UTC
svn commit: r1166385 [2/2] - in
/myfaces/trinidad/branches/1.2.12.6.0-branch: ./
trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/
trinidad-impl/src/main/java/org/apac...
Modified: myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/resources/META-INF/agent/pdaGeneric.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/resources/META-INF/agent/pdaGeneric.xml?rev=1166385&r1=1166384&r2=1166385&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/resources/META-INF/agent/pdaGeneric.xml (original)
+++ myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/resources/META-INF/agent/pdaGeneric.xml Wed Sep 7 20:26:14 2011
@@ -1,30 +1,30 @@
-<?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="textPresentation" value="true"/>
- <capability name="-adfinternal-nameIdentification" value="true"/>
- <capability name="-adfinternal-disabledFormElements" value="false"/>
- <capability name="-adfinternal-readonlyFormElements" value="false"/>
- <capability name="-adfinternal-advancedButtons" value="false"/>
- <capability name="-adfinternal-cssSelectors" value="multiple"/>
- <capability name="-adfinternal-styleAttributes" value="external"/>
- <capability name="narrowScreen" value="true"/>
-</capabilityData>
+<?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="textPresentation" value="true"/>
+ <capability name="-adfinternal-nameIdentification" value="true"/>
+ <capability name="-adfinternal-disabledFormElements" value="false"/>
+ <capability name="-adfinternal-readonlyFormElements" value="false"/>
+ <capability name="-adfinternal-advancedButtons" value="false"/>
+ <capability name="-adfinternal-cssSelectors" value="multiple"/>
+ <capability name="-adfinternal-styleAttributes" value="external"/>
+ <capability name="narrowScreen" value="true"/>
+</capabilityData>
Propchange: myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/resources/META-INF/agent/pdaGeneric.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/resources/META-INF/agent/pdaHtml.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/resources/META-INF/agent/pixo.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/resources/META-INF/agent/pocketie.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/resources/META-INF/agent/pocketie03.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/resources/META-INF/agent/webkit.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/resources/META-INF/agent/webkit312.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/resources/META-INF/agent/wm6.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/resources/META-INF/agent/wm6.xml?rev=1166385&r1=1166384&r2=1166385&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/resources/META-INF/agent/wm6.xml (original)
+++ myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/resources/META-INF/agent/wm6.xml Wed Sep 7 20:26:14 2011
@@ -1,31 +1,31 @@
-<?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="-adfinternal-id" value="true"/>
- <capability name="-adfinternal-disabledFormElements" value="true"/>
- <capability name="-adfinternal-cssSelectors" value="multiple"/>
- <capability name="-adfinternal-styleAttributes" value="external"/>
- <capability name="scriptingSpeed" value="slow"/>
- <capability name="partialRendering" value="true"/>
- <capability name="-adfinternal-xmldom" value="true"/>
- <capability name="-adfinternal-onclick-input" value="true"/>
- <capability name="-adfinternal-onclickOnImgInput" value="false"/>
-</capabilityData>
+<?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="-adfinternal-id" value="true"/>
+ <capability name="-adfinternal-disabledFormElements" value="true"/>
+ <capability name="-adfinternal-cssSelectors" value="multiple"/>
+ <capability name="-adfinternal-styleAttributes" value="external"/>
+ <capability name="scriptingSpeed" value="slow"/>
+ <capability name="partialRendering" value="true"/>
+ <capability name="-adfinternal-xmldom" value="true"/>
+ <capability name="-adfinternal-onclick-input" value="true"/>
+ <capability name="-adfinternal-onclickOnImgInput" value="false"/>
+</capabilityData>
Propchange: myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/resources/META-INF/agent/wm6.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/xrts/org/apache/myfaces/trinidadinternal/resource/LoggerBundle.xrts
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/xrts/org/apache/myfaces/trinidadinternal/resource/LoggerBundle.xrts?rev=1166385&r1=1166384&r2=1166385&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/xrts/org/apache/myfaces/trinidadinternal/resource/LoggerBundle.xrts (original)
+++ myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/xrts/org/apache/myfaces/trinidadinternal/resource/LoggerBundle.xrts Wed Sep 7 20:26:14 2011
@@ -1114,4 +1114,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>
Modified: myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeEqualsTest.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeEqualsTest.java?rev=1166385&r1=1166384&r2=1166385&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeEqualsTest.java (original)
+++ myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeEqualsTest.java Wed Sep 7 20:26:14 2011
@@ -20,6 +20,7 @@ package org.apache.myfaces.trinidadinter
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -29,6 +30,7 @@ import java.util.Set;
import junit.framework.TestCase;
+import org.apache.myfaces.trinidadinternal.skin.AgentProperties;
import org.apache.myfaces.trinidad.context.Version;
import org.apache.myfaces.trinidad.skin.Icon;
import org.apache.myfaces.trinidadinternal.skin.icon.ContextImageIcon;
@@ -133,16 +135,16 @@ public class StyleSheetNodeEqualsTest ex
Locale[] diffOrderLocalesArray = getDiffOrderLocalesArray();
// create a browsers map
- Map<Integer, Set<Version>> browsers = new HashMap<Integer, Set<Version>>();
- browsers.put(1, new HashSet<Version>(Arrays.asList(new Version("5"), new Version("6"))));
- browsers.put(2, new HashSet<Version>(Arrays.asList(new Version("7"), new Version("8"))));
- Map<Integer, Set<Version>> anotherBrowsers = new HashMap<Integer, Set<Version>>();
- anotherBrowsers.put(1, new HashSet<Version>(Arrays.asList(new Version("5"), new Version("6"))));
- anotherBrowsers.put(2, new HashSet<Version>(Arrays.asList(new Version("7"), new Version("8"))));
- Map<Integer, Set<Version>> anotherBrowsersDiffOrder
- = new HashMap<Integer, Set<Version>>();
- anotherBrowsersDiffOrder.put(2, new HashSet<Version>(Arrays.asList(new Version("8"), new Version("7"))));
- anotherBrowsersDiffOrder.put(1, new HashSet<Version>(Arrays.asList(new Version("6"), new Version("5"))));
+ Map<Integer, AgentProperties> browsers = new HashMap<Integer, AgentProperties>();
+ browsers.put(1, new AgentProperties(new HashSet<Version>(Arrays.asList(new Version("5"), new Version("6"))), Collections.<String>emptySet()));
+ browsers.put(2, new AgentProperties(new HashSet<Version>(Arrays.asList(new Version("7"), new Version("8"))), Collections.<String>emptySet()));
+ Map<Integer, AgentProperties> anotherBrowsers = new HashMap<Integer, AgentProperties>();
+ anotherBrowsers.put(1, new AgentProperties(new HashSet<Version>(Arrays.asList(new Version("5"), new Version("6"))), Collections.<String>emptySet()));
+ anotherBrowsers.put(2, new AgentProperties(new HashSet<Version>(Arrays.asList(new Version("7"), new Version("8"))), Collections.<String>emptySet()));
+ Map<Integer, AgentProperties> anotherBrowsersDiffOrder
+ = new HashMap<Integer, AgentProperties>();
+ anotherBrowsersDiffOrder.put(2, new AgentProperties(new HashSet<Version>(Arrays.asList(new Version("8"), new Version("7"))), Collections.<String>emptySet()));
+ anotherBrowsersDiffOrder.put(1, new AgentProperties(new HashSet<Version>(Arrays.asList(new Version("6"), new Version("5"))), Collections.<String>emptySet()));
int[] platforms = {2, 3, 4};
Propchange: myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 7 20:26:14 2011
@@ -1,3 +1,4 @@
+/myfaces/trinidad/branches/1.2-ios-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:1148869-1166367
/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:785365
/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:794062,794792,798299
/myfaces/trinidad/branches/1.2.12.2-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:895708
Propchange: myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 7 20:26:14 2011
@@ -1,3 +1,4 @@
+/myfaces/trinidad/branches/1.2-ios-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:1148869-1166367
/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:785365
/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:794062,794792,798299
/myfaces/trinidad/branches/1.2.12.2-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:895708