myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r923704 [1/2] - in /myfaces/tobago/trunk: core/src/main/faces-config/ core/src/main/java/org/apache/myfaces/tobago/ajax/ core/src/main/java/org/apache/myfaces/tobago/ajax/api/ core/src/main/java/org/apache/myfaces/tobago/application/ core/s...
Date Tue, 16 Mar 2010 12:09:49 GMT
Author: lofwyr
Date: Tue Mar 16 12:09:48 2010
New Revision: 923704

URL: http://svn.apache.org/viewvc?rev=923704&view=rev
Log:
TOBAGO-848: Move classes that shouldn't be used from applications into "internal" package.
 - processing the ajax related stuff

Added:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java   (contents, props changed)
      - copied, changed from r923624, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxComponent.java   (contents, props changed)
      - copied, changed from r923624, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxComponent.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java   (with props)
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxRenderer.java   (contents, props changed)
      - copied, changed from r923624, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxRenderer.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java   (contents, props changed)
      - copied, changed from r923624, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxResponseRenderer.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/application/
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/application/ViewHandlerImpl.java   (contents, props changed)
      - copied, changed from r923624, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/application/ViewHandlerImpl.java
    myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/ajax/
    myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/ajax/api/
    myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java   (with props)
Removed:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/application/ViewHandlerImpl.java
Modified:
    myfaces/tobago/trunk/core/src/main/faces-config/faces-config.xml
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIData.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/UIInputBase.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/UIPanelBase.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/ApplyRequestValuesExecutor.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/ProcessValidationsExecutor.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/RenderResponseExecutor.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/RestoreViewExecutor.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/UpdateModelValuesExecutor.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractAjaxRendererBaseWrapper.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTagDeclaration.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/InTagDeclaration.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTagDeclaration.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTagDeclaration.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTagDeclaration.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTagDeclaration.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/EncodeAjaxCallback.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseJsonWriterImpl.java
    myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/PartialReloadController.java
    myfaces/tobago/trunk/example/demo/src/main/resources/log4j.xml
    myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/application/FoViewHandlerImpl.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
    myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
    myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java
    myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/CreateComponentAnnotationVisitor.java

Modified: myfaces/tobago/trunk/core/src/main/faces-config/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/faces-config/faces-config.xml?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/faces-config/faces-config.xml (original)
+++ myfaces/tobago/trunk/core/src/main/faces-config/faces-config.xml Tue Mar 16 12:09:48 2010
@@ -20,7 +20,7 @@
 <faces-config>
   <application>
     <default-render-kit-id>tobago</default-render-kit-id>
-    <view-handler>org.apache.myfaces.tobago.application.ViewHandlerImpl</view-handler>
+    <view-handler>org.apache.myfaces.tobago.internal.application.ViewHandlerImpl</view-handler>
     <message-bundle>org.apache.myfaces.tobago.context.TobagoResourceBundle</message-bundle>
   </application>
   <component>

Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java (from r923624, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java&r1=923624&r2=923704&rev=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java Tue Mar 16 12:09:48 2010
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.ajax.api;
+package org.apache.myfaces.tobago.ajax;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,96 +18,25 @@ package org.apache.myfaces.tobago.ajax.a
  */
 
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.renderkit.RendererBase;
-import org.apache.myfaces.tobago.util.ComponentUtils;
+import org.apache.myfaces.tobago.internal.ajax.AjaxComponent;
+import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
-import java.io.IOException;
-import java.util.HashMap;
 import java.util.Map;
-import java.util.StringTokenizer;
 
 public class AjaxUtils {
 
   private static final Log LOG = LogFactory.getLog(AjaxUtils.class);
 
-  public static final String AJAX_COMPONENTS = AjaxUtils.class.getName() + ".AJAX_COMPONENTS";
-
-  public static void checkParamValidity(FacesContext facesContext, UIComponent uiComponent, Class compClass) {
-    if (facesContext == null) {
-      throw new NullPointerException("facesContext may not be null");
-    }
-    if (uiComponent == null) {
-      throw new NullPointerException("uiComponent may not be null");
-    }
-    //if (compClass != null && !(compClass.isAssignableFrom(uiComponent.getClass())))
-    // why isAssignableFrom with additional getClass method call if isInstance does the same?
-    if (compClass != null && !(compClass.isInstance(uiComponent))) {
-      throw new IllegalArgumentException("uiComponent : "
-          + uiComponent.getClass().getName() + " is not instance of "
-          + compClass.getName() + " as it should be");
-    }
-  }
-
-
-
-
-  public static void encodeAjaxComponent(FacesContext facesContext, UIComponent component) throws IOException {
-    if (facesContext == null) {
-      throw new NullPointerException("facesContext");
-    }
-    if (!component.isRendered()) {
-      return;
-    }
-    RendererBase renderer = ComponentUtils.getRenderer(facesContext, component);
-    if (renderer != null && renderer instanceof AjaxRenderer) {
-      ((AjaxRenderer) renderer).encodeAjax(facesContext, component);
-    }
-  }
-
-  public static Map<String, UIComponent> parseAndStoreComponents(FacesContext facesContext) {
-    Map parameterMap = facesContext.getExternalContext().getRequestParameterMap();
-    String ajaxComponentIds = (String) parameterMap.get("tobago::partialIds");
-    if (ajaxComponentIds != null) {
-      if (LOG.isInfoEnabled()) {
-        LOG.info("ajaxComponentIds = \"" + ajaxComponentIds + "\"");
-      }
-      StringTokenizer tokenizer = new StringTokenizer(ajaxComponentIds, ",");
-      Map<String, UIComponent> ajaxComponents = new HashMap<String, UIComponent>(tokenizer.countTokens());
-      //noinspection unchecked
-      facesContext.getExternalContext().getRequestMap().put(AJAX_COMPONENTS, ajaxComponents);
-      javax.faces.component.UIViewRoot viewRoot = facesContext.getViewRoot();
-      while (tokenizer.hasMoreTokens()) {
-        String ajaxId = tokenizer.nextToken();
-        UIComponent ajaxComponent = viewRoot.findComponent(ajaxId);
-        if (ajaxComponent != null) {
-          if (LOG.isInfoEnabled()) {
-            LOG.info("ajaxComponent for \"" + ajaxId + "\" = \"" + ajaxComponent + "\"");
-          }
-          ajaxComponents.put(ajaxId, ajaxComponent);
-        }
-      }
-      return ajaxComponents;
-    }
-    return null;
-  }
-
-  public static Map<String, UIComponent> getAjaxComponents(FacesContext facesContext) {
-    //noinspection unchecked
-    return (Map<String, UIComponent>)
-        facesContext.getExternalContext().getRequestMap().get(AJAX_COMPONENTS);
-  }
-
   public static boolean isAjaxRequest(FacesContext facesContext) {
-    return facesContext.getExternalContext().getRequestMap().containsKey(AJAX_COMPONENTS);
+    return facesContext.getExternalContext().getRequestMap().containsKey(AjaxInternalUtils.AJAX_COMPONENTS);
   }
 
   public static void removeAjaxComponent(FacesContext facesContext, String clientId) {
-    Map<String, UIComponent> ajaxComponents = getAjaxComponents(facesContext);
+    Map<String, UIComponent> ajaxComponents = AjaxInternalUtils.getAjaxComponents(facesContext);
     if (ajaxComponents != null) {
       ajaxComponents.remove(clientId);
     }
@@ -118,43 +47,45 @@ public class AjaxUtils {
   }
 
   public static void addAjaxComponent(FacesContext facesContext, UIComponent component) {
+    if (component == null) {
+      LOG.warn("Ignore AjaxComponent: null");
+      return;
+    }
     if (component instanceof AjaxComponent) {
-      Map<String, UIComponent> ajaxComponents = getAjaxComponents(facesContext);
+      Map<String, UIComponent> ajaxComponents = AjaxInternalUtils.getAjaxComponents(facesContext);
       if (ajaxComponents != null) {
         ajaxComponents.put(component.getClientId(facesContext), component);
       }
     } else {
-      LOG.warn("Ignore non AjaxComponent : \""
-          + (component != null ? component.getClientId(facesContext) : "null")
-          + "\" = " + (component != null ? component.getClass().getName() : "null"));
+      LOG.warn("Ignore non AjaxComponent: id='"
+          + component.getClientId(facesContext) + "' class=" + component.getClass().getName());
     }
   }
 
-
   public static void ensureDecoded(FacesContext facesContext, String clientId) {
     ensureDecoded(facesContext, facesContext.getViewRoot().findComponent(clientId));
   }
 
   public static void ensureDecoded(FacesContext facesContext, UIComponent component) {
-    Map<String, UIComponent> ajaxComponents = getAjaxComponents(facesContext);
+    if (component == null) {
+      LOG.warn("Ignore AjaxComponent: null");
+      return;
+    }
+    Map<String, UIComponent> ajaxComponents = AjaxInternalUtils.getAjaxComponents(facesContext);
     if (ajaxComponents != null) {
       for (UIComponent uiComponent : ajaxComponents.values()) {
-        UIComponent currentComponent = component;
-        while (currentComponent != null) {
+        // is component or a parent of it in the list?
+        UIComponent parent = component;
+        while (parent != null) {
           if (component == uiComponent) {
+            // nothing to do, because it was already decoded (in the list)
             return;
           }
-          currentComponent = currentComponent.getParent();
+          parent = parent.getParent();
         }
       }
       component.processDecodes(facesContext);
     }
   }
-
-  public static String encodeJavascriptString(String value) {
-    String result = StringUtils.replace(value, "\\", "\\\\");
-    result = StringUtils.replace(result, "\n", "\\n");
-    result = StringUtils.replace(result, "\r", "\\r");
-    return StringUtils.replace(result, "\"", "\\\"");
-  }
+  
 }

Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIData.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIData.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIData.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIData.java Tue Mar 16 12:09:48 2010
@@ -17,9 +17,9 @@ package org.apache.myfaces.tobago.compon
  * limitations under the License.
  */
 
-import org.apache.myfaces.tobago.ajax.api.AjaxComponent;
 import org.apache.myfaces.tobago.event.SortActionSource;
 import org.apache.myfaces.tobago.event.SortActionSource2;
+import org.apache.myfaces.tobago.internal.ajax.AjaxComponent;
 
 /**
  * @deprecated Please use UISheet

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java Tue Mar 16 12:09:48 2010
@@ -19,12 +19,13 @@ package org.apache.myfaces.tobago.compon
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.ajax.api.AjaxResponseRenderer;
-import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
+import org.apache.myfaces.tobago.ajax.AjaxUtils;
 import org.apache.myfaces.tobago.compat.FacesUtils;
 import org.apache.myfaces.tobago.compat.InvokeOnComponent;
 import org.apache.myfaces.tobago.context.ClientProperties;
 import org.apache.myfaces.tobago.context.TobagoFacesContext;
+import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
+import org.apache.myfaces.tobago.internal.ajax.AjaxResponseRenderer;
 import org.apache.myfaces.tobago.internal.component.AbstractUIPage;
 import org.apache.myfaces.tobago.util.ApplyRequestValuesCallback;
 import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -202,7 +203,7 @@ public class UIViewRoot extends javax.fa
     if (context == null) {
       throw new NullPointerException("context");
     }
-    Map<String, UIComponent> ajaxComponents = AjaxUtils.parseAndStoreComponents(context);
+    Map<String, UIComponent> ajaxComponents = AjaxInternalUtils.parseAndStoreComponents(context);
     if (ajaxComponents != null) {
       // first decode the page
       AbstractUIPage page = ComponentUtils.findPage(context);
@@ -260,7 +261,7 @@ public class UIViewRoot extends javax.fa
       throw new NullPointerException("context");
     }
 
-    Map<String, UIComponent> ajaxComponents = AjaxUtils.getAjaxComponents(context);
+    Map<String, UIComponent> ajaxComponents = AjaxInternalUtils.getAjaxComponents(context);
     if (ajaxComponents != null) {
       for (Map.Entry<String, UIComponent> entry : ajaxComponents.entrySet()) {
         if (context instanceof TobagoFacesContext) {
@@ -282,7 +283,7 @@ public class UIViewRoot extends javax.fa
     if (context == null) {
       throw new NullPointerException("context");
     }
-    Map<String, UIComponent> ajaxComponents = AjaxUtils.getAjaxComponents(context);
+    Map<String, UIComponent> ajaxComponents = AjaxInternalUtils.getAjaxComponents(context);
     if (ajaxComponents != null) {
       for (Map.Entry<String, UIComponent> entry : ajaxComponents.entrySet()) {
         invokeOnComponent(context, entry.getKey(), UPDATE_MODEL_VALUES_CALLBACK);

Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxComponent.java (from r923624, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxComponent.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxComponent.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxComponent.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxComponent.java&r1=923624&r2=923704&rev=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxComponent.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxComponent.java Tue Mar 16 12:09:48 2010
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.ajax.api;
+package org.apache.myfaces.tobago.internal.ajax;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxComponent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxComponent.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java?rev=923704&view=auto
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java (added)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java Tue Mar 16 12:09:48 2010
@@ -0,0 +1,109 @@
+package org.apache.myfaces.tobago.internal.ajax;
+
+/*
+ * 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.
+ */
+
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.tobago.ajax.AjaxUtils;
+import org.apache.myfaces.tobago.renderkit.RendererBase;
+import org.apache.myfaces.tobago.util.ComponentUtils;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+public class AjaxInternalUtils {
+
+  private static final Log LOG = LogFactory.getLog(AjaxInternalUtils.class);
+
+  public static final String AJAX_COMPONENTS = AjaxUtils.class.getName() + ".AJAX_COMPONENTS";
+
+  public static void checkParamValidity(FacesContext facesContext, UIComponent uiComponent, Class compClass) {
+    if (facesContext == null) {
+      throw new NullPointerException("facesContext may not be null");
+    }
+    if (uiComponent == null) {
+      throw new NullPointerException("uiComponent may not be null");
+    }
+    //if (compClass != null && !(compClass.isAssignableFrom(uiComponent.getClass())))
+    // why isAssignableFrom with additional getClass method call if isInstance does the same?
+    if (compClass != null && !(compClass.isInstance(uiComponent))) {
+      throw new IllegalArgumentException("uiComponent : "
+          + uiComponent.getClass().getName() + " is not instance of "
+          + compClass.getName() + " as it should be");
+    }
+  }
+
+  public static void encodeAjaxComponent(FacesContext facesContext, UIComponent component) throws IOException {
+    if (facesContext == null) {
+      throw new NullPointerException("facesContext");
+    }
+    if (!component.isRendered()) {
+      return;
+    }
+    RendererBase renderer = ComponentUtils.getRenderer(facesContext, component);
+    if (renderer != null && renderer instanceof AjaxRenderer) {
+      ((AjaxRenderer) renderer).encodeAjax(facesContext, component);
+    }
+  }
+
+  public static Map<String, UIComponent> parseAndStoreComponents(FacesContext facesContext) {
+    Map parameterMap = facesContext.getExternalContext().getRequestParameterMap();
+    String ajaxComponentIds = (String) parameterMap.get("tobago::partialIds");
+    if (ajaxComponentIds != null) {
+      if (LOG.isInfoEnabled()) {
+        LOG.info("ajaxComponentIds = \"" + ajaxComponentIds + "\"");
+      }
+      StringTokenizer tokenizer = new StringTokenizer(ajaxComponentIds, ",");
+      Map<String, UIComponent> ajaxComponents = new HashMap<String, UIComponent>(tokenizer.countTokens());
+      //noinspection unchecked
+      facesContext.getExternalContext().getRequestMap().put(AJAX_COMPONENTS, ajaxComponents);
+      javax.faces.component.UIViewRoot viewRoot = facesContext.getViewRoot();
+      while (tokenizer.hasMoreTokens()) {
+        String ajaxId = tokenizer.nextToken();
+        UIComponent ajaxComponent = viewRoot.findComponent(ajaxId);
+        if (ajaxComponent != null) {
+          if (LOG.isInfoEnabled()) {
+            LOG.info("ajaxComponent for \"" + ajaxId + "\" = \"" + ajaxComponent + "\"");
+          }
+          ajaxComponents.put(ajaxId, ajaxComponent);
+        }
+      }
+      return ajaxComponents;
+    }
+    return null;
+  }
+
+  public static Map<String, UIComponent> getAjaxComponents(FacesContext facesContext) {
+    //noinspection unchecked
+    return (Map<String, UIComponent>)
+        facesContext.getExternalContext().getRequestMap().get(AJAX_COMPONENTS);
+  }
+
+  public static String encodeJavaScriptString(String value) {
+    String result = StringUtils.replace(value, "\\", "\\\\");
+    result = StringUtils.replace(result, "\n", "\\n");
+    result = StringUtils.replace(result, "\r", "\\r");
+    return StringUtils.replace(result, "\"", "\\\"");
+  }
+}

Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxRenderer.java (from r923624, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxRenderer.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxRenderer.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxRenderer.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxRenderer.java&r1=923624&r2=923704&rev=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxRenderer.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxRenderer.java Tue Mar 16 12:09:48 2010
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.ajax.api;
+package org.apache.myfaces.tobago.internal.ajax;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxRenderer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxRenderer.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java (from r923624, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxResponseRenderer.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxResponseRenderer.java&r1=923624&r2=923704&rev=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxResponseRenderer.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java Tue Mar 16 12:09:48 2010
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.ajax.api;
+package org.apache.myfaces.tobago.internal.ajax;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -22,6 +22,7 @@ import org.apache.commons.logging.LogFac
 import org.apache.myfaces.tobago.compat.FacesUtils;
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.context.TobagoFacesContext;
+import org.apache.myfaces.tobago.lifecycle.TobagoLifecycle;
 import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.util.EncodeAjaxCallback;
 import org.apache.myfaces.tobago.util.RequestUtils;
@@ -46,10 +47,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import static org.apache.myfaces.tobago.lifecycle.TobagoLifecycle.FACES_MESSAGES_KEY;
-import static org.apache.myfaces.tobago.lifecycle.TobagoLifecycle.VIEW_ROOT_KEY;
-
 public class AjaxResponseRenderer {
+  
   public static final int CODE_SUCCESS = 200;
   public static final int CODE_NOT_MODIFIED = 304;
   public static final int CODE_RELOAD_REQUIRED = 309;
@@ -71,16 +70,16 @@ public class AjaxResponseRenderer {
     RenderKit renderKit = renderFactory.getRenderKit(
         facesContext, viewRoot.getRenderKitId());
 
-    UIViewRoot incommingViewRoot = (UIViewRoot)
-        facesContext.getExternalContext().getRequestMap().get(VIEW_ROOT_KEY);
-    if (viewRoot != incommingViewRoot) {
+    UIViewRoot incomingViewRoot = (UIViewRoot)
+        facesContext.getExternalContext().getRequestMap().get(TobagoLifecycle.VIEW_ROOT_KEY);
+    if (viewRoot != incomingViewRoot) {
       if (LOG.isDebugEnabled()) {
         LOG.debug("requesting full page reload because of navigation to "
-            + viewRoot.getViewId() + " from " + incommingViewRoot.getViewId());
+            + viewRoot.getViewId() + " from " + incomingViewRoot.getViewId());
       }
       Map sessionMap = facesContext.getExternalContext().getSessionMap();
       //noinspection unchecked
-      sessionMap.put(VIEW_ROOT_KEY, viewRoot);
+      sessionMap.put(TobagoLifecycle.VIEW_ROOT_KEY, viewRoot);
       List<Object[]> messageHolders = new ArrayList<Object[]>();
       Iterator clientIds = facesContext.getClientIdsWithMessages();
       while (clientIds.hasNext()) {
@@ -95,7 +94,7 @@ public class AjaxResponseRenderer {
       }
       if (!messageHolders.isEmpty()) {
         //noinspection unchecked
-        sessionMap.put(FACES_MESSAGES_KEY, messageHolders);
+        sessionMap.put(TobagoLifecycle.FACES_MESSAGES_KEY, messageHolders);
       }
       writeResponse(facesContext, renderKit, true);
     } else {
@@ -184,7 +183,7 @@ public class AjaxResponseRenderer {
       writer.write("\"");
     }
 
-    Map<String, UIComponent> ajaxComponents = AjaxUtils.getAjaxComponents(facesContext);
+    Map<String, UIComponent> ajaxComponents = AjaxInternalUtils.getAjaxComponents(facesContext);
     int i = 0;
     for (Map.Entry<String, UIComponent> entry : ajaxComponents.entrySet()) {
       writer.write(",\n");

Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/application/ViewHandlerImpl.java (from r923624, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/application/ViewHandlerImpl.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/application/ViewHandlerImpl.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/application/ViewHandlerImpl.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/application/ViewHandlerImpl.java&r1=923624&r2=923704&rev=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/application/ViewHandlerImpl.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/application/ViewHandlerImpl.java Tue Mar 16 12:09:48 2010
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.application;
+package org.apache.myfaces.tobago.internal.application;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/application/ViewHandlerImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/application/ViewHandlerImpl.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java Tue Mar 16 12:09:48 2010
@@ -17,7 +17,6 @@ package org.apache.myfaces.tobago.intern
  * limitations under the License.
  */
 
-import org.apache.myfaces.tobago.ajax.api.AjaxComponent;
 import org.apache.myfaces.tobago.compat.FacesUtils;
 import org.apache.myfaces.tobago.compat.InvokeOnComponent;
 import org.apache.myfaces.tobago.component.Attributes;
@@ -28,6 +27,7 @@ import org.apache.myfaces.tobago.compone
 import org.apache.myfaces.tobago.component.OnComponentPopulated;
 import org.apache.myfaces.tobago.component.Position;
 import org.apache.myfaces.tobago.component.RendererTypes;
+import org.apache.myfaces.tobago.internal.ajax.AjaxComponent;
 import org.apache.myfaces.tobago.internal.layout.LayoutUtils;
 import org.apache.myfaces.tobago.layout.LayoutComponent;
 import org.apache.myfaces.tobago.layout.LayoutContainer;

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java Tue Mar 16 12:09:48 2010
@@ -19,9 +19,6 @@ package org.apache.myfaces.tobago.intern
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.ajax.api.AjaxComponent;
-import org.apache.myfaces.tobago.ajax.api.AjaxResponseRenderer;
-import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
 import org.apache.myfaces.tobago.compat.FacesUtils;
 import org.apache.myfaces.tobago.compat.InvokeOnComponent;
 import org.apache.myfaces.tobago.component.Attributes;
@@ -39,6 +36,9 @@ import org.apache.myfaces.tobago.event.S
 import org.apache.myfaces.tobago.event.SheetStateChangeSource;
 import org.apache.myfaces.tobago.event.SortActionEvent;
 import org.apache.myfaces.tobago.event.SortActionSource;
+import org.apache.myfaces.tobago.internal.ajax.AjaxComponent;
+import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
+import org.apache.myfaces.tobago.internal.ajax.AjaxResponseRenderer;
 import org.apache.myfaces.tobago.internal.layout.LayoutUtils;
 import org.apache.myfaces.tobago.layout.LayoutComponent;
 import org.apache.myfaces.tobago.layout.LayoutContainer;
@@ -415,7 +415,7 @@ public abstract class AbstractUISheet ex
       }
     }
     ajaxResponseCode = AjaxResponseRenderer.CODE_SUCCESS;
-    AjaxUtils.encodeAjaxComponent(facesContext, this);
+    AjaxInternalUtils.encodeAjaxComponent(facesContext, this);
   }
 
   public int getAjaxResponseCode() {

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java Tue Mar 16 12:09:48 2010
@@ -19,8 +19,6 @@ package org.apache.myfaces.tobago.intern
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.ajax.api.AjaxComponent;
-import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
 import org.apache.myfaces.tobago.compat.FacesUtils;
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.ComponentTypes;
@@ -31,6 +29,8 @@ import org.apache.myfaces.tobago.compone
 import org.apache.myfaces.tobago.event.TabChangeEvent;
 import org.apache.myfaces.tobago.event.TabChangeListener;
 import org.apache.myfaces.tobago.event.TabChangeSource;
+import org.apache.myfaces.tobago.internal.ajax.AjaxComponent;
+import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
 import org.apache.myfaces.tobago.internal.layout.LayoutUtils;
 import org.apache.myfaces.tobago.layout.LayoutComponent;
 import org.apache.myfaces.tobago.layout.LayoutContainer;
@@ -263,7 +263,7 @@ public abstract class AbstractUITabGroup
 
   public void encodeAjax(FacesContext facesContext) throws IOException {
     setRenderedIndex(getSelectedIndex());
-    AjaxUtils.encodeAjaxComponent(facesContext, this);
+    AjaxInternalUtils.encodeAjaxComponent(facesContext, this);
   }
 
   public abstract Integer getRenderedIndex();

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/UIInputBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/UIInputBase.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/UIInputBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/UIInputBase.java Tue Mar 16 12:09:48 2010
@@ -17,10 +17,10 @@ package org.apache.myfaces.tobago.intern
  * limitations under the License.
  */
 
-import org.apache.myfaces.tobago.ajax.api.AjaxComponent;
-import org.apache.myfaces.tobago.ajax.api.AjaxResponseRenderer;
-import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
 import org.apache.myfaces.tobago.component.SupportsMarkup;
+import org.apache.myfaces.tobago.internal.ajax.AjaxComponent;
+import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
+import org.apache.myfaces.tobago.internal.ajax.AjaxResponseRenderer;
 import org.apache.myfaces.tobago.layout.LayoutComponent;
 import org.apache.myfaces.tobago.util.ComponentUtils;
 
@@ -38,7 +38,7 @@ public abstract class UIInputBase extend
   }
 
   public void encodeAjax(FacesContext facesContext) throws IOException {
-    AjaxUtils.encodeAjaxComponent(facesContext, this);
+    AjaxInternalUtils.encodeAjaxComponent(facesContext, this);
   }
 
   public int getAjaxResponseCode() {

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/UIPanelBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/UIPanelBase.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/UIPanelBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/UIPanelBase.java Tue Mar 16 12:09:48 2010
@@ -17,14 +17,14 @@ package org.apache.myfaces.tobago.intern
  * limitations under the License.
  */
 
-import org.apache.myfaces.tobago.ajax.api.AjaxComponent;
-import org.apache.myfaces.tobago.ajax.api.AjaxResponseRenderer;
-import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
 import org.apache.myfaces.tobago.compat.FacesUtils;
 import org.apache.myfaces.tobago.compat.InvokeOnComponent;
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.Facets;
 import org.apache.myfaces.tobago.context.TobagoFacesContext;
+import org.apache.myfaces.tobago.internal.ajax.AjaxComponent;
+import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
+import org.apache.myfaces.tobago.internal.ajax.AjaxResponseRenderer;
 import org.apache.myfaces.tobago.util.ComponentUtils;
 
 import javax.faces.FacesException;
@@ -72,7 +72,7 @@ public abstract class UIPanelBase extend
         }
       }
     }
-    AjaxUtils.encodeAjaxComponent(facesContext, this);
+    AjaxInternalUtils.encodeAjaxComponent(facesContext, this);
   }
 
   public int getAjaxResponseCode() {

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/ApplyRequestValuesExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/ApplyRequestValuesExecutor.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/ApplyRequestValuesExecutor.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/ApplyRequestValuesExecutor.java Tue Mar 16 12:09:48 2010
@@ -19,10 +19,10 @@ package org.apache.myfaces.tobago.lifecy
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
 import org.apache.myfaces.tobago.compat.FacesUtils;
 import org.apache.myfaces.tobago.component.UIViewRoot;
 import org.apache.myfaces.tobago.context.TobagoFacesContext;
+import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
 import org.apache.myfaces.tobago.internal.component.AbstractUIPage;
 import org.apache.myfaces.tobago.util.ApplyRequestValuesCallback;
 import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -54,7 +54,7 @@ class ApplyRequestValuesExecutor impleme
 
   public boolean execute(FacesContext facesContext) {
     Map<String, UIComponent> ajaxComponents
-        = AjaxUtils.parseAndStoreComponents(facesContext);
+        = AjaxInternalUtils.parseAndStoreComponents(facesContext);
     if (ajaxComponents != null) {
       // first decode the page
       AbstractUIPage page = ComponentUtils.findPage(facesContext);

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/ProcessValidationsExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/ProcessValidationsExecutor.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/ProcessValidationsExecutor.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/ProcessValidationsExecutor.java Tue Mar 16 12:09:48 2010
@@ -17,21 +17,20 @@ package org.apache.myfaces.tobago.lifecy
  * limitations under the License.
  */
 
-import static javax.faces.event.PhaseId.PROCESS_VALIDATIONS;
-
-import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
-import org.apache.myfaces.tobago.component.UIViewRoot;
-
-import javax.faces.component.ContextCallback;
-import org.apache.myfaces.tobago.util.ProcessValidationsCallback;
 import org.apache.myfaces.tobago.compat.FacesUtils;
+import org.apache.myfaces.tobago.component.UIViewRoot;
 import org.apache.myfaces.tobago.context.TobagoFacesContext;
+import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
+import org.apache.myfaces.tobago.util.ProcessValidationsCallback;
 
+import javax.faces.component.ContextCallback;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.event.PhaseId;
 import java.util.Map;
 
+import static javax.faces.event.PhaseId.PROCESS_VALIDATIONS;
+
 /**
  * Implements the lifecycle as described in Spec. 1.0 PFD Chapter 2
  * Process validations phase (JSF Spec 2.2.3)
@@ -45,7 +44,7 @@ class ProcessValidationsExecutor impleme
   }
 
   public boolean execute(FacesContext facesContext) {
-    Map<String, UIComponent> ajaxComponents = AjaxUtils.getAjaxComponents(facesContext);
+    Map<String, UIComponent> ajaxComponents = AjaxInternalUtils.getAjaxComponents(facesContext);
     if (ajaxComponents != null) {
       for (Map.Entry<String, UIComponent> entry : ajaxComponents.entrySet()) {
         if (facesContext instanceof TobagoFacesContext) {

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/RenderResponseExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/RenderResponseExecutor.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/RenderResponseExecutor.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/RenderResponseExecutor.java Tue Mar 16 12:09:48 2010
@@ -17,9 +17,9 @@ package org.apache.myfaces.tobago.lifecy
  * limitations under the License.
  */
 
-import org.apache.myfaces.tobago.ajax.api.AjaxResponseRenderer;
-import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
 import org.apache.myfaces.tobago.context.TobagoFacesContext;
+import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
+import org.apache.myfaces.tobago.internal.ajax.AjaxResponseRenderer;
 
 import javax.faces.FacesException;
 import javax.faces.application.Application;
@@ -43,7 +43,7 @@ class RenderResponseExecutor implements 
   }
 
   public boolean execute(FacesContext facesContext) {
-    if (AjaxUtils.getAjaxComponents(facesContext) != null) {
+    if (AjaxInternalUtils.getAjaxComponents(facesContext) != null) {
       try {
         if (facesContext instanceof TobagoFacesContext) {
           ((TobagoFacesContext) facesContext).setAjax(true);

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/RestoreViewExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/RestoreViewExecutor.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/RestoreViewExecutor.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/RestoreViewExecutor.java Tue Mar 16 12:09:48 2010
@@ -19,8 +19,6 @@ package org.apache.myfaces.tobago.lifecy
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.lifecycle.TobagoLifecycle.FACES_MESSAGES_KEY;
-import static org.apache.myfaces.tobago.lifecycle.TobagoLifecycle.VIEW_ROOT_KEY;
 import org.apache.myfaces.tobago.portlet.PortletUtils;
 import org.apache.myfaces.tobago.util.ComponentUtils;
 
@@ -41,8 +39,11 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import static org.apache.myfaces.tobago.lifecycle.TobagoLifecycle.FACES_MESSAGES_KEY;
+import static org.apache.myfaces.tobago.lifecycle.TobagoLifecycle.VIEW_ROOT_KEY;
+
 /**
- * Implements the lifecycle as described in Spec. 1.0 PFD Chapter 2
+ * Implements the life cycle as described in Spec. 1.0 PFD Chapter 2
  * <p/>
  * Restore view phase (JSF Spec 2.2.1)
  */

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/UpdateModelValuesExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/UpdateModelValuesExecutor.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/UpdateModelValuesExecutor.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/UpdateModelValuesExecutor.java Tue Mar 16 12:09:48 2010
@@ -17,20 +17,19 @@ package org.apache.myfaces.tobago.lifecy
  * limitations under the License.
  */
 
-import static javax.faces.event.PhaseId.UPDATE_MODEL_VALUES;
-
-import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
+import org.apache.myfaces.tobago.compat.FacesUtils;
 import org.apache.myfaces.tobago.component.UIViewRoot;
-
-import javax.faces.component.ContextCallback;
+import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
 import org.apache.myfaces.tobago.util.UpdateModelValuesCallback;
-import org.apache.myfaces.tobago.compat.FacesUtils;
 
+import javax.faces.component.ContextCallback;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.event.PhaseId;
 import java.util.Map;
 
+import static javax.faces.event.PhaseId.UPDATE_MODEL_VALUES;
+
 
 /**
  * Implements the lifecycle as described in Spec. 1.0 PFD Chapter 2
@@ -45,7 +44,7 @@ class UpdateModelValuesExecutor implemen
   }
 
   public boolean execute(FacesContext facesContext) {
-    Map<String, UIComponent> ajaxComponents = AjaxUtils.getAjaxComponents(facesContext);
+    Map<String, UIComponent> ajaxComponents = AjaxInternalUtils.getAjaxComponents(facesContext);
     if (ajaxComponents != null) {
       for (Map.Entry<String, UIComponent> entry : ajaxComponents.entrySet()) {
         FacesUtils.invokeOnComponent(facesContext, facesContext.getViewRoot(), entry.getKey(), contextCallback);

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractAjaxRendererBaseWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractAjaxRendererBaseWrapper.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractAjaxRendererBaseWrapper.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractAjaxRendererBaseWrapper.java Tue Mar 16 12:09:48 2010
@@ -17,10 +17,10 @@ package org.apache.myfaces.tobago.render
  * limitations under the License.
  */
 
-import org.apache.myfaces.tobago.ajax.api.AjaxRenderer;
+import org.apache.myfaces.tobago.internal.ajax.AjaxRenderer;
 
-import javax.faces.context.FacesContext;
 import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
 import java.io.IOException;
 
 public abstract class AbstractAjaxRendererBaseWrapper extends AbstractLayoutableRendererBaseWrapper

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTagDeclaration.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTagDeclaration.java Tue Mar 16 12:09:48 2010
@@ -36,7 +36,7 @@ import org.apache.myfaces.tobago.taglib.
     uiComponent = "org.apache.myfaces.tobago.component.UIBox",
     uiComponentBaseClass = "org.apache.myfaces.tobago.component.UIPanel",
     componentType = "org.apache.myfaces.tobago.Box",
-    interfaces = "org.apache.myfaces.tobago.ajax.api.AjaxComponent",
+    interfaces = "org.apache.myfaces.tobago.internal.ajax.AjaxComponent",
     rendererType = RendererTypes.BOX,
     facets = {
     @Facet(name= Facets.TOOL_BAR, description = "Contains an instance of UIToolBar",

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/InTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/InTagDeclaration.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/InTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/InTagDeclaration.java Tue Mar 16 12:09:48 2010
@@ -45,7 +45,7 @@ import org.apache.myfaces.tobago.taglib.
     uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.UIInputBase",
     rendererType = RendererTypes.IN,
     allowedChildComponenents = "NONE",
-    interfaces = { "org.apache.myfaces.tobago.ajax.api.AjaxComponent", 
+    interfaces = { "org.apache.myfaces.tobago.internal.ajax.AjaxComponent", 
         "org.apache.myfaces.tobago.component.InputSuggest" },
     facets = {
     @Facet(name = Facets.CHANGE,

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTagDeclaration.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTagDeclaration.java Tue Mar 16 12:09:48 2010
@@ -37,7 +37,7 @@ import org.apache.myfaces.tobago.taglib.
     uiComponent = "org.apache.myfaces.tobago.component.UIPanel",
     uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIPanel",
     rendererType = RendererTypes.PANEL,
-    interfaces = {"org.apache.myfaces.tobago.ajax.api.AjaxComponent",
+    interfaces = {"org.apache.myfaces.tobago.internal.ajax.AjaxComponent",
         "org.apache.myfaces.tobago.component.SupportsMarkup"},
     facets = {
     @Facet(name= Facets.RELOAD, description = "Contains an instance of UIReload",

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTagDeclaration.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTagDeclaration.java Tue Mar 16 12:09:48 2010
@@ -35,7 +35,7 @@ import org.apache.myfaces.tobago.taglib.
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UIPopup",
     uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIPopup",
-    interfaces = "org.apache.myfaces.tobago.ajax.api.AjaxComponent",
+    interfaces = "org.apache.myfaces.tobago.internal.ajax.AjaxComponent",
     rendererType = RendererTypes.POPUP)
 public interface PopupTagDeclaration 
     extends HasId, IsRendered, IsGridLayoutComponentWithDeprecatedDimension, IsGridLayoutContainer, HasMarkup {

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTagDeclaration.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTagDeclaration.java Tue Mar 16 12:09:48 2010
@@ -39,7 +39,7 @@ import org.apache.myfaces.tobago.taglib.
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UISheet",
     uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUISheet",
-    interfaces = { "org.apache.myfaces.tobago.ajax.api.AjaxComponent",
+    interfaces = { "org.apache.myfaces.tobago.internal.ajax.AjaxComponent",
         "org.apache.myfaces.tobago.event.SortActionSource" },
     rendererType = RendererTypes.SHEET,
     allowedChildComponenents = {

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTagDeclaration.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTagDeclaration.java Tue Mar 16 12:09:48 2010
@@ -42,7 +42,7 @@ import org.apache.myfaces.tobago.taglib.
     uiComponent = "org.apache.myfaces.tobago.component.UITabGroup",
     uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUITabGroup",
     rendererType = RendererTypes.TAB_GROUP,
-    interfaces = { "org.apache.myfaces.tobago.ajax.api.AjaxComponent", "javax.faces.component.ActionSource"},
+    interfaces = { "org.apache.myfaces.tobago.internal.ajax.AjaxComponent", "javax.faces.component.ActionSource"},
 //    componentFamily = "org.apache.myfaces.tobago.TabGroup",
     allowedChildComponenents = "org.apache.myfaces.tobago.Tab")
 

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/EncodeAjaxCallback.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/EncodeAjaxCallback.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/EncodeAjaxCallback.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/EncodeAjaxCallback.java Tue Mar 16 12:09:48 2010
@@ -18,7 +18,7 @@ package org.apache.myfaces.tobago.util;
  */
 
 
-import org.apache.myfaces.tobago.ajax.api.AjaxComponent;
+import org.apache.myfaces.tobago.internal.ajax.AjaxComponent;
 import org.apache.myfaces.tobago.renderkit.RendererBase;
 
 import javax.faces.FacesException;

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseJsonWriterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseJsonWriterImpl.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseJsonWriterImpl.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseJsonWriterImpl.java Tue Mar 16 12:09:48 2010
@@ -19,7 +19,7 @@ package org.apache.myfaces.tobago.webapp
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
+import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
 import org.apache.myfaces.tobago.util.FastStringWriter;
 import org.apache.myfaces.tobago.util.XmlUtils;
 
@@ -52,12 +52,12 @@ public class TobagoResponseJsonWriterImp
 
   @Override
   public void write(String string) throws IOException {
-    writeInternal(javascriptMode ? javascriptWriter : getWriter(), AjaxUtils.encodeJavascriptString(string));
+    writeInternal(javascriptMode ? javascriptWriter : getWriter(), AjaxInternalUtils.encodeJavaScriptString(string));
   }
 
   @Override
   public void writeJavascript(String script) throws IOException {
-    writeInternal(javascriptWriter, AjaxUtils.encodeJavascriptString(script));
+    writeInternal(javascriptWriter, AjaxInternalUtils.encodeJavaScriptString(script));
   }
 
   public String getJavascript() {

Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/PartialReloadController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/PartialReloadController.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/PartialReloadController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/PartialReloadController.java Tue Mar 16 12:09:48 2010
@@ -19,8 +19,7 @@ package org.apache.myfaces.tobago.exampl
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
+import org.apache.myfaces.tobago.ajax.AjaxUtils;
 import org.apache.myfaces.tobago.example.demo.Navigation;
 
 import javax.faces.context.FacesContext;

Modified: myfaces/tobago/trunk/example/demo/src/main/resources/log4j.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/resources/log4j.xml?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/resources/log4j.xml (original)
+++ myfaces/tobago/trunk/example/demo/src/main/resources/log4j.xml Tue Mar 16 12:09:48 2010
@@ -56,7 +56,7 @@
     <!--<priority value="debug" />-->
   <!--</category>-->
 
-  <!--<category name="org.apache.myfaces.tobago.application.ViewHandlerImpl">-->
+  <!--<category name="org.apache.myfaces.tobago.internal.application.ViewHandlerImpl">-->
     <!--<priority value="debug" />-->
   <!--</category>-->
 

Added: myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java?rev=923704&view=auto
==============================================================================
--- myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java (added)
+++ myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java Tue Mar 16 12:09:48 2010
@@ -0,0 +1,127 @@
+package org.apache.myfaces.tobago.ajax.api;
+
+/*
+ * 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.
+ */
+
+
+import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * @deprecated
+ */
+@Deprecated
+public class AjaxUtils {
+
+  /**
+   * @deprecated
+   */
+  @Deprecated
+  public static final String AJAX_COMPONENTS = AjaxUtils.class.getName() + ".AJAX_COMPONENTS";
+
+  /**
+   * @deprecated Please use AjaxInternalUtils.checkParamValidity() 
+   */
+  @Deprecated
+  public static void checkParamValidity(FacesContext facesContext, UIComponent uiComponent, Class compClass) {
+    AjaxInternalUtils.checkParamValidity(facesContext, uiComponent, compClass);
+  }
+
+  /**
+   * @deprecated Please use AjaxInternalUtils.encodeAjaxComponent() 
+   */
+  @Deprecated
+  public static void encodeAjaxComponent(FacesContext facesContext, UIComponent component) throws IOException {
+    AjaxInternalUtils.encodeAjaxComponent(facesContext, component);
+  }
+
+  /**
+   * @deprecated Please use AjaxInternalUtils.parseAndStoreComponents() 
+   */
+  @Deprecated
+  public static Map<String, UIComponent> parseAndStoreComponents(FacesContext facesContext) {
+    return AjaxInternalUtils.parseAndStoreComponents(facesContext);
+  }
+
+  /**
+   * @deprecated Please use AjaxInternalUtils.getAjaxComponents() 
+   */
+  @Deprecated
+  public static Map<String, UIComponent> getAjaxComponents(FacesContext facesContext) {
+    return AjaxInternalUtils.getAjaxComponents(facesContext);
+  }
+
+  /**
+   * @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.isAjaxRequest() 
+   */
+  @Deprecated
+  public static boolean isAjaxRequest(FacesContext facesContext) {
+    return org.apache.myfaces.tobago.ajax.AjaxUtils.isAjaxRequest(facesContext);
+  }
+
+  /**
+   * @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.removeAjaxComponent() 
+   */
+  @Deprecated
+  public static void removeAjaxComponent(FacesContext facesContext, String clientId) {
+    org.apache.myfaces.tobago.ajax.AjaxUtils.removeAjaxComponent(facesContext, clientId);
+  }
+
+  /**
+   * @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.addAjaxComponent() 
+   */
+  @Deprecated
+  public static void addAjaxComponent(FacesContext facesContext, String clientId) {
+    org.apache.myfaces.tobago.ajax.AjaxUtils.addAjaxComponent(facesContext, clientId);
+  }
+
+  /**
+   * @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.addAjaxComponent() 
+   */
+  @Deprecated
+  public static void addAjaxComponent(FacesContext facesContext, UIComponent component) {
+    org.apache.myfaces.tobago.ajax.AjaxUtils.addAjaxComponent(facesContext, component);
+  }
+
+  /**
+   * @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.ensureDecoded() 
+   */
+  @Deprecated
+  public static void ensureDecoded(FacesContext facesContext, String clientId) {
+    org.apache.myfaces.tobago.ajax.AjaxUtils.ensureDecoded(facesContext, clientId);
+  }
+
+  /**
+   * @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.ensureDecoded() 
+   */
+  @Deprecated
+  public static void ensureDecoded(FacesContext facesContext, UIComponent component) {
+    org.apache.myfaces.tobago.ajax.AjaxUtils.ensureDecoded(facesContext, component);
+  }
+
+  /**
+   * @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxInternalUtils.encodeJavaScriptString() 
+   */
+  @Deprecated
+  public static String encodeJavascriptString(String value) {
+    return AjaxInternalUtils.encodeJavaScriptString(value);
+  }
+}

Propchange: myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java (original)
+++ myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java Tue Mar 16 12:09:48 2010
@@ -20,13 +20,13 @@ package org.apache.myfaces.tobago.render
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.SupportsMarkup;
 import org.apache.myfaces.tobago.component.UICommand;
 import org.apache.myfaces.tobago.component.UIPage;
 import org.apache.myfaces.tobago.context.ResourceManagerUtil;
 import org.apache.myfaces.tobago.context.TobagoFacesContext;
+import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
 import org.apache.myfaces.tobago.renderkit.LabelWithAccessKey;
 import org.apache.myfaces.tobago.renderkit.css.Style;
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
@@ -674,7 +674,7 @@ public final class HtmlRendererUtil {
     if (objTip != null) {
       String tip = String.valueOf(objTip);
       if (writer instanceof TobagoResponseJsonWriterImpl) {
-        tip = AjaxUtils.encodeJavascriptString(tip);
+        tip = AjaxInternalUtils.encodeJavaScriptString(tip);
       }
       writer.writeAttribute(HtmlAttributes.TITLE, tip, true);
     }
@@ -689,7 +689,7 @@ public final class HtmlRendererUtil {
     if (objTip != null) {
       String tip = String.valueOf(objTip);
       if (writer instanceof TobagoResponseJsonWriterImpl) {
-        tip = AjaxUtils.encodeJavascriptString(tip);
+        tip = AjaxInternalUtils.encodeJavaScriptString(tip);
       }
       writer.writeAttribute(HtmlAttributes.ALT, tip, true);
     } else {

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/application/FoViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/application/FoViewHandlerImpl.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/application/FoViewHandlerImpl.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/application/FoViewHandlerImpl.java Tue Mar 16 12:09:48 2010
@@ -19,6 +19,7 @@ package org.apache.myfaces.tobago.applic
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.tobago.internal.application.ViewHandlerImpl;
 import org.apache.myfaces.tobago.util.DebugUtils;
 import org.apache.myfaces.tobago.util.VariableResolverUtil;
 import org.apache.myfaces.tobago.webapp.TobagoResponse;

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java Tue Mar 16 12:09:48 2010
@@ -19,11 +19,11 @@ package org.apache.myfaces.tobago.render
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.ajax.api.AjaxRenderer;
-import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.UIInput;
 import org.apache.myfaces.tobago.context.TobagoFacesContext;
+import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
+import org.apache.myfaces.tobago.internal.ajax.AjaxRenderer;
 import org.apache.myfaces.tobago.internal.component.AbstractUIPage;
 import org.apache.myfaces.tobago.internal.component.UIInputBase;
 import org.apache.myfaces.tobago.model.AutoSuggestExtensionItem;
@@ -187,7 +187,7 @@ public class InRenderer extends InputRen
       return;
     }
 
-    AjaxUtils.checkParamValidity(context, component, UIInput.class);
+    AjaxInternalUtils.checkParamValidity(context, component, UIInput.class);
 
     UIInputBase input = (UIInputBase) component;
 
@@ -228,9 +228,9 @@ public class InRenderer extends InputRen
         writer.write(", ");
       }
       writer.write("{label: \"");
-      writer.write(AjaxUtils.encodeJavascriptString(suggestItem.getLabel()));
+      writer.write(AjaxInternalUtils.encodeJavaScriptString(suggestItem.getLabel()));
       writer.write("\", value: \"");
-      writer.write(AjaxUtils.encodeJavascriptString(suggestItem.getValue()));
+      writer.write(AjaxInternalUtils.encodeJavaScriptString(suggestItem.getValue()));
       writer.write("\"");
       if (suggestItem.getExtensionItems() != null) {
         writer.write(", values: [");
@@ -242,14 +242,14 @@ public class InRenderer extends InputRen
           writer.write("{id: \"");
           writer.write(item.getId());
           writer.write("\", value: \"");
-          writer.write(AjaxUtils.encodeJavascriptString(item.getValue()));
+          writer.write(AjaxInternalUtils.encodeJavaScriptString(item.getValue()));
           writer.write("\"}");
         }
         writer.write("]");
       }
       if (suggestItem.getNextFocusId() != null) {
         writer.write(", nextfocusId: \"");
-        writer.write(AjaxUtils.encodeJavascriptString(suggestItem.getNextFocusId()));
+        writer.write(AjaxInternalUtils.encodeJavaScriptString(suggestItem.getNextFocusId()));
         writer.write("\"");
       }
 

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java Tue Mar 16 12:09:48 2010
@@ -19,12 +19,12 @@ package org.apache.myfaces.tobago.render
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.ajax.api.AjaxRenderer;
-import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
 import org.apache.myfaces.tobago.component.Facets;
 import org.apache.myfaces.tobago.component.UIPanel;
 import org.apache.myfaces.tobago.component.UIReload;
 import org.apache.myfaces.tobago.config.TobagoConfig;
+import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
+import org.apache.myfaces.tobago.internal.ajax.AjaxRenderer;
 import org.apache.myfaces.tobago.internal.component.AbstractUIPanel;
 import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
 import org.apache.myfaces.tobago.renderkit.css.Style;
@@ -106,7 +106,7 @@ public class PanelRenderer extends Layou
   }
 
   public void encodeAjax(FacesContext facesContext, UIComponent component) throws IOException {
-    AjaxUtils.checkParamValidity(facesContext, component, UIPanel.class);
+    AjaxInternalUtils.checkParamValidity(facesContext, component, UIPanel.class);
     component.encodeChildren(facesContext);
   }
 }

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java Tue Mar 16 12:09:48 2010
@@ -19,13 +19,13 @@ package org.apache.myfaces.tobago.render
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.ajax.api.AjaxRenderer;
-import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.UIPage;
 import org.apache.myfaces.tobago.component.UIPopup;
 import org.apache.myfaces.tobago.context.ResourceManagerUtil;
 import org.apache.myfaces.tobago.context.TobagoFacesContext;
+import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
+import org.apache.myfaces.tobago.internal.ajax.AjaxRenderer;
 import org.apache.myfaces.tobago.internal.layout.LayoutContext;
 import org.apache.myfaces.tobago.layout.Measure;
 import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
@@ -179,7 +179,7 @@ public class PopupRenderer extends Layou
   }
 
   public void encodeAjax(FacesContext facesContext, UIComponent component) throws IOException {
-    AjaxUtils.checkParamValidity(facesContext, component, UIPopup.class);
+    AjaxInternalUtils.checkParamValidity(facesContext, component, UIPopup.class);
     RenderUtil.encode(facesContext, component);
   }
 }

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java Tue Mar 16 12:09:48 2010
@@ -19,8 +19,6 @@ package org.apache.myfaces.tobago.render
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.ajax.api.AjaxRenderer;
-import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.Facets;
 import org.apache.myfaces.tobago.component.RendererTypes;
@@ -37,6 +35,8 @@ import org.apache.myfaces.tobago.context
 import org.apache.myfaces.tobago.context.ResourceManagerUtil;
 import org.apache.myfaces.tobago.context.TobagoFacesContext;
 import org.apache.myfaces.tobago.event.PageAction;
+import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
+import org.apache.myfaces.tobago.internal.ajax.AjaxRenderer;
 import org.apache.myfaces.tobago.layout.AutoLayoutToken;
 import org.apache.myfaces.tobago.layout.LayoutBase;
 import org.apache.myfaces.tobago.layout.LayoutToken;
@@ -1082,7 +1082,7 @@ public class SheetRenderer extends Layou
     UISheet data = (UISheet) component;
     Style style = new Style(facesContext, data);
 
-    AjaxUtils.checkParamValidity(facesContext, data, UISheet.class);
+    AjaxInternalUtils.checkParamValidity(facesContext, data, UISheet.class);
     // TODO find a better way
     UICommand clickAction = null;
     UICommand dblClickAction = null;

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java Tue Mar 16 12:09:48 2010
@@ -20,8 +20,6 @@ package org.apache.myfaces.tobago.render
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.ajax.api.AjaxRenderer;
-import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
 import org.apache.myfaces.tobago.compat.FacesUtils;
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.Facets;
@@ -33,6 +31,8 @@ import org.apache.myfaces.tobago.config.
 import org.apache.myfaces.tobago.context.ResourceManagerUtil;
 import org.apache.myfaces.tobago.context.TobagoFacesContext;
 import org.apache.myfaces.tobago.event.TabChangeEvent;
+import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
+import org.apache.myfaces.tobago.internal.ajax.AjaxRenderer;
 import org.apache.myfaces.tobago.internal.component.UIPanelBase;
 import org.apache.myfaces.tobago.layout.Display;
 import org.apache.myfaces.tobago.layout.Measure;
@@ -536,7 +536,7 @@ public class TabGroupRenderer extends La
 
   public void encodeAjax(FacesContext context, UIComponent component) throws IOException {
     UITabGroup tabGroup = (UITabGroup) component;
-    AjaxUtils.checkParamValidity(context, tabGroup, UITabGroup.class);
+    AjaxInternalUtils.checkParamValidity(context, tabGroup, UITabGroup.class);
     TabList tabList = getTabList(context, tabGroup);
     int index = ensureRenderedActiveIndex(context, tabGroup);
     Measure currentWidth = getCurrentWidth(tabList, index);

Modified: myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java Tue Mar 16 12:09:48 2010
@@ -17,12 +17,12 @@ package org.apache.myfaces.tobago.render
  * limitations under the License.
  */
 
-import org.apache.myfaces.tobago.ajax.api.AjaxRenderer;
-import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.Facets;
 import org.apache.myfaces.tobago.component.UIBox;
 import org.apache.myfaces.tobago.component.UIToolBar;
+import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
+import org.apache.myfaces.tobago.internal.ajax.AjaxRenderer;
 import org.apache.myfaces.tobago.layout.Measure;
 import org.apache.myfaces.tobago.renderkit.BoxRendererBase;
 import org.apache.myfaces.tobago.renderkit.css.Style;
@@ -167,7 +167,7 @@ without shadow
   }
 
   public void encodeAjax(FacesContext facesContext, UIComponent component) throws IOException {
-    AjaxUtils.checkParamValidity(facesContext, component, UIPanel.class);
+    AjaxInternalUtils.checkParamValidity(facesContext, component, UIPanel.class);
     TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
 
     encodeBox(facesContext, writer, (UIBox) component);

Modified: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java?rev=923704&r1=923703&r2=923704&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java Tue Mar 16 12:09:48 2010
@@ -20,7 +20,6 @@ package org.apache.myfaces.tobago.render
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.SupportsMarkup;
 import org.apache.myfaces.tobago.component.UICommand;
@@ -28,6 +27,7 @@ import org.apache.myfaces.tobago.compone
 import org.apache.myfaces.tobago.component.UISheet;
 import org.apache.myfaces.tobago.context.ResourceManagerUtil;
 import org.apache.myfaces.tobago.context.TobagoFacesContext;
+import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
 import org.apache.myfaces.tobago.renderkit.LabelWithAccessKey;
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
@@ -473,7 +473,7 @@ public final class HtmlRendererUtils {
     if (objTip != null) {
       String tip = String.valueOf(objTip);
       if (writer instanceof TobagoResponseJsonWriterImpl) {
-        tip = AjaxUtils.encodeJavascriptString(tip);
+        tip = AjaxInternalUtils.encodeJavaScriptString(tip);
       }
       writer.writeAttribute(HtmlAttributes.TITLE, tip, true);
     }
@@ -484,7 +484,7 @@ public final class HtmlRendererUtils {
     if (objTip != null) {
       String tip = String.valueOf(objTip);
       if (writer instanceof TobagoResponseJsonWriterImpl) {
-        tip = AjaxUtils.encodeJavascriptString(tip);
+        tip = AjaxInternalUtils.encodeJavaScriptString(tip);
       }
       writer.writeAttribute(HtmlAttributes.ALT, tip, true);
     } else {



Mime
View raw message