fixed build
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/AjaxScriptBuilder.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/AjaxScriptBuilder.java
index 9b27b26..acaad36 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/AjaxScriptBuilder.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/AjaxScriptBuilder.java
@@ -128,9 +128,9 @@
}
else
{
- sb.append("'");
+ sb.append('\'');
sb.append(sourceId);
- sb.append("'");
+ sb.append('\'');
if (!sourceId.trim().equals(component.getClientId(context)))
{
@@ -153,7 +153,7 @@
}
}
}
- sb.append(",");
+ sb.append(',');
sb.append(commandScript == null ? "event" : "null");
sb.append(",'");
@@ -161,13 +161,18 @@
sb.append(eventName);
sb.append("',");
- SearchExpressionHandler seHandler = context.getApplication().getSearchExpressionHandler();
- SearchExpressionContext seContext = SearchExpressionContext.createSearchExpressionContext(
- context, component,
- MyFacesSearchExpressionHints.SET_RESOLVE_CLIENT_SIDE_RESOLVE_SINGLE_COMPONENT, null);
-
+ SearchExpressionHandler seHandler = null;
+ SearchExpressionContext seContext = null;
+ if (StringUtils.isNotBlank(execute) || StringUtils.isNotBlank(render))
+ {
+ seHandler = context.getApplication().getSearchExpressionHandler();
+ seContext = SearchExpressionContext.createSearchExpressionContext(
+ context, component,
+ MyFacesSearchExpressionHints.SET_RESOLVE_CLIENT_SIDE_RESOLVE_SINGLE_COMPONENT, null);
+ }
+
appendIds(sb, execute, seHandler, seContext);
- sb.append(",");
+ sb.append(',');
appendIds(sb, render, seHandler, seContext);
@@ -224,13 +229,13 @@
}
}
- sb.append("}");
+ sb.append('}');
}
- sb.append("}");
+ sb.append('}');
}
- sb.append(")");
+ sb.append(')');
}
private static void appendIds(StringBuilder sb, String expressions,
@@ -270,7 +275,7 @@
}
char lastChar = builder.charAt(builder.length() - 1);
- if ((lastChar != ',') && (lastChar != '{'))
+ if (lastChar != ',' && lastChar != '{')
{
builder.append(',');
}
@@ -279,7 +284,7 @@
builder.append(name);
builder.append('\'');
- builder.append(":");
+ builder.append(':');
if (value == null)
{
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/ClientBehaviorRendererUtilsTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/ClientBehaviorRendererUtilsTest.java
index c469b58..ff45a38 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/ClientBehaviorRendererUtilsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/ClientBehaviorRendererUtilsTest.java
@@ -28,6 +28,7 @@
import javax.faces.component.html.HtmlInputText;
import java.util.*;
+import org.apache.myfaces.config.MyfacesConfig;
import org.apache.myfaces.renderkit.html.base.ClientBehaviorRendererUtils;
public class ClientBehaviorRendererUtilsTest extends AbstractJsfTestCase
@@ -37,6 +38,13 @@
{
super(name);
}
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+
+ servletContext.addInitParameter(MyfacesConfig.RENDER_CLIENTBEHAVIOR_SCRIPTS_AS_STRING, "true");
+ }
public void testBuildBehaviorChain()
{
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlGroupRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlGroupRendererTest.java
index 82f40fe..ec92d7e 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlGroupRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlGroupRendererTest.java
@@ -28,6 +28,7 @@
import static junit.framework.TestCase.assertTrue;
import static junit.framework.TestCase.fail;
import junit.framework.TestSuite;
+import org.apache.myfaces.config.MyfacesConfig;
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
@@ -58,6 +59,8 @@
public void setUp() throws Exception
{
super.setUp();
+
+ servletContext.addInitParameter(MyfacesConfig.RENDER_CLIENTBEHAVIOR_SCRIPTS_AS_STRING, "true");
panelGroup = new HtmlPanelGroup();
@@ -135,10 +138,11 @@
panelGroup.encodeAll(facesContext);
String output = ((StringWriter) writer.getWriter()).getBuffer().toString();
assertTrue(output.matches(".+id=\".+\".+"));
- assertTrue(output.matches(".+jsf.ajax.request.+"));
+ assertTrue(output.contains("myfaces.ab"));
}
catch (Exception e)
{
+ e.printStackTrace();
fail(e.getMessage());
}
}
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextRendererTest.java
index d50b668..3fa229d 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextRendererTest.java
@@ -34,6 +34,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.apache.myfaces.config.MyfacesConfig;
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
import org.apache.myfaces.test.utils.HtmlRenderedAttr;
@@ -66,6 +67,8 @@
public void setUp() throws Exception
{
super.setUp();
+
+ servletContext.addInitParameter(MyfacesConfig.RENDER_CLIENTBEHAVIOR_SCRIPTS_AS_STRING, "true");
outputText = new HtmlOutputText();
inputText = new HtmlInputText();
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AbstractClientBehaviorTestCase.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AbstractClientBehaviorTestCase.java
index 3b3ef83..bc56e5c 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AbstractClientBehaviorTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AbstractClientBehaviorTestCase.java
@@ -163,8 +163,7 @@
int startPropIndex = propIndex + propStart.length();
int endPropIndex = output.indexOf('"' , startPropIndex );
String propertyValue = output.substring(startPropIndex, endPropIndex);
- Assert.assertTrue("Property: " + attr.getName()+" Output: "+output, propertyValue.contains("jsf.ajax.request("));
- Assert.assertTrue("Property: " + attr.getName()+" Output: "+output, propertyValue.contains(ClientBehaviorContext.BEHAVIOR_EVENT_PARAM_NAME));
+ Assert.assertTrue("Property: " + attr.getName()+" Output: "+output, propertyValue.contains("myfaces.ab("));
Assert.assertTrue("Property: " + attr.getName()+" Output: "+output, propertyValue.contains(attr.getClientEvent()));
return endPropIndex + 1;
}
@@ -215,8 +214,7 @@
int endPropIndex = output.indexOf('"' , startPropIndex );
String propertyValue = output.substring(startPropIndex, endPropIndex);
Assert.assertTrue("Property: " + attr.getName()+" Output: "+output, propertyValue.startsWith("jsf.util.chain("));
- Assert.assertTrue("Property: " + attr.getName()+" Output: "+output, propertyValue.contains("jsf.ajax.request("));
- Assert.assertTrue("Property: " + attr.getName()+" Output: "+output, propertyValue.contains(ClientBehaviorContext.BEHAVIOR_EVENT_PARAM_NAME));
+ Assert.assertTrue("Property: " + attr.getName()+" Output: "+output, propertyValue.contains("myfaces.ab("));
Assert.assertTrue("Property: " + attr.getName()+" Output: "+output, propertyValue.contains(attr.getClientEvent()));
Assert.assertTrue("Property: " + attr.getName()+" Output: "+output, propertyValue.contains(value));
return endPropIndex + 1;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/html/DefaultHtmlDecoratorTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/html/DefaultHtmlDecoratorTestCase.java
index e70b24c..9665d14 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/html/DefaultHtmlDecoratorTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/html/DefaultHtmlDecoratorTestCase.java
@@ -46,6 +46,7 @@
import javax.faces.view.facelets.Tag;
import javax.faces.view.facelets.TagAttribute;
import javax.faces.view.facelets.TagDecorator;
+import org.apache.myfaces.config.MyfacesConfig;
import org.apache.myfaces.renderkit.html.HtmlResponseWriterImpl;
import org.apache.myfaces.renderkit.html.util.ResourceUtils;
import org.apache.myfaces.test.utils.HtmlCheckAttributesUtil;
@@ -69,6 +70,8 @@
super.setUpServletObjects();
//servletContext.addInitParameter(FaceletViewDeclarationLanguage.PARAM_DECORATORS,
// DefaultTagDecorator.class.getName());
+
+ servletContext.addInitParameter(MyfacesConfig.RENDER_CLIENTBEHAVIOR_SCRIPTS_AS_STRING, "true");
}
@Test
@@ -586,8 +589,7 @@
HtmlRenderedAttr[] attrs = new HtmlRenderedAttr[]{
new HtmlRenderedAttr("onclick",
"jsf.util.chain(this, event,'alert(\\'hello\\')', "
- + "'jsf.ajax.request(this,event,{render:\\'myForm:box5 \\',"
- + "\\'javax.faces.behavior.event\\':\\'click\\'})');"),
+ + "'myfaces.ab(this,event,\\'click\\',\\'\\',\\'myForm:box5\\')');"),
};
HtmlCheckAttributesUtil.checkRenderedAttributes(attrs, sw.toString());
