incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From awi...@apache.org
Subject svn commit: r429533 - in /incubator/adffaces/trunk/trinidad: trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/ trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/ trinidad-impl/src/main/java/org/apache/myfaces/tri...
Date Tue, 08 Aug 2006 01:35:01 GMT
Author: awiner
Date: Mon Aug  7 18:35:00 2006
New Revision: 429533

URL: http://svn.apache.org/viewvc?rev=429533&view=rev
Log:
Commit patches for ADFFACES-109 and ADFFACES-110: thanks Gabrielle Crawford and Joseph Rozier

Added:
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/blackberry4.xml
Modified:
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/SSNConverter.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentNameUtil.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormData.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/MessageUtils.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/ByteLengthValidator.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/RegExpValidator.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/html.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/htmlBasic.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/ie.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/ie55win.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/iemac.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/netfront.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/netscape.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pdaHtml.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pixo.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pocketie.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pocketie03.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/webkit.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/webkit312.xml

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java Mon Aug  7 18:35:00 2006
@@ -87,6 +87,11 @@
    * Constant for pocket pc platform
    */
   public static final String PLATFORM_PPC = "ppc";
+  
+  /**
+   * Constant for blackberry platform
+   */
+  public static final String PLATFORM_BLACKBERRY = "blackberry";
 
   /**
    * Constant for Internet Explorer agent
@@ -102,6 +107,15 @@
    * Constant for Apple Webkit agent. Used for all Webkit based agent like Safari
    */
   public static final String AGENT_WEBKIT = "webkit";
+  
+  /**
+   * Constant for BlackBerry Browser agent.  (Note the distinction from the
+   * BlackBerry platform.  The BlackBerry Browser agent runs on the
+   * BlackBerry platform.  It is possible for other agents to run on the
+   * BlackBerry platform.)
+   */
+  public static final String AGENT_BLACKBERRY = "blackberry";
+   
 
   /**
    *

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/SSNConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/SSNConverter.java?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/SSNConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/SSNConverter.java Mon Aug  7 18:35:00 2006
@@ -118,9 +118,9 @@
 
     // in a real app the messages would be translated
     return ("new SSNConverter({"
-            + "S:'{0} - Value \"{1}\" is too short.',"
-            + "L:'{0} - Value \"{1}\" is too long.',"
-            + "N:'{0} - Value \"{1}\" is not a valid social security number.'})"
+            + "S:'Value \"{1}\" is too short.',"
+            + "L:'Value \"{1}\" is too long.',"
+            + "N:'Value \"{1}\" is not a valid social security number.'})"
             );
   }
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java Mon Aug  7 18:35:00 2006
@@ -30,10 +30,6 @@
  */
 public class AgentFactoryImpl implements AgentFactory
 {
-  /**
-   * @param facesContext
-   * @return
-   */
 
   public Agent createAgent(String userAgent, String accept)
   {
@@ -196,6 +192,12 @@
       _populateMozillaAgentImpl(userAgent,agent);
       return;
     }
+    
+    if(userAgent.startsWith("BlackBerry"))
+    {
+        _populateBlackberryAgentImpl(userAgent,agent);
+        return;
+    }
 
     _populateNullAgentImpl(userAgent, agent);
   }
@@ -338,6 +340,50 @@
     agentObj.setAgentVersion(version);
     agentObj.setPlatform(Agent.PLATFORM_PPC);
   }
+  
+    /**
+     * populates data from a Blackberry browser request
+     */
+    private void _populateBlackberryAgentImpl(String agent,AgentImpl agentObj)
+    {
+      // the  User-Agent string for the BlackBerry Browser starts with
+      // BlackBerry<model>/<version> where <model> is the BlackBerry
+      // model, e.g. for the BlackBerry browser 4.1.0 on
+      // the BlackBerry 8700 device, the User-Agent string begins with
+      // BlackBerry8700/4.1.0
+      
+      int start = agent.indexOf("BlackBerry");
+      
+      String version = null;
+      String makeModel = null;
+
+      if (start > -1)
+      {
+        // find the first /, which occurs before the version number
+        int slashLoc = agent.indexOf('/',start);
+        if(slashLoc > -1)
+        {
+            // see the note above about how the User-Agent starts with
+            // BlackBerry<model>/<version>; this returns the
+            // BlackBerry<model> (e.g. BlackBerry8700), which we will
+            // use as the Agent hardwareMakeModel
+            makeModel = agent.substring(start,slashLoc);
+            
+            // _getVersion assumes the location of the slash is passed in,
+            // and starts looking for the version at the NEXT character
+            version = _getVersion(agent, slashLoc);
+        }
+      }
+      
+      // note that the agent and platform are both BLACKBERRY
+      // this is because it is the BlackBerry Browser running on the
+      // BlackBerry device
+      agentObj.setType(Agent.TYPE_PDA);
+      agentObj.setAgent(Agent.AGENT_BLACKBERRY);
+      agentObj.setAgentVersion(version);
+      agentObj.setPlatform(Agent.PLATFORM_BLACKBERRY);
+      agentObj.setMakeModel(makeModel);
+    }  
 
   /**
    * returns the data for the Palm NetFront browser request
@@ -667,8 +713,19 @@
   }
 
 
+  /**
+   * Returns the version contained within a string starting
+   * at a certain location.  The version will contain only numeric
+   * parts separated by dots (.).
+   * @param base the string to pull the version from
+   * @param start the index of the character BEFORE the version
+   * @return the version string
+   */
   private String _getVersion(String base, int start)
   {
+    // start should be the character BEFORE the version portion
+    // (typically a slash character after the agent name)
+    
     if (start < 0)
     {
       return null;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentNameUtil.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentNameUtil.java?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentNameUtil.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentNameUtil.java Mon Aug  7 18:35:00 2006
@@ -73,6 +73,11 @@
     {
       return TrinidadAgent.APPLICATION_SAFARI;
     }
+    
+    if(TrinidadAgent.AGENT_BLACKBERRY.equals(agentName))
+    {
+      return TrinidadAgent.APPLICATION_BLACKBERRY;
+    }
 
     return TrinidadAgent.APPLICATION_UNKNOWN;
   }
@@ -112,9 +117,13 @@
 
     if (TrinidadAgent.PLATFORM_PPC.equals(platformName))
     {
-      //return unknown for now
       return TrinidadAgent.OS_PPC;
     }
+    
+    if (TrinidadAgent.PLATFORM_BLACKBERRY.equals(platformName))
+    {
+        return TrinidadAgent.OS_BLACKBERRY;
+    }
 
     return TrinidadAgent.OS_UNKNOWN;
   }
@@ -168,6 +177,8 @@
         return TrinidadAgent.AGENT_NETFRONT;
       case TrinidadAgent.APPLICATION_SAFARI:
         return TrinidadAgent.AGENT_WEBKIT;
+      case TrinidadAgent.APPLICATION_BLACKBERRY:
+        return TrinidadAgent.AGENT_BLACKBERRY;
        default:
         return null;
     }
@@ -198,6 +209,8 @@
         return TrinidadAgent.PLATFORM_PALM;
       case TrinidadAgent.OS_PPC:
         return TrinidadAgent.PLATFORM_PPC;
+      case TrinidadAgent.OS_BLACKBERRY:
+        return TrinidadAgent.PLATFORM_BLACKBERRY;
       default:
         return null;
     }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java Mon Aug  7 18:35:00 2006
@@ -311,6 +311,12 @@
   static public final int APPLICATION_SAFARI = 11;
 
   /**
+   * Application constant for the Safari browser.
+   */
+  static public final int APPLICATION_BLACKBERRY = 12;
+
+
+  /**
    * OS constant for an unknown operating system.
    */
   static public final int OS_UNKNOWN = 0;
@@ -344,6 +350,11 @@
    * OS constant for any Windows Pocket PC
    */
   static public final int OS_PPC = 6;
+  
+  /**
+   * OS constant for any BlackBerry device
+   */
+  static public final int OS_BLACKBERRY = 7;
 
 
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java Mon Aug  7 18:35:00 2006
@@ -26,7 +26,6 @@
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlUtils;
 import org.apache.myfaces.trinidadinternal.share.text.RGBColorFormat;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafUtils;
-import org.apache.myfaces.trinidadinternal.util.MessageUtils;
 
 
 /**
@@ -238,16 +237,12 @@
       patterns.append(setPatterns[i]);
       patterns.append(' ');
     }
+    
     // will get replaced in javascript
-    String label = "{0}";
-
-    Object[] params = new Object[] {label, "{1}", patterns.toString()};
+    Object[] params = new Object[] {"{0}", "{1}", patterns.toString()};
 
-    convMsgDet = MessageFactory.getMessage(context, CONVERT_MESSAGE_ID,
+    return MessageFactory.getMessage(context, CONVERT_MESSAGE_ID,
                                            convMsgDet, params).getDetail();
-
-    return MessageUtils.createErrorAlertMessage(context, label,
-                                                convMsgDet);
   }
 
   private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(ColorConverter.class);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ConverterUtils.java Mon Aug  7 18:35:00 2006
@@ -1,12 +1,12 @@
 /*
  * Copyright  2005,2006 The Apache Software Foundation.
- * 
+ *
  * Licensed 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.
@@ -29,7 +29,6 @@
 import org.apache.myfaces.trinidad.util.MessageFactory;
 
 import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafUtils;
-import org.apache.myfaces.trinidadinternal.util.MessageUtils;
 
 /**
  * Private utilities for working with converters
@@ -225,18 +224,14 @@
       MessageFactory.getMessage(context, maxId,
                                 new Object[]{"{0}", "{1}", maxVal});
 
-    String msg = MessageUtils.createErrorAlertMessage(context, "{0}",
-                                                      maxMessage.getDetail());
-    outBuffer.append(XhtmlLafUtils.escapeJS(msg));
+    outBuffer.append(XhtmlLafUtils.escapeJS(maxMessage.getDetail()));
     outBuffer.append("',MV:'");
 
     FacesMessage minMessage =
       MessageFactory.getMessage(context, minId,
                                 new Object[]{"{0}", "{1}", minVal});
 
-    msg = MessageUtils.createErrorAlertMessage(context, "{0}",
-                                               minMessage.getDetail());
-    outBuffer.append(XhtmlLafUtils.escapeJS(msg));
+    outBuffer.append(XhtmlLafUtils.escapeJS(minMessage.getDetail()));
 
     outBuffer.append("',D:'");
 
@@ -244,9 +239,8 @@
       MessageFactory.getMessage(context, defaultId,
                                 new Object[]{"{0}", "{1}"});
 
-    msg = MessageUtils.createErrorAlertMessage(context, "{0}",
-                                               defaultMessage.getDetail());
-    outBuffer.append(XhtmlLafUtils.escapeJS(msg));    
+    outBuffer.append(XhtmlLafUtils.escapeJS(defaultMessage.getDetail()));
+
     outBuffer.append("'},(void 0),0,");
     outBuffer.append(maxVal);
     outBuffer.append(',');
@@ -272,9 +266,7 @@
       MessageFactory.getMessage(context, defaultId,
                                 new Object[]{"{0}", "{1}"});
 
-    String msg = MessageUtils.createErrorAlertMessage(context, "{0}",
-                                               defaultMessage.getDetail());
-    outBuffer.append(XhtmlLafUtils.escapeJS(msg));    
+    outBuffer.append(XhtmlLafUtils.escapeJS(defaultMessage.getDetail()));
     outBuffer.append("'})");
 
     return outBuffer.toString();

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java Mon Aug  7 18:35:00 2006
@@ -33,7 +33,6 @@
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormRenderer;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlUtils;
-import org.apache.myfaces.trinidadinternal.util.MessageUtils;
 import javax.faces.component.ValueHolder;
 import javax.faces.convert.Converter;
 
@@ -217,14 +216,10 @@
       if (pattern == null)
         pattern = getSecondaryPattern();
 
-      String label = "{0}"; // will get replaced in javascript
-      Object[] params = new Object[] {label, "{1}", getExample(context)};
+      Object[] params = new Object[] {"{0}", "{1}", getExample(context)};
       String msg = getParseErrorMessage(context, component,
                                         pattern, params).getDetail();
-      String message = XhtmlLafUtils.escapeJS(
-                      MessageUtils.createErrorAlertMessage(context,
-                                                  label,
-                                                  msg));
+      String message = XhtmlLafUtils.escapeJS(msg);
                                                   
       StringBuffer outBuffer = new StringBuffer(30 + jsPattern.length() +
                                                 message.length());

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormData.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormData.java?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormData.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormData.java Mon Aug  7 18:35:00 2006
@@ -41,7 +41,6 @@
 import org.apache.myfaces.trinidadinternal.share.data.ServletRequestParameters;
 import org.apache.myfaces.trinidadinternal.share.util.FastMessageFormat;
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-import org.apache.myfaces.trinidadinternal.util.MessageUtils;
 import org.apache.myfaces.trinidadinternal.validator.InternalClientValidator;
 
 /**
@@ -104,6 +103,14 @@
     labelMap.put(targetId, label);
   }
 
+  public Integer addGlobalMessageFormat(
+    RenderingContext rc)
+  {
+    String format = rc.getSkin().getTranslatedString(rc.getLocaleContext(),  
+                                                     _GLOBAL_FORMAT_KEY);
+    return _addErrorFormat(format);
+  }
+  
 
 
   public Map<String, String> getLabelMap(
@@ -684,7 +691,7 @@
                                          params).getDetail();
     }
 
-    return MessageUtils.createErrorAlertMessage(fContext, label, detail);
+    return detail;
   }
 
  /**
@@ -751,6 +758,7 @@
   // maps patterns to id's
   private Map<String, String> _patternMap;
 
+
   private String _formName = null;
 
  public static final class ConvertValidate
@@ -763,5 +771,6 @@
   }
 
 
+  static private final String _GLOBAL_FORMAT_KEY = "af_messages.GLOBAL_MESSAGE_FORMAT";
   static private final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(FormData.class);
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java Mon Aug  7 18:35:00 2006
@@ -609,9 +609,11 @@
         }
       }
 
-      writer.writeText("]", null);
+      Integer globalFormatIndex = fData.addGlobalMessageFormat(arc);
 
-      writer.writeText("]);if(fl.length>0){_validationAlert('", null);
+      writer.writeText("]],", null);
+      writer.writeText(globalFormatIndex, null);      
+      writer.writeText(");if(fl.length>0){_validationAlert('", null);
       writer.writeText(XhtmlUtils.escapeJS(
                           arc.getTranslatedString("af_form.SUBMIT_ERRORS")),
                        null);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/MessageUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/MessageUtils.java?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/MessageUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/MessageUtils.java Mon Aug  7 18:35:00 2006
@@ -22,14 +22,11 @@
 import javax.faces.context.FacesContext;
 
 import org.apache.myfaces.trinidad.component.core.output.CoreMessage;
-import org.apache.myfaces.trinidad.convert.ClientConverter;
-import org.apache.myfaces.trinidad.util.MessageFactory;
 
 import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRendererUtils;
 import org.apache.myfaces.trinidadinternal.share.util.FastMessageFormat;
 import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.BaseLafRenderer;
-import org.apache.myfaces.trinidadinternal.ui.laf.base.BaseLafUtils;
 
 /**
  * Utility functions used for messaging.
@@ -120,33 +117,6 @@
     return (new FastMessageFormat(pattern)).format(parameters);
   }
 
-  public static String createErrorAlertMessage(
-     FacesContext context,
-     UIComponent component,
-     String detailMessage)
-  {
-    Object label = BaseLafUtils.getComponentLabel(component);
-    String text = (label != null) ? label.toString() : null;
-    return createErrorAlertMessage(context, text, detailMessage);
-  }
-
-  public static String createErrorAlertMessage(
-     FacesContext context,
-     String label,
-     String detailMessage)
-  {
-    String msg = detailMessage;
-
-    // if message exists prepend the component label
-    if ((detailMessage != null) && (label != null))
-    {
-      String[] parameters = new String[] { label, detailMessage };
-      msg = MessageFactory.getMessage(context,
-                                      ClientConverter.ALERT_FORMAT_KEY,
-                                      parameters).getSummary();
-    }
-    return msg;
-  }
 
 
   static private final String _GLOBAL_FORMAT_KEY =

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/ByteLengthValidator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/ByteLengthValidator.java?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/ByteLengthValidator.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/ByteLengthValidator.java Mon Aug  7 18:35:00 2006
@@ -29,7 +29,6 @@
 import org.apache.myfaces.trinidad.util.MessageFactory;
 
 import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafUtils;
-import org.apache.myfaces.trinidadinternal.util.MessageUtils;
 
 /**
  * <p>Enables byte length validation at the client side. </p>
@@ -187,8 +186,7 @@
                                   params).getDetail();
 
 
-    return MessageUtils.createErrorAlertMessage(context, label,
-                                                     detailMsg);
+    return detailMsg;
   }
 
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/RegExpValidator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/RegExpValidator.java?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/RegExpValidator.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/RegExpValidator.java Mon Aug  7 18:35:00 2006
@@ -23,7 +23,6 @@
 
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormRenderer;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlUtils;
-import org.apache.myfaces.trinidadinternal.util.MessageUtils;
 
 public class RegExpValidator
                        extends org.apache.myfaces.trinidad.validator.RegExpValidator
@@ -105,53 +104,20 @@
      return "RegExpFormat()";
   }
 
-  /**
-   * @todo I don't want to send any information through this method.
-   * since all relevant information is sent through the constructor.
-   * Need to evaluate if this method is really needed.
-   * @todo this method as a side effect sets the pattern on the FormRenderer.
-   * Since we are sending all the relevant information to the client script
-   * should find a way to apply the localized strings there instead of using
-   * the option
-   * {0} = inputValue
-   * {1} = id / label
-   * {4} = pattern. [As per Bud's proposal]
-   */
-  public String getClientValidationFormat(
-    FacesContext context,
-    UIComponent component
-    )
-  {/*
-    String clientId = component.getClientId(context);
-
-    if (clientId != null)
-    {
-      FormRenderer.addPatternMapping( clientId, getPattern());
-    }
-    else
-      _LOG.severe("Client id is null, no script rendered");
-
-    /**
-     * @todo Think it's worth to cache it here and then blow that away once
-     * this method gets called. The best would be get rid of this method contract
-     */
-    return null;//_getNoMatchMessageDetail(context);
-  }
+ 
 
   private String _getNoMatchMessageDetail(
     FacesContext context)
   {
     String noMatchMsg = getNoMatchMessageDetail();
-    String label = "{0}"; // this will get substituted on the client
-    Object[] params = new Object[] {label, "{1}", "{2}"};
+    Object[] params = new Object[] {"{0}", "{1}", "{2}"};
 
     String noMatchDetMsg
       = MessageFactory.getMessage(context,
                                   RegExpValidator.NO_MATCH_MESSAGE_ID,
                                   noMatchMsg,
                                   params).getDetail();
-    return MessageUtils.createErrorAlertMessage(context, label,
-                                                noMatchDetMsg);
+    return noMatchDetMsg;
   }
 
   // -= Simon Lessard =-

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js Mon Aug  7 18:35:00 2006
@@ -206,6 +206,10 @@
   {
     retVal = true;
   }
+  else if(_agent.isBlackBerry)
+  {
+    retVal = false;
+  }
 
   return retVal;
 }
@@ -218,18 +222,25 @@
   // convert all characters to lowercase to simplify testing
   var agentString = navigator.userAgent.toLowerCase();
 
+  // note that this only returns m.n (e.g. if the
+  // version number is 2.3.4, this returns the float 2.3)
   var version = parseFloat(navigator.appVersion);
 
-  var isOpera   = false;
-  var isIE      = false;
-  var isNav     = false;
-  var isGecko   = false;
-  var isSafari  = false;
-  var isPIE     = false;
-  var kind      = "unknown";
-  var isWindows = false;
-  var isSolaris = false;
-  var isMac     = false;
+  // note that isBlackBerry refers to the BlackBerry browser
+  // we do not currently specify the BlackBerry platform
+  // because it is not necessary (if we decide to support
+  // other browsers on the BlackBerry platform it may become necessary)
+  var isOpera      = false;
+  var isIE         = false;
+  var isNav        = false;
+  var isGecko      = false;
+  var isSafari     = false;
+  var isPIE        = false;
+  var isBlackBerry = false;
+  var kind         = "unknown";
+  var isWindows    = false;
+  var isSolaris    = false;
+  var isMac        = false;
 
   if (agentString.indexOf("msie") != -1)
   {
@@ -281,6 +292,22 @@
       kind = "nn";
     }
   }
+  else if(agentString.indexOf("blackberry") != -1)
+  {
+    // if we support non-BlackBerry Browser agents on blackberry
+    // devices in the future, we may need to revisit this because
+    // those agents may include "blackberry" in the User-Agent
+    // string; we can't just check if the User-Agent "starts with"
+    // blackberry because navigator.userAgent on BlackBery Browser 4.0
+    // starts with Mozilla/4.0 (even though the User-Agent sent to the
+    // server starts with BlackBerry<model>/<version>)
+
+    // BlackBerry Browser 4.0+ supports navigator.appVersion,
+    // and earlier versions don't support script, so we can
+    // leave the version as defined above
+    isBlackBerry = true;
+    kind = "blackberry";
+  }
 
   if (agentString.indexOf('win') != -1)
   {
@@ -301,6 +328,7 @@
   _agent.isPIE = isPIE;
   _agent.isGecko = isGecko;
   _agent.isSafari = isSafari;
+  _agent.isBlackBerry = isBlackBerry;
   _agent.version = version
   _agent.kind = kind;
   _agent.isWindows = isWindows;
@@ -2248,7 +2276,8 @@
 function _multiValidate(
   form,
   source,
-  validators
+  validators,
+  globalMessageIndex
   )
 {
   var failures = "";
@@ -2371,7 +2400,12 @@
                                                   requiredFormatIndex);
 
         if (requiredErrorString)
+        {
+          requiredErrorString = _getGlobalErrorString(currInput, 
+                                              globalMessageIndex, 
+                                              requiredErrorString);   
           failures += '\n' + requiredErrorString;
+        }
       }
       else if (validations)
       {
@@ -2417,14 +2451,18 @@
                 firstFailure = false;
               }
 
-              // get the formatted error string for the current input and
-              // formatIndex
+              // get the formatted error string for the current input
               var errorString1 = _getErrorString(currInput,
                                                  null,
                                                 converterError);
 
               if (errorString1)
+              {                         
+                errorString1 = _getGlobalErrorString(currInput, 
+                                                     globalMessageIndex, 
+                                                     errorString1);                                         
                 failures += '\n' + errorString1;
+              }
             }
             else
             {
@@ -2485,7 +2523,12 @@
                                                   validationError);
 
                 if (errorString)
+                {     
+                  errorString = _getGlobalErrorString(currInput, 
+                                                      globalMessageIndex, 
+                                                      errorString);       
                   failures += '\n' + errorString;
+                }
               }
             }
           }
@@ -2499,7 +2542,46 @@
   return failures;
 }
 
+function _getGlobalErrorString(
+  input,
+  formatIndex,
+  errorString
+  )
+{
+  var form = _getForm(input);  
+  // get the list of different error formats
+  var errorFormats = window["_" + _getJavascriptId(form.name) + "_Formats"];
+
+  if (errorFormats)
+  {
+    // get the appropriate error format
+    var errorFormat = errorFormats[formatIndex];
 
+    if (errorFormat)
+    {
+      // get the mapping of id's to labels
+      var labelMap = window["_" + _getJavascriptId(form.name) + "_Labels"];
+    
+      // get the label for this input element, if one has been
+      // associated using the ID of the input element
+      if (labelMap)
+      {
+        var label = labelMap[_getID(input)];
+        
+        if (label)
+        {
+          return _formatErrorString(errorFormat,
+                                   {
+                                     "0":label,
+                                     "1":errorString
+                                   });
+        }
+      }
+    }
+  }   
+  
+  return errorString;  
+}                
 
 
 /**
@@ -2605,7 +2687,7 @@
    else
    {
      var form = _getForm(input);
-     // for loser Netscape, use table lookup
+     // for Netscape, use table lookup
      var nameToID = window["_" + _getJavascriptId(form.name) + "_NameToID"];
 
      if (nameToID)

Added: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/blackberry4.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/blackberry4.xml?rev=429533&view=auto
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/blackberry4.xml (added)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/blackberry4.xml Mon Aug  7 18:35:00 2006
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 2006 The Apache Software Foundation.
+
+  Licensed 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="tables" value="advanced"/> 
+  <capability name="-adfinternal-advancedButtons" value="true"/>  
+  <capability name="-adfinternal-advancedForms" value="true"/>  
+  <capability name="-adfinternal-cssSelectors" value="multiple"/>
+  <capability name="-adfinternal-disabledFormElements" value="true"/>
+  <capability name="-adfinternal-fieldset" value="true"/> 
+  <capability name="-adfinternal-id" value="true"/>
+  <capability name="-adfinternal-intrinsicEvents" value="true"/> 
+  <capability name="-adfinternal-readonlyFormElements" value="true"/>  
+  <capability name="-adfinternal-styleAttributes" value="external"/>
+  <capability name="-adfinternal-scriptingSpeed" value="slow"/>
+  <!-- note the following that is not captured in the capability list:
+       1) textPresentation:  BlackBerry Browser 4.0 does not support all
+       of the XHTML text presentation module (5.4.1), specifically not 
+       {sub, sup} (this matches XHTML MP)
+       2) -adfinternal-nowrap:  although the nowrap attribute can be 
+       specified on td, it does not behave as a user might expect;
+       if the content of the nowrap cell is too long to fit on a single line,
+       all cells in the table appear on its own line; if the content is still
+       too long to fit on a single line of the display, the cell's content will
+       still wrap
+       3) the documentation for BlackBerry Browser 4.0 claims only XHTML
+       Mobile Profile (XHTMLMP) support, but the actual implementation does
+       support some other XHTML features (e.g. script); we specify capabilities
+       that match the "real world" device
+  -->
+</capabilityData>
\ No newline at end of file

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml Mon Aug  7 18:35:00 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,94 +14,112 @@
   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="gecko" agents="gecko">
-      <include refid="html" />
-      <include src="gecko.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="netscape" agents="netscape">
-      <include refid="html" />
-      <include src="netscape.xml"/>
-    </capabilities>
-
-    <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>
-
-    <capabilities id="pocketie" agents="ie" platforms="ppc">
-      <include refid="pda"/>
-      <include src="pocketie.xml"/>
-    </capabilities>
-
-    <capabilities id="pocketie03" agents="ie/4+" platforms="ppc">
-      <include refid="pocketie"/>
-      <include src="pocketie03.xml"/>
-    </capabilities>
-  </agentCapabilities>
-
-
-  <!--devices>
-    <device id="Nokia6600" model="nokia6600">
-      <component type="browser">
-        <include refid="htmlBasic"/>
-        <include src="nokia6600-browser.xml"/>
-      </component>
-      <component type="push">
-        <include src="nokia6600-push.xml"/>
-      </component>
-    </device>
-  </devices-->
-
-</capabilitiesDocument>
+<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="gecko" agents="gecko">
+      <include refid="html" />
+      <include src="gecko.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="netscape" agents="netscape">
+      <include refid="html" />
+      <include src="netscape.xml"/>
+    </capabilities>
+
+    <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>
+
+    <capabilities id="pocketie" agents="ie" platforms="ppc">
+      <include refid="pda"/>
+      <include src="pocketie.xml"/>
+    </capabilities>
+
+    <capabilities id="pocketie03" agents="ie/4+" platforms="ppc">
+      <include refid="pocketie"/>
+      <include src="pocketie03.xml"/>
+    </capabilities>
+  </agentCapabilities>
+
+   
+   <!-- 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="pda"/>
+   </capabilities>
+
+   
+   <!-- BlackBerry Browser 4.0+ on BlackBerry devices -->
+   <capabilities id="blackberry4" agents="blackberry/4+" platforms="blackberry">
+     <include refid="pda"/>
+     <include src="blackberry4.xml"/>
+   </capabilities>
+
+
+
+  <!--devices>
+    <device id="Nokia6600" model="nokia6600">
+      <component type="browser">
+        <include refid="htmlBasic"/>
+        <include src="nokia6600-browser.xml"/>
+      </component>
+      <component type="push">
+        <include src="nokia6600-push.xml"/>
+      </component>
+    </device>
+  </devices-->
+
+</capabilitiesDocument>

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/html.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/html.xml?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/html.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/html.xml Mon Aug  7 18:35:00 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,19 +14,19 @@
   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="dom" value="level1"/>
-  <capability name="textPresentation" value="true"/>
-  <capability name="tables" value="advanced"/>
-  <capability name="frames" value="true"/>
-  <capability name="iframes" value="true"/>
-  <capability name="-adfinternal-advancedForms" value="true"/>
-  <capability name="-adfinternal-target" value="true"/>  
-  <capability name="-adfinternal-intrinsicEvents" value="true"/>
-  <capability name="-adfinternal-scriptingSpeed" value="slow"/>
-  <capability name="-adfinternal-styleAttributes" value="external"/>
-  <capability name="-adfinternal-nameIdentification" value="true"/>
-  <capability name="-adfinternal-advancedButtons" value="true"/>
-  <capability name="-adfinternal-multipleWindows" value="true"/>
-  <capability name="-adfinternal-cssSelectors" value="single"/> 
-</capabilityData>
+<capabilityData xmlns="http://myfaces.apache.org/trinidad/agent/capabilities">
+  <capability name="dom" value="level1"/>
+  <capability name="textPresentation" value="true"/>
+  <capability name="tables" value="advanced"/>
+  <capability name="frames" value="true"/>
+  <capability name="iframes" value="true"/>
+  <capability name="-adfinternal-advancedForms" value="true"/>
+  <capability name="-adfinternal-target" value="true"/>  
+  <capability name="-adfinternal-intrinsicEvents" value="true"/>
+  <capability name="-adfinternal-scriptingSpeed" value="slow"/>
+  <capability name="-adfinternal-styleAttributes" value="external"/>
+  <capability name="-adfinternal-nameIdentification" value="true"/>
+  <capability name="-adfinternal-advancedButtons" value="true"/>
+  <capability name="-adfinternal-multipleWindows" value="true"/>
+  <capability name="-adfinternal-cssSelectors" value="single"/> 
+</capabilityData>

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/htmlBasic.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/htmlBasic.xml?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/htmlBasic.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/htmlBasic.xml Mon Aug  7 18:35:00 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,34 +14,34 @@
   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="dom" value="none"/>
-  <capability name="accessKeys" value="true"/> 
-  <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="-adfinternal-advancedForms" value="false"/>
-  <capability name="-adfinternal-target" value="false"/>  
-  <capability name="-adfinternal-intrinsicEvents" value="false"/>
-  <capability name="-adfinternal-scriptingSpeed" value="none"/>  
-  <capability name="-adfinternal-styleAttributes" value="none"/>
-  <capability name="-adfinternal-nameIdentification" value="false"/>
-  <capability name="-adfinternal-disabledFormElements" value="true"/>
-  <capability name="-adfinternal-readonlyFormElements" value="true"/>
-  <capability name="-adfinternal-advancedButtons" value="false"/>
-  <capability name="-adfinternal-valign" value="true"/>
-  <capability name="-adfinternal-nowrap" value="true"/>
-   <!-- image econdings --> 
-  <capability name="-adfinternal-gifImage" value="true"/>  
-  <capability name="-adfinternal-bmpImage" value="true"/>   
-  <capability name="-adfinternal-jpegImage" value="true"/>    
-  <capability name="-adfinternal-multipleWindows" value="false"/>
-  <capability name="-adfinternal-navigation" value="true"/>
-  <capability name="-adfinternal-editing" value="true"/>
-  <capability name="-adfinternal-altRendersTooltipOnImage" value="false"/>
-  <capability name="-adfinternal-cssSelectors" value="none"/>
-  <capability name="-adfinternal-fieldset" value="false"/>  
-  <capability name="-adfinternal-supportsDisabledOptions" value="false"/>
-</capabilityData>
+<capabilityData xmlns="http://myfaces.apache.org/trinidad/agent/capabilities">
+  <capability name="dom" value="none"/>
+  <capability name="accessKeys" value="true"/> 
+  <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="-adfinternal-advancedForms" value="false"/>
+  <capability name="-adfinternal-target" value="false"/>  
+  <capability name="-adfinternal-intrinsicEvents" value="false"/>
+  <capability name="-adfinternal-scriptingSpeed" value="none"/>  
+  <capability name="-adfinternal-styleAttributes" value="none"/>
+  <capability name="-adfinternal-nameIdentification" value="false"/>
+  <capability name="-adfinternal-disabledFormElements" value="true"/>
+  <capability name="-adfinternal-readonlyFormElements" value="true"/>
+  <capability name="-adfinternal-advancedButtons" value="false"/>
+  <capability name="-adfinternal-valign" value="true"/>
+  <capability name="-adfinternal-nowrap" value="true"/>
+   <!-- image econdings --> 
+  <capability name="-adfinternal-gifImage" value="true"/>  
+  <capability name="-adfinternal-bmpImage" value="true"/>   
+  <capability name="-adfinternal-jpegImage" value="true"/>    
+  <capability name="-adfinternal-multipleWindows" value="false"/>
+  <capability name="-adfinternal-navigation" value="true"/>
+  <capability name="-adfinternal-editing" value="true"/>
+  <capability name="-adfinternal-altRendersTooltipOnImage" value="false"/>
+  <capability name="-adfinternal-cssSelectors" value="none"/>
+  <capability name="-adfinternal-fieldset" value="false"/>  
+  <capability name="-adfinternal-supportsDisabledOptions" value="false"/>
+</capabilityData>

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/ie.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/ie.xml?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/ie.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/ie.xml Mon Aug  7 18:35:00 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,13 +14,13 @@
   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-scriptingSpeed" value="fast"/>
-  <capability name="-adfinternal-pngImage" value="true"/>  
-  <capability name="-adfinternal-transparentPngImage" value="true"/>   
-  <capability name="-adfinternal-altRendersTooltipOnImage" value="true"/>
-  <capability name="-adfinternal-cssSelectors" value="multiple"/>
-  <capability name="-adfinternal-imageStretch" value="true"/>
-  <capability name="-adfinternal-fieldset" value="true"/>
-  <capability name="-adfinternal-autoCompleteFormElements" value="true"/>
-</capabilityData>
+<capabilityData xmlns="http://myfaces.apache.org/trinidad/agent/capabilities">
+  <capability name="-adfinternal-scriptingSpeed" value="fast"/>
+  <capability name="-adfinternal-pngImage" value="true"/>  
+  <capability name="-adfinternal-transparentPngImage" value="true"/>   
+  <capability name="-adfinternal-altRendersTooltipOnImage" value="true"/>
+  <capability name="-adfinternal-cssSelectors" value="multiple"/>
+  <capability name="-adfinternal-imageStretch" value="true"/>
+  <capability name="-adfinternal-fieldset" value="true"/>
+  <capability name="-adfinternal-autoCompleteFormElements" value="true"/>
+</capabilityData>

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/ie55win.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/ie55win.xml?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/ie55win.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/ie55win.xml Mon Aug  7 18:35:00 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,6 +14,6 @@
   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-partialRendering" value="true"/>
-</capabilityData>
+<capabilityData xmlns="http://myfaces.apache.org/trinidad/agent/capabilities">
+  <capability name="-adfinternal-partialRendering" value="true"/>
+</capabilityData>

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/iemac.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/iemac.xml?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/iemac.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/iemac.xml Mon Aug  7 18:35:00 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,7 +14,7 @@
   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-altRendersTooltipOnImage" value="false"/>
-  <capability name="-adfinternal-cssSelectors" value="multiple"/>
-</capabilityData>
+<capabilityData xmlns="http://myfaces.apache.org/trinidad/agent/capabilities">
+  <capability name="-adfinternal-altRendersTooltipOnImage" value="false"/>
+  <capability name="-adfinternal-cssSelectors" value="multiple"/>
+</capabilityData>

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/netfront.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/netfront.xml?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/netfront.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/netfront.xml Mon Aug  7 18:35:00 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,18 +14,18 @@
   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="dom" value="form"/>
-  <capability name="tables" value="advanced"/>
-  <capability name="width" value="229"/>
-  <capability name="height" value="255"/> 
-  <capability name="-adfinternal-advancedForms" value="true"/>
-  <capability name="-adfinternal-intrinsicEvents" value="true"/>
-  <capability name="-adfinternal-disabledFormElements" value="false"/>
-  <capability name="-adfinternal-readonlyFormElements" value="false"/>
-  <capability name="-adfinternal-scriptingSpeed" value="slow"/>
-  <capability name="-adfinternal-styleAttributes" value="external"/> 
-   <capability name="-adfinternal-cssSelectors" value="multiple"/>  
-  <capability name="-adfinternal-valign" value="true"/>   
-</capabilityData>
-
+<capabilityData xmlns="http://myfaces.apache.org/trinidad/agent/capabilities">
+  <capability name="dom" value="form"/>
+  <capability name="tables" value="advanced"/>
+  <capability name="width" value="229"/>
+  <capability name="height" value="255"/> 
+  <capability name="-adfinternal-advancedForms" value="true"/>
+  <capability name="-adfinternal-intrinsicEvents" value="true"/>
+  <capability name="-adfinternal-disabledFormElements" value="false"/>
+  <capability name="-adfinternal-readonlyFormElements" value="false"/>
+  <capability name="-adfinternal-scriptingSpeed" value="slow"/>
+  <capability name="-adfinternal-styleAttributes" value="external"/> 
+   <capability name="-adfinternal-cssSelectors" value="multiple"/>  
+  <capability name="-adfinternal-valign" value="true"/>   
+</capabilityData>
+

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/netscape.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/netscape.xml?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/netscape.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/netscape.xml Mon Aug  7 18:35:00 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,15 +14,15 @@
   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="dom" value="form"/>
-  <capability name="accessKeys" value="false"/>  
-  <capability name="iframes" value="false"/> 
-  <capability name="-adfinternal-id" value="false"/>
-  <capability name="-adfinternal-disabledFormElements" value="false"/>
-  <capability name="-adfinternal-readonlyFormElements" value="false"/>
-  <capability name="-adfinternal-advancedButtons" value="false"/>   
-  <capability name="-adfinternal-altRendersTooltipOnImage" value="true"/>
-  <capability name="-adfinternal-pngImage" value="true"/>  
- 
-</capabilityData>
+<capabilityData xmlns="http://myfaces.apache.org/trinidad/agent/capabilities">
+  <capability name="dom" value="form"/>
+  <capability name="accessKeys" value="false"/>  
+  <capability name="iframes" value="false"/> 
+  <capability name="-adfinternal-id" value="false"/>
+  <capability name="-adfinternal-disabledFormElements" value="false"/>
+  <capability name="-adfinternal-readonlyFormElements" value="false"/>
+  <capability name="-adfinternal-advancedButtons" value="false"/>   
+  <capability name="-adfinternal-altRendersTooltipOnImage" value="true"/>
+  <capability name="-adfinternal-pngImage" value="true"/>  
+ 
+</capabilityData>

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pdaHtml.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pdaHtml.xml?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pdaHtml.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pdaHtml.xml Mon Aug  7 18:35:00 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,14 +14,14 @@
   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="accessKeys" value="false"/>
-  <capability name="textPresentation" value="true"/>      
-  <capability name="-adfinternal-id" value="false"/>  
-  <capability name="-adfinternal-accessKeys" value="false"/>
-  <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-valign" value="false"/>
-</capabilityData>
+<capabilityData xmlns="http://myfaces.apache.org/trinidad/agent/capabilities">
+  <capability name="accessKeys" value="false"/>
+  <capability name="textPresentation" value="true"/>      
+  <capability name="-adfinternal-id" value="false"/>  
+  <capability name="-adfinternal-accessKeys" value="false"/>
+  <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-valign" value="false"/>
+</capabilityData>

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pixo.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pixo.xml?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pixo.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pixo.xml Mon Aug  7 18:35:00 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,8 +14,8 @@
   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="width" value="229"/>
-  <capability name="height" value="255"/>
-  <capability name="-adfinternal-valign" value="true"/>
-</capabilityData>
+<capabilityData xmlns="http://myfaces.apache.org/trinidad/agent/capabilities">
+  <capability name="width" value="229"/>
+  <capability name="height" value="255"/>
+  <capability name="-adfinternal-valign" value="true"/>
+</capabilityData>

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pocketie.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pocketie.xml?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pocketie.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pocketie.xml Mon Aug  7 18:35:00 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,14 +14,14 @@
   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="dom" value="form"/>
-  <capability name="tables" value="advanced"/> 
-  <capability name="height" value="255"/> 
-  <capability name="width" value="229"/>
-  <capability name="-adfinternal-advancedForms" value="true"/> 
-  <capability name="-adfinternal-intrinsicEvents" value="true"/> 
-  <capability name="-adfinternal-disabledFormElements" value="false"/>
-  <capability name="-adfinternal-readonlyFormElements" value="false"/> 
-  <capability name="-adfinternal-valign" value="true"/>
-</capabilityData>
+<capabilityData xmlns="http://myfaces.apache.org/trinidad/agent/capabilities">
+  <capability name="dom" value="form"/>
+  <capability name="tables" value="advanced"/> 
+  <capability name="height" value="255"/> 
+  <capability name="width" value="229"/>
+  <capability name="-adfinternal-advancedForms" value="true"/> 
+  <capability name="-adfinternal-intrinsicEvents" value="true"/> 
+  <capability name="-adfinternal-disabledFormElements" value="false"/>
+  <capability name="-adfinternal-readonlyFormElements" value="false"/> 
+  <capability name="-adfinternal-valign" value="true"/>
+</capabilityData>

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pocketie03.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pocketie03.xml?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pocketie03.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/pocketie03.xml Mon Aug  7 18:35:00 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,12 +14,12 @@
   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="-adfinternal-scriptingSpeed" value="slow"/>
-  <capability name="-adfinternal-partialRendering" value="true"/>
-  <capability name="-adfinternal-xmldom" value="true"/>  
-</capabilityData>
+<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="-adfinternal-scriptingSpeed" value="slow"/>
+  <capability name="-adfinternal-partialRendering" value="true"/>
+  <capability name="-adfinternal-xmldom" value="true"/>  
+</capabilityData>

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/webkit.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/webkit.xml?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/webkit.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/webkit.xml Mon Aug  7 18:35:00 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,9 +14,9 @@
   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="dom" value="level2"/>
-  <capability name="accessKeys" value="false"/> 
-  <capability name="-adfinternal-cssSelectors" value="multiple"/> 
-  <capability name="-adfinternal-imageStretch" value="true"/> 
-</capabilityData>
+<capabilityData xmlns="http://myfaces.apache.org/trinidad/agent/capabilities">
+  <capability name="dom" value="level2"/>
+  <capability name="accessKeys" value="false"/> 
+  <capability name="-adfinternal-cssSelectors" value="multiple"/> 
+  <capability name="-adfinternal-imageStretch" value="true"/> 
+</capabilityData>

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/webkit312.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/webkit312.xml?rev=429533&r1=429532&r2=429533&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/webkit312.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/agent/webkit312.xml Mon Aug  7 18:35:00 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,7 +14,7 @@
   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="accessKeys" value="true"/>
-  <capability name="-adfinternal-partialRendering" value="true"/>
-</capabilityData>
+<capabilityData xmlns="http://myfaces.apache.org/trinidad/agent/capabilities">
+  <capability name="accessKeys" value="true"/>
+  <capability name="-adfinternal-partialRendering" value="true"/>
+</capabilityData>



Mime
View raw message