You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by aw...@apache.org on 2006/12/15 02:17:23 UTC
svn commit: r487429 [7/44] - in
/incubator/adffaces/branches/faces-1_2-061214: plugins/maven-faces-plugin/
plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/
plugins/maven-faces-plugin/src/main/java/org/apache/myfac...
Modified: incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/ReturnActionListener.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/ReturnActionListener.java?view=diff&rev=487429&r1=487428&r2=487429
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/ReturnActionListener.java (original)
+++ incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/ReturnActionListener.java Thu Dec 14 18:16:57 2006
@@ -15,6 +15,8 @@
*/
package org.apache.myfaces.trinidadinternal.taglib.listener;
+import javax.el.ValueExpression;
+
import javax.faces.component.StateHolder;
import javax.faces.event.ActionEvent;
import javax.faces.event.ActionListener;
@@ -45,19 +47,17 @@
public void processAction(ActionEvent event)
{
- Object value = getValue();
+ Object value = getProperty(VALUE_KEY);
RequestContext adf = RequestContext.getCurrentInstance();
adf.returnFromDialog(value, null);
}
- public Object getValue()
- {
- return getProperty(VALUE_KEY);
- }
-
- public void setValue(Object value)
+ public void setValue(ValueExpression value)
{
- setProperty(VALUE_KEY, value);
+ if (value.isLiteralText())
+ setProperty(VALUE_KEY, value.getValue(null));
+ else
+ setValueExpression(VALUE_KEY, value);
}
@Override
Modified: incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/ReturnActionListenerTag.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/ReturnActionListenerTag.java?view=diff&rev=487429&r1=487428&r2=487429
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/ReturnActionListenerTag.java (original)
+++ incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/ReturnActionListenerTag.java Thu Dec 14 18:16:57 2006
@@ -17,6 +17,8 @@
import org.apache.myfaces.trinidadinternal.taglib.util.TagUtils;
+import javax.el.ValueExpression;
+
import javax.servlet.jsp.tagext.TagSupport;
import javax.servlet.jsp.JspException;
@@ -35,7 +37,7 @@
*/
public class ReturnActionListenerTag extends TagSupport
{
- public void setValue(String value)
+ public void setValue(ValueExpression value)
{
_value = value;
}
@@ -69,21 +71,8 @@
ReturnActionListener listener = new ReturnActionListener();
if (_value != null)
- {
- String value = _value;
- if (TagUtils.isValueReference(value))
- {
- if (parentELContext != null)
- value = parentELContext.transformExpression(value);
-
- listener.setValueBinding(ReturnActionListener.VALUE_KEY,
- application.createValueBinding(value));
- }
- else
- {
- listener.setValue(value);
- }
- }
+ listener.setValue(_value);
+
((ActionSource) component).addActionListener(listener);
return super.doStartTag();
@@ -96,5 +85,5 @@
_value = null;
}
- private String _value;
+ private ValueExpression _value;
}
Modified: incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/SetActionListener.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/SetActionListener.java?view=diff&rev=487429&r1=487428&r2=487429
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/SetActionListener.java (original)
+++ incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/SetActionListener.java Thu Dec 14 18:16:57 2006
@@ -15,9 +15,10 @@
*/
package org.apache.myfaces.trinidadinternal.taglib.listener;
+import javax.el.ValueExpression;
+
import javax.faces.component.StateHolder;
import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
import javax.faces.event.ActionEvent;
import javax.faces.event.ActionListener;
@@ -43,7 +44,7 @@
static public final FacesBean.Type TYPE = new FacesBean.Type();
static public final PropertyKey FROM_KEY =
TYPE.registerKey("from");
- // Must be a ValueBinding
+ // Must be a ValueExpression
static public final PropertyKey TO_KEY =
TYPE.registerKey("to");
@@ -58,23 +59,23 @@
public void processAction(ActionEvent event)
{
- ValueBinding to = getValueBinding(TO_KEY);
+ ValueExpression to = getValueExpression(TO_KEY);
if (to != null)
{
- Object from = getFrom();
+ Object from = getProperty(FROM_KEY);
try
{
- to.setValue(FacesContext.getCurrentInstance(), from);
+ to.setValue(FacesContext.getCurrentInstance().getELContext(), from);
}
catch (RuntimeException e)
{
if (_LOG.isWarning())
{
- ValueBinding fromBinding = getValueBinding(FROM_KEY);
+ ValueExpression fromExpression = getValueExpression(FROM_KEY);
String mes = "Error setting:'"+to.getExpressionString() +
"' to value:"+from;
- if (fromBinding != null)
- mes += " from:'"+fromBinding.getExpressionString()+"'";
+ if (fromExpression != null)
+ mes += " from:'"+fromExpression.getExpressionString()+"'";
_LOG.warning(mes, e);
}
@@ -83,14 +84,20 @@
}
}
- public Object getFrom()
+ public void setFrom(ValueExpression from)
{
- return getProperty(FROM_KEY);
+ if (from.isLiteralText())
+ setProperty(FROM_KEY, from.getValue(null));
+ else
+ setValueExpression(FROM_KEY, from);
}
- public void setFrom(Object from)
+ public void setTo(ValueExpression to)
{
- setProperty(FROM_KEY, from);
+ if (to.isLiteralText())
+ throw new IllegalArgumentException("setActionListener's 'to' must be an EL expression");
+
+ setValueExpression(TO_KEY, to);
}
@Override
Modified: incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/SetActionListenerTag.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/SetActionListenerTag.java?view=diff&rev=487429&r1=487428&r2=487429
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/SetActionListenerTag.java (original)
+++ incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/SetActionListenerTag.java Thu Dec 14 18:16:57 2006
@@ -17,6 +17,8 @@
import org.apache.myfaces.trinidadinternal.taglib.util.TagUtils;
+import javax.el.ValueExpression;
+
import javax.servlet.jsp.tagext.TagSupport;
import javax.servlet.jsp.JspException;
@@ -24,7 +26,7 @@
import javax.faces.component.ActionSource;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import javax.faces.webapp.UIComponentTag;
+import javax.faces.webapp.UIComponentClassicTagBase;
import org.apache.myfaces.trinidad.webapp.ELContextTag;
@@ -37,12 +39,12 @@
*/
public class SetActionListenerTag extends TagSupport
{
- public void setFrom(String from)
+ public void setFrom(ValueExpression from)
{
_from = from;
}
- public void setTo(String to)
+ public void setTo(ValueExpression to)
{
_to = to;
}
@@ -50,7 +52,7 @@
@Override
public int doStartTag() throws JspException
{
- UIComponentTag tag = UIComponentTag.getParentUIComponentTag(pageContext);
+ UIComponentClassicTagBase tag = UIComponentClassicTagBase.getParentUIComponentClassicTagBase(pageContext);
if (tag == null)
{
throw new JspException(
@@ -77,34 +79,13 @@
SetActionListener listener = new SetActionListener();
if (_from != null)
{
- if (TagUtils.isValueReference(_from))
- {
- String from = _from;
- if (parentELContext != null)
- from = parentELContext.transformExpression(from);
-
- listener.setValueBinding(SetActionListener.FROM_KEY,
- application.createValueBinding(from));
- }
- else
- {
- listener.setFrom(_from);
- }
-
- if (TagUtils.isValueReference(_to))
- {
- String to = _to;
- if (parentELContext != null)
- to = parentELContext.transformExpression(to);
-
- listener.setValueBinding(SetActionListener.TO_KEY,
- application.createValueBinding(to));
- }
- else
- {
+ listener.setFrom(_from);
+ if (_to.isLiteralText())
throw new JspException("setActionListener's 'to' attribute must " +
"be an EL expression.");
- }
+
+ if (_to != null)
+ listener.setTo(_to);
}
((ActionSource) component).addActionListener(listener);
@@ -120,6 +101,6 @@
_to = null;
}
- private String _from;
- private String _to;
+ private ValueExpression _from;
+ private ValueExpression _to;
}
Modified: incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/TagUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/TagUtils.java?view=diff&rev=487429&r1=487428&r2=487429
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/TagUtils.java (original)
+++ incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/TagUtils.java Thu Dec 14 18:16:57 2006
@@ -30,7 +30,6 @@
import javax.faces.application.Application;
import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
@@ -50,14 +49,6 @@
{
}
- public static ValueBinding getValueBinding(String valueBindingExpression)
- {
- FacesContext context = FacesContext.getCurrentInstance();
- Application app = context.getApplication();
- ValueBinding vb = app.createValueBinding(valueBindingExpression);
- return vb;
- }
-
public static void assertNotNull(Object object)
{
if (null == object)
@@ -72,9 +63,12 @@
* @return
*/
public static String getString(
- String value)
+ Object value)
{
- return value;
+ if (value == null)
+ return null;
+
+ return value.toString();
}
/**
@@ -83,9 +77,15 @@
* @return
*/
public static boolean getBoolean(
- String value)
+ Object value)
{
- return Boolean.valueOf(value).booleanValue();
+ if (value == null)
+ return false;
+
+ if (value instanceof Boolean)
+ return ((Boolean) value).booleanValue();
+
+ return Boolean.valueOf(value.toString()).booleanValue();
}
/**
@@ -94,9 +94,15 @@
* @return
*/
public static int getInteger(
- String value)
+ Object value)
{
- return Integer.valueOf(value).intValue();
+ if (value == null)
+ return 0;
+
+ if (value instanceof Number)
+ return ((Number) value).intValue();
+
+ return Integer.valueOf(value.toString()).intValue();
}
@@ -106,10 +112,12 @@
* @return
*/
public static long getLong(
- String value)
+ Object value)
{
- return Long.valueOf(value).longValue();
+ if (value == null)
+ return 0;
+ return Long.valueOf(value.toString()).longValue();
}
/**
@@ -118,9 +126,12 @@
* @return
*/
public static double getDouble(
- String value)
+ Object value)
{
- return Double.valueOf(value).doubleValue();
+ if (value == null)
+ return 0;
+
+ return Double.valueOf(value.toString()).doubleValue();
}
@@ -130,10 +141,12 @@
* @return
*/
public static float getFloat(
- String value)
+ Object value)
{
- return Float.valueOf(value).floatValue();
+ if (value == null)
+ return 0;
+ return Float.valueOf(value.toString()).floatValue();
}
/**
@@ -143,9 +156,12 @@
* @return
*/
public static String[] getStringArray(
- String value) throws ParseException
+ Object value) throws ParseException
{
- return _getTokensArray(value);
+ if (value == null)
+ return null;
+
+ return _getTokensArray(value.toString());
}
/**
@@ -154,9 +170,15 @@
* @return
*/
public static Date getDate(
- String value)
+ Object value)
{
- return _parseISODate(value);
+ if (value == null)
+ return null;
+
+ if (value instanceof Date)
+ return ((Date) value);
+
+ return _parseISODate(value.toString());
}
/**
@@ -165,9 +187,15 @@
* @return
*/
public static Locale getLocale(
- String value)
+ Object value)
{
- return _getLocale(value);
+ if (value == null)
+ return null;
+
+ if (value instanceof Locale)
+ return ((Locale) value);
+
+ return _getLocale(value.toString());
}
/**
@@ -176,21 +204,15 @@
* @return
*/
public static TimeZone getTimeZone(
- String value)
+ Object value)
{
- return TimeZone.getTimeZone(value);
- }
+ if (value == null)
+ return null;
- public static boolean isValueReference(String expression)
- {
- if (null != expression)
- {
- int start = expression.indexOf("#{");
- if ((start >= 0) && (expression.indexOf('}', start + 1) >= 0))
- return true;
- }
+ if (value instanceof TimeZone)
+ return ((TimeZone) value);
- return false;
+ return TimeZone.getTimeZone(value.toString());
}
/**
@@ -198,9 +220,13 @@
* java.util.List of java.awt.Color objects and returns it.
* @throws ParseException In case of any parse errors upon such conversion.
*/
- public static List<Color> getColorList(String value) throws ParseException
+ public static List<Color> getColorList(Object value) throws ParseException
{
- String[] tokenArray = _getTokensArray(value);
+ if (value == null)
+ return null;
+
+ String valueStr = value.toString();
+ String[] tokenArray = _getTokensArray(valueStr);
if (tokenArray == null)
return null;
@@ -214,7 +240,7 @@
if (!colorCode.startsWith("#"))
throw new ParseException(
"Color code " + colorCode + " in '" + value + "' does not start with a '#'",
- value.indexOf(colorCode));
+ valueStr.indexOf(colorCode));
//pu: Allow NumberFormatException (RTE) to propogate as is, or transform to JspException ?.
int rgb = Integer.parseInt(colorCode.substring(1), 16);
Modified: incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/VirtualAttributeUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/VirtualAttributeUtils.java?view=diff&rev=487429&r1=487428&r2=487429
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/VirtualAttributeUtils.java (original)
+++ incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/VirtualAttributeUtils.java Thu Dec 14 18:16:57 2006
@@ -15,7 +15,7 @@
*/
package org.apache.myfaces.trinidadinternal.taglib.util;
-import javax.faces.el.ValueBinding;
+import javax.el.ValueExpression;
import org.apache.myfaces.trinidad.bean.PropertyKey;
import org.apache.myfaces.trinidad.bean.FacesBean;
@@ -53,14 +53,14 @@
public static void setAccessKeyAttribute(
FacesBean bean,
- ValueBinding valueBinding,
+ ValueExpression valueExpression,
PropertyKey textKey,
PropertyKey accessKeyKey)
{
- bean.setValueBinding(accessKeyKey,
- new AccessKeyBinding(valueBinding));
- bean.setValueBinding(textKey,
- new StripAccessKeyBinding(valueBinding));
+ bean.setValueExpression(accessKeyKey,
+ new AccessKeyBinding(valueExpression));
+ bean.setValueExpression(textKey,
+ new StripAccessKeyBinding(valueExpression));
}
private VirtualAttributeUtils()
Modified: incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodeFacesBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodeFacesBean.java?view=diff&rev=487429&r1=487428&r2=487429
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodeFacesBean.java (original)
+++ incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodeFacesBean.java Thu Dec 14 18:16:57 2006
@@ -18,7 +18,7 @@
import java.util.HashSet;
import java.util.Set;
-import javax.faces.el.ValueBinding;
+import javax.el.ValueExpression;
import org.apache.myfaces.trinidad.bean.FacesBean;
@@ -167,14 +167,14 @@
AttributeKey attrKey = getAttributeKey(key);
if (attrKey != null)
{
- // We're no longer shadowing a ValueBinding (if one's present);
+ // We're no longer shadowing a ValueExpression (if one's present);
// re-establish that binding, or reset to null
Object attrValue;
- ValueBinding binding = getValueBinding(key);
- if (binding == null)
+ ValueExpression expression = getValueExpression(key);
+ if (expression == null)
attrValue = null;
else
- attrValue = new ValueBindingBoundValue(binding);
+ attrValue = new ValueExpressionBoundValue(expression);
_node.setAttributeValue(attrKey, attrValue);
}
@@ -186,9 +186,9 @@
}
@Override
- protected PropertyMap createBindingsMap()
+ protected PropertyMap createExpressionsMap()
{
- FlaggedPropertyMap bindings = new FlaggedPropertyMap()
+ FlaggedPropertyMap expressions = new FlaggedPropertyMap()
{
@Override
public Object put(PropertyKey key, Object value)
@@ -204,12 +204,12 @@
if (attrKey != null)
{
// If there's no local value, then we're not shadowing;
- // set up a new ValueBindingBoundValue
+ // set up a new ValueExpressionBoundValue
if (getLocalProperty(key) == null)
{
- ValueBinding binding = (ValueBinding) value;
+ ValueExpression expression = (ValueExpression) value;
_node.setAttributeValue(attrKey,
- new ValueBindingBoundValue(binding));
+ new ValueExpressionBoundValue(expression));
}
}
@@ -236,8 +236,7 @@
}
};
- bindings.setUseStateHolder(true);
- return bindings;
+ return expressions;
}
Modified: incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/ConverterBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/ConverterBoundValue.java?view=diff&rev=487429&r1=487428&r2=487429
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/ConverterBoundValue.java (original)
+++ incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/ConverterBoundValue.java Thu Dec 14 18:16:57 2006
@@ -15,9 +15,10 @@
*/
package org.apache.myfaces.trinidadinternal.uinode.bind;
+import javax.el.ValueExpression;
+
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
-import javax.faces.el.ValueBinding;
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.component.UIXComponent;
@@ -52,15 +53,15 @@
Converter converter = (Converter)
bean.getProperty(UIXValue.CONVERTER_KEY);
- // OK, no explicit converter, look at the ValueBinding
+ // OK, no explicit converter, look at the ValueExpression
if (converter == null)
{
- ValueBinding binding = bean.getValueBinding(UIXValue.VALUE_KEY);
- if (binding != null)
+ ValueExpression expression = bean.getValueExpression(UIXValue.VALUE_KEY);
+ if (expression != null)
{
FacesContext fContext = (context == null) ?
FacesContext.getCurrentInstance() : context.getFacesContext();
- Class<?> type = binding.getType(fContext);
+ Class<?> type = expression.getType(fContext.getELContext());
converter = ConverterUtils.createConverter(fContext, type);
}
}
Modified: incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/FacesConfigTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/FacesConfigTest.java?view=diff&rev=487429&r1=487428&r2=487429
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/FacesConfigTest.java (original)
+++ incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/FacesConfigTest.java Thu Dec 14 18:16:57 2006
@@ -26,6 +26,8 @@
/* DISABLE THIS TEST: we cannot redistribute the web-facesconfig_1_1.dtd
without a proper license. Once in MyFaces Apache, we should be
able to refer to the MyFaces copy of the DTD for this test */
+ /* But now in 1.2, we have to disable it again - because we need
+ to use Schema Validation. */
public void testFacesConfigValidity() throws Throwable
{
/*
Modified: incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MApplication.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MApplication.java?view=diff&rev=487429&r1=487428&r2=487429
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MApplication.java (original)
+++ incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MApplication.java Thu Dec 14 18:16:57 2006
@@ -289,7 +289,7 @@
}
@Override
- public Iterator<Class<?>> getConverterTypes()
+ public Iterator<Class> getConverterTypes()
{
throw new UnsupportedOperationException("Should not be called during rendering");
}
Modified: incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MFacesContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MFacesContext.java?view=diff&rev=487429&r1=487428&r2=487429
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MFacesContext.java (original)
+++ incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MFacesContext.java Thu Dec 14 18:16:57 2006
@@ -38,6 +38,7 @@
import javax.faces.render.RenderKit;
import org.apache.myfaces.trinidadinternal.share.config.Configuration;
+import org.apache.myfaces.trinidadbuild.test.MockFacesContext12;
import org.apache.shale.test.mock.MockExternalContext;
import org.apache.shale.test.mock.MockFacesContext;
@@ -45,10 +46,11 @@
* Mock faces context for use with unit tests
* @author Arjuna Wijeyekoon
*/
-public class MFacesContext extends MockFacesContext
+public class MFacesContext extends MockFacesContext12
{
- public MFacesContext(boolean testMode)
+ public MFacesContext(Application application, boolean testMode)
{
+ super(application);
setCurrentInstance(this);
_external = new External(testMode);
}
Modified: incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MValueBinding.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MValueBinding.java?view=diff&rev=487429&r1=487428&r2=487429
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MValueBinding.java (original)
+++ incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MValueBinding.java Thu Dec 14 18:16:57 2006
@@ -41,6 +41,7 @@
Object var = vr.resolveVariable(context, varName);
if (period < 0)
return var;
+
return _resolveProperty(context, var, _expression.substring(period + 1));
}
@@ -55,7 +56,7 @@
PropertyResolver pr = context.getApplication().getPropertyResolver();
var = pr.getValue(var, propertyName);
-
+
if (period < 0)
return var;
return _resolveProperty(context, var, expr.substring(period + 1));
Modified: incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitPerfTestCase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitPerfTestCase.java?view=diff&rev=487429&r1=487428&r2=487429
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitPerfTestCase.java (original)
+++ incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitPerfTestCase.java Thu Dec 14 18:16:57 2006
@@ -122,7 +122,7 @@
// _fileWriter = new java.io.BufferedWriter(new java.io.FileWriter("c:\\tmp\\test.out", true));
//
- _facesContext = new MFacesContext(false);
+ _facesContext = new MFacesContext(MApplication.sharedInstance(), false);
ResponseWriter writer = new XhtmlResponseWriter(
_fileWriter == null ? new NullWriter() : _fileWriter,
XhtmlResponseWriter.XHTML_CONTENT_TYPE,
Modified: incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java?view=diff&rev=487429&r1=487428&r2=487429
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java (original)
+++ incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java Thu Dec 14 18:16:57 2006
@@ -138,7 +138,7 @@
@Override
protected void setUp() throws IOException
{
- _facesContext = new MFacesContext(true);
+ _facesContext = new MFacesContext(MApplication.sharedInstance(), true);
_requestContext = new MRequestContext();
_requestContext.setSkinFamily(_skin);
_requestContext.setAgent(_agent);
Modified: incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/TestResponseWriter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/TestResponseWriter.java?view=diff&rev=487429&r1=487428&r2=487429
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/TestResponseWriter.java (original)
+++ incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/TestResponseWriter.java Thu Dec 14 18:16:57 2006
@@ -554,6 +554,11 @@
// spurious diffs
private String _fixId(String valueStr)
{
+ // All our golden files were produced with "_id" in JSF 1.1;
+ // and now in 1.2, that's "j_id". Eliminate this diff.
+ if (valueStr.indexOf("j_id") >= 0)
+ valueStr = valueStr.replaceAll("j_id", "_id");
+
if (valueStr.indexOf("_id") >= 0)
{
String re = "_id[0-9]+";
Modified: incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/taglib/TLDTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/taglib/TLDTest.java?view=diff&rev=487429&r1=487428&r2=487429
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/taglib/TLDTest.java (original)
+++ incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/taglib/TLDTest.java Thu Dec 14 18:16:57 2006
@@ -29,6 +29,7 @@
public void testAdfFacesCoreValidity() throws Throwable
{
+ /* TODO: use Schema validation
URL dtdSource = getClass().getResource("/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd");
String publicID =
"-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN";
@@ -36,10 +37,12 @@
executeValidityTest(dtdSource,
publicID,
tldSource);
+ */
}
public void testAdfFacesHtmlValidity() throws Throwable
{
+ /* TODO: use Schema validation
URL dtdSource = getClass().getResource("/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd");
String publicID =
"-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN";
@@ -47,5 +50,6 @@
executeValidityTest(dtdSource,
publicID,
tldSource);
+ */
}
}
Modified: incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimal-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimal-golden.xml?view=diff&rev=487429&r1=487428&r2=487429
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimal-golden.xml (original)
+++ incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimal-golden.xml Thu Dec 14 18:16:57 2006
@@ -161,21 +161,21 @@
>
<option
- value="submitForm('formId',1,{source:'mainId:_idXXX:_idXXX'});"
+ value="submitForm('formId',1,{source:'mainId:j_idXXX:j_idXXX'});"
id="uri-attr:mainId:_idXXX:_idXXX"
name="uri-attr:mainId:_idXXX:_idXXX"
>
choice1
</option>
<option
- value="submitForm('formId',1,{source:'mainId:_idXXX:_idXXX'});"
+ value="submitForm('formId',1,{source:'mainId:j_idXXX:j_idXXX'});"
id="uri-attr:mainId:_idXXX:_idXXX"
name="uri-attr:mainId:_idXXX:_idXXX"
>
choice2
</option>
<option
- value="submitForm('formId',1,{source:'mainId:_idXXX:_idXXX'});"
+ value="submitForm('formId',1,{source:'mainId:j_idXXX:j_idXXX'});"
id="uri-attr:mainId:_idXXX:_idXXX"
name="uri-attr:mainId:_idXXX:_idXXX"
>
@@ -189,7 +189,7 @@
</span>
<button
class="af_navigationPane_choice-button"
- onclick="var navLevelSelect = document.getElementById('mainId:_idXXX_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ onclick="var navLevelSelect = document.getElementById('mainId:j_idXXX_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
type="button"
>
Go
@@ -600,22 +600,22 @@
class="AFFieldText"
id="mainId:_idXXX"
name="mainId:_idXXX"
- onchange="_commandChoice('formId','mainId:_idXXX');return false;"
+ onchange="_commandChoice('formId','mainId:j_idXXX');return false;"
>
<option
selected="selected"
- value="mainId:null:0:_idXXX[1]"
+ value="mainId:j_idXXX:0:j_idXXX[1]"
>
First
</option>
<option
- value="mainId:null:1:_idXXX[1]"
+ value="mainId:j_idXXX:1:j_idXXX[1]"
>
Second
</option>
<option
- value="mainId:null:2:_idXXX[1]"
+ value="mainId:j_idXXX:2:j_idXXX[1]"
>
Third
</option>
@@ -639,7 +639,7 @@
<button
accesskey="x"
class="OraLink"
- onclick="_navSubmit('formId', 'goto', 'mainId:_idXXX',1,'1', '1',null);return false"
+ onclick="_navSubmit('formId', 'goto', 'mainId:j_idXXX',1,'1', '1',null);return false"
type="button"
>
Ne
@@ -685,7 +685,7 @@
>
<a
- onclick="submitForm('formId',1,{source:'mainId:_idXXX'});return false;"
+ onclick="submitForm('formId',1,{source:'mainId:j_idXXX'});return false;"
href="uri-attr:encoded-action-url:#"
>
privacy
@@ -696,7 +696,7 @@
>
<a
- onclick="submitForm('formId',1,{source:'mainId:_idXXX'});return false;"
+ onclick="submitForm('formId',1,{source:'mainId:j_idXXX'});return false;"
href="uri-attr:encoded-action-url:#"
>
appAbout
Modified: incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalIE-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalIE-golden.xml?view=diff&rev=487429&r1=487428&r2=487429
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalIE-golden.xml (original)
+++ incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalIE-golden.xml Thu Dec 14 18:16:57 2006
@@ -162,21 +162,21 @@
>
<option
- value="submitForm('formId',1,{source:'mainId:_idXXX:_idXXX'});"
+ value="submitForm('formId',1,{source:'mainId:j_idXXX:j_idXXX'});"
id="uri-attr:mainId:_idXXX:_idXXX"
name="uri-attr:mainId:_idXXX:_idXXX"
>
choice1
</option>
<option
- value="submitForm('formId',1,{source:'mainId:_idXXX:_idXXX'});"
+ value="submitForm('formId',1,{source:'mainId:j_idXXX:j_idXXX'});"
id="uri-attr:mainId:_idXXX:_idXXX"
name="uri-attr:mainId:_idXXX:_idXXX"
>
choice2
</option>
<option
- value="submitForm('formId',1,{source:'mainId:_idXXX:_idXXX'});"
+ value="submitForm('formId',1,{source:'mainId:j_idXXX:j_idXXX'});"
id="uri-attr:mainId:_idXXX:_idXXX"
name="uri-attr:mainId:_idXXX:_idXXX"
>
@@ -190,7 +190,7 @@
</span>
<button
class="af_navigationPane_choice-button"
- onclick="var navLevelSelect = document.getElementById('mainId:_idXXX_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ onclick="var navLevelSelect = document.getElementById('mainId:j_idXXX_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
type="button"
>
Go
@@ -577,22 +577,22 @@
class="AFFieldText"
id="mainId:_idXXX"
name="mainId:_idXXX"
- onchange="_commandChoice('formId','mainId:_idXXX');return false;"
+ onchange="_commandChoice('formId','mainId:j_idXXX');return false;"
>
<option
selected="selected"
- value="mainId:null:0:_idXXX[1]"
+ value="mainId:j_idXXX:0:j_idXXX[1]"
>
First
</option>
<option
- value="mainId:null:1:_idXXX[1]"
+ value="mainId:j_idXXX:1:j_idXXX[1]"
>
Second
</option>
<option
- value="mainId:null:2:_idXXX[1]"
+ value="mainId:j_idXXX:2:j_idXXX[1]"
>
Third
</option>
@@ -612,7 +612,7 @@
<button
accesskey="x"
class="OraLink"
- onclick="_navSubmit('formId', 'goto', 'mainId:_idXXX',1,'1', '1',null);return false"
+ onclick="_navSubmit('formId', 'goto', 'mainId:j_idXXX',1,'1', '1',null);return false"
type="button"
>
Ne
@@ -658,7 +658,7 @@
>
<a
- onclick="submitForm('formId',1,{source:'mainId:_idXXX'});return false;"
+ onclick="submitForm('formId',1,{source:'mainId:j_idXXX'});return false;"
href="uri-attr:encoded-action-url:#"
>
privacy
@@ -669,7 +669,7 @@
>
<a
- onclick="submitForm('formId',1,{source:'mainId:_idXXX'});return false;"
+ onclick="submitForm('formId',1,{source:'mainId:j_idXXX'});return false;"
href="uri-attr:encoded-action-url:#"
>
appAbout
Modified: incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalIERtl-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalIERtl-golden.xml?view=diff&rev=487429&r1=487428&r2=487429
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalIERtl-golden.xml (original)
+++ incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalIERtl-golden.xml Thu Dec 14 18:16:57 2006
@@ -158,7 +158,7 @@
<button
class="af_navigationPane_choice-button"
- onclick="var navLevelSelect = document.getElementById('mainId:_idXXX_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ onclick="var navLevelSelect = document.getElementById('mainId:j_idXXX_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
type="button"
>
Go
@@ -174,21 +174,21 @@
>
<option
- value="submitForm('formId',1,{source:'mainId:_idXXX:_idXXX'});"
+ value="submitForm('formId',1,{source:'mainId:j_idXXX:j_idXXX'});"
id="uri-attr:mainId:_idXXX:_idXXX"
name="uri-attr:mainId:_idXXX:_idXXX"
>
choice1
</option>
<option
- value="submitForm('formId',1,{source:'mainId:_idXXX:_idXXX'});"
+ value="submitForm('formId',1,{source:'mainId:j_idXXX:j_idXXX'});"
id="uri-attr:mainId:_idXXX:_idXXX"
name="uri-attr:mainId:_idXXX:_idXXX"
>
choice2
</option>
<option
- value="submitForm('formId',1,{source:'mainId:_idXXX:_idXXX'});"
+ value="submitForm('formId',1,{source:'mainId:j_idXXX:j_idXXX'});"
id="uri-attr:mainId:_idXXX:_idXXX"
name="uri-attr:mainId:_idXXX:_idXXX"
>
@@ -197,7 +197,7 @@
</select>
<button
class="af_navigationPane_choice-button"
- onclick="var navLevelSelect = document.getElementById('mainId:_idXXX_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ onclick="var navLevelSelect = document.getElementById('mainId:j_idXXX_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
type="button"
>
Go
@@ -589,22 +589,22 @@
class="AFFieldText"
id="mainId:_idXXX"
name="mainId:_idXXX"
- onchange="_commandChoice('formId','mainId:_idXXX');return false;"
+ onchange="_commandChoice('formId','mainId:j_idXXX');return false;"
>
<option
selected="selected"
- value="mainId:null:0:_idXXX[1]"
+ value="mainId:j_idXXX:0:j_idXXX[1]"
>
First
</option>
<option
- value="mainId:null:1:_idXXX[1]"
+ value="mainId:j_idXXX:1:j_idXXX[1]"
>
Second
</option>
<option
- value="mainId:null:2:_idXXX[1]"
+ value="mainId:j_idXXX:2:j_idXXX[1]"
>
Third
</option>
@@ -624,7 +624,7 @@
<button
accesskey="x"
class="OraLink"
- onclick="_navSubmit('formId', 'goto', 'mainId:_idXXX',1,'1', '1',null);return false"
+ onclick="_navSubmit('formId', 'goto', 'mainId:j_idXXX',1,'1', '1',null);return false"
type="button"
>
Ne
@@ -670,7 +670,7 @@
>
<a
- onclick="submitForm('formId',1,{source:'mainId:_idXXX'});return false;"
+ onclick="submitForm('formId',1,{source:'mainId:j_idXXX'});return false;"
href="uri-attr:encoded-action-url:#"
>
privacy
@@ -681,7 +681,7 @@
>
<a
- onclick="submitForm('formId',1,{source:'mainId:_idXXX'});return false;"
+ onclick="submitForm('formId',1,{source:'mainId:j_idXXX'});return false;"
href="uri-attr:encoded-action-url:#"
>
appAbout
Modified: incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalInacc-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalInacc-golden.xml?view=diff&rev=487429&r1=487428&r2=487429
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalInacc-golden.xml (original)
+++ incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalInacc-golden.xml Thu Dec 14 18:16:57 2006
@@ -152,21 +152,21 @@
>
<option
- value="submitForm('formId',1,{source:'mainId:_idXXX:_idXXX'});"
+ value="submitForm('formId',1,{source:'mainId:j_idXXX:j_idXXX'});"
id="uri-attr:mainId:_idXXX:_idXXX"
name="uri-attr:mainId:_idXXX:_idXXX"
>
choice1
</option>
<option
- value="submitForm('formId',1,{source:'mainId:_idXXX:_idXXX'});"
+ value="submitForm('formId',1,{source:'mainId:j_idXXX:j_idXXX'});"
id="uri-attr:mainId:_idXXX:_idXXX"
name="uri-attr:mainId:_idXXX:_idXXX"
>
choice2
</option>
<option
- value="submitForm('formId',1,{source:'mainId:_idXXX:_idXXX'});"
+ value="submitForm('formId',1,{source:'mainId:j_idXXX:j_idXXX'});"
id="uri-attr:mainId:_idXXX:_idXXX"
name="uri-attr:mainId:_idXXX:_idXXX"
>
@@ -180,7 +180,7 @@
</span>
<button
class="af_navigationPane_choice-button"
- onclick="var navLevelSelect = document.getElementById('mainId:_idXXX_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ onclick="var navLevelSelect = document.getElementById('mainId:j_idXXX_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
type="button"
>
Go
@@ -571,22 +571,22 @@
class="AFFieldText"
id="mainId:_idXXX"
name="mainId:_idXXX"
- onchange="_commandChoice('formId','mainId:_idXXX');return false;"
+ onchange="_commandChoice('formId','mainId:j_idXXX');return false;"
>
<option
selected="selected"
- value="mainId:null:0:_idXXX[1]"
+ value="mainId:j_idXXX:0:j_idXXX[1]"
>
First
</option>
<option
- value="mainId:null:1:_idXXX[1]"
+ value="mainId:j_idXXX:1:j_idXXX[1]"
>
Second
</option>
<option
- value="mainId:null:2:_idXXX[1]"
+ value="mainId:j_idXXX:2:j_idXXX[1]"
>
Third
</option>
@@ -609,7 +609,7 @@
<button
accesskey="x"
class="OraLink"
- onclick="_navSubmit('formId', 'goto', 'mainId:_idXXX',1,'1', '1',null);return false"
+ onclick="_navSubmit('formId', 'goto', 'mainId:j_idXXX',1,'1', '1',null);return false"
type="button"
>
Ne
@@ -655,7 +655,7 @@
>
<a
- onclick="submitForm('formId',1,{source:'mainId:_idXXX'});return false;"
+ onclick="submitForm('formId',1,{source:'mainId:j_idXXX'});return false;"
href="uri-attr:encoded-action-url:#"
>
privacy
@@ -666,7 +666,7 @@
>
<a
- onclick="submitForm('formId',1,{source:'mainId:_idXXX'});return false;"
+ onclick="submitForm('formId',1,{source:'mainId:j_idXXX'});return false;"
href="uri-attr:encoded-action-url:#"
>
appAbout
Modified: incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalSaf-golden.xml?view=diff&rev=487429&r1=487428&r2=487429
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalSaf-golden.xml (original)
+++ incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalSaf-golden.xml Thu Dec 14 18:16:57 2006
@@ -161,21 +161,21 @@
>
<option
- value="submitForm('formId',1,{source:'mainId:_idXXX:_idXXX'});"
+ value="submitForm('formId',1,{source:'mainId:j_idXXX:j_idXXX'});"
id="uri-attr:mainId:_idXXX:_idXXX"
name="uri-attr:mainId:_idXXX:_idXXX"
>
choice1
</option>
<option
- value="submitForm('formId',1,{source:'mainId:_idXXX:_idXXX'});"
+ value="submitForm('formId',1,{source:'mainId:j_idXXX:j_idXXX'});"
id="uri-attr:mainId:_idXXX:_idXXX"
name="uri-attr:mainId:_idXXX:_idXXX"
>
choice2
</option>
<option
- value="submitForm('formId',1,{source:'mainId:_idXXX:_idXXX'});"
+ value="submitForm('formId',1,{source:'mainId:j_idXXX:j_idXXX'});"
id="uri-attr:mainId:_idXXX:_idXXX"
name="uri-attr:mainId:_idXXX:_idXXX"
>
@@ -189,7 +189,7 @@
</span>
<button
class="af_navigationPane_choice-button"
- onclick="var navLevelSelect = document.getElementById('mainId:_idXXX_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ onclick="var navLevelSelect = document.getElementById('mainId:j_idXXX_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
type="button"
>
Go
@@ -600,22 +600,22 @@
class="AFFieldText"
id="mainId:_idXXX"
name="mainId:_idXXX"
- onchange="_commandChoice('formId','mainId:_idXXX');return false;"
+ onchange="_commandChoice('formId','mainId:j_idXXX');return false;"
>
<option
selected="selected"
- value="mainId:null:0:_idXXX[1]"
+ value="mainId:j_idXXX:0:j_idXXX[1]"
>
First
</option>
<option
- value="mainId:null:1:_idXXX[1]"
+ value="mainId:j_idXXX:1:j_idXXX[1]"
>
Second
</option>
<option
- value="mainId:null:2:_idXXX[1]"
+ value="mainId:j_idXXX:2:j_idXXX[1]"
>
Third
</option>
@@ -639,7 +639,7 @@
<button
accesskey="x"
class="OraLink"
- onclick="_navSubmit('formId', 'goto', 'mainId:_idXXX',1,'1', '1',null);return false"
+ onclick="_navSubmit('formId', 'goto', 'mainId:j_idXXX',1,'1', '1',null);return false"
type="button"
>
Ne
@@ -685,7 +685,7 @@
>
<a
- onclick="submitForm('formId',1,{source:'mainId:_idXXX'});return false;"
+ onclick="submitForm('formId',1,{source:'mainId:j_idXXX'});return false;"
href="uri-attr:encoded-action-url:#"
>
privacy
@@ -696,7 +696,7 @@
>
<a
- onclick="submitForm('formId',1,{source:'mainId:_idXXX'});return false;"
+ onclick="submitForm('formId',1,{source:'mainId:j_idXXX'});return false;"
href="uri-attr:encoded-action-url:#"
>
appAbout
Modified: incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalScrRdr-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalScrRdr-golden.xml?view=diff&rev=487429&r1=487428&r2=487429
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalScrRdr-golden.xml (original)
+++ incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/page-facets-minimalScrRdr-golden.xml Thu Dec 14 18:16:57 2006
@@ -187,21 +187,21 @@
>
<option
- value="submitForm('formId',1,{source:'mainId:_idXXX:_idXXX'});"
+ value="submitForm('formId',1,{source:'mainId:j_idXXX:j_idXXX'});"
id="uri-attr:mainId:_idXXX:_idXXX"
name="uri-attr:mainId:_idXXX:_idXXX"
>
choice1
</option>
<option
- value="submitForm('formId',1,{source:'mainId:_idXXX:_idXXX'});"
+ value="submitForm('formId',1,{source:'mainId:j_idXXX:j_idXXX'});"
id="uri-attr:mainId:_idXXX:_idXXX"
name="uri-attr:mainId:_idXXX:_idXXX"
>
choice2
</option>
<option
- value="submitForm('formId',1,{source:'mainId:_idXXX:_idXXX'});"
+ value="submitForm('formId',1,{source:'mainId:j_idXXX:j_idXXX'});"
id="uri-attr:mainId:_idXXX:_idXXX"
name="uri-attr:mainId:_idXXX:_idXXX"
>
@@ -215,7 +215,7 @@
</span>
<button
class="af_navigationPane_choice-button"
- onclick="var navLevelSelect = document.getElementById('mainId:_idXXX_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
+ onclick="var navLevelSelect = document.getElementById('mainId:j_idXXX_af_choice_select'); eval(navLevelSelect.options[navLevelSelect.selectedIndex].value); return false;"
type="button"
>
Go
@@ -652,22 +652,22 @@
class="AFFieldText"
id="mainId:_idXXX"
name="mainId:_idXXX"
- onchange="_commandChoice('formId','mainId:_idXXX');return false;"
+ onchange="_commandChoice('formId','mainId:j_idXXX');return false;"
>
<option
selected="selected"
- value="mainId:null:0:_idXXX[1]"
+ value="mainId:j_idXXX:0:j_idXXX[1]"
>
First
</option>
<option
- value="mainId:null:1:_idXXX[1]"
+ value="mainId:j_idXXX:1:j_idXXX[1]"
>
Second
</option>
<option
- value="mainId:null:2:_idXXX[1]"
+ value="mainId:j_idXXX:2:j_idXXX[1]"
>
Third
</option>
@@ -690,7 +690,7 @@
<button
class="OraLink"
- onclick="_navSubmit('formId', 'goto', 'mainId:_idXXX',1,'1', '1',null);return false"
+ onclick="_navSubmit('formId', 'goto', 'mainId:j_idXXX',1,'1', '1',null);return false"
type="button"
>
Next
@@ -731,7 +731,7 @@
>
<a
- onclick="submitForm('formId',1,{source:'mainId:_idXXX'});return false;"
+ onclick="submitForm('formId',1,{source:'mainId:j_idXXX'});return false;"
href="uri-attr:encoded-action-url:#"
>
privacy
@@ -742,7 +742,7 @@
>
<a
- onclick="submitForm('formId',1,{source:'mainId:_idXXX'});return false;"
+ onclick="submitForm('formId',1,{source:'mainId:j_idXXX'});return false;"
href="uri-attr:encoded-action-url:#"
>
appAbout
Modified: incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimal-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimal-golden.xml?view=diff&rev=487429&r1=487428&r2=487429
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimal-golden.xml (original)
+++ incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimal-golden.xml Thu Dec 14 18:16:57 2006
@@ -47,7 +47,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -67,7 +67,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -130,7 +130,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -150,7 +150,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -213,7 +213,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -233,7 +233,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -296,7 +296,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -316,7 +316,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -379,7 +379,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -399,7 +399,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -462,7 +462,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -482,7 +482,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -545,7 +545,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -565,7 +565,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -628,7 +628,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -648,7 +648,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -711,7 +711,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -731,7 +731,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -794,7 +794,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -814,7 +814,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -877,7 +877,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -897,7 +897,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -959,7 +959,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'test-id', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'test-id', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -979,7 +979,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'test-id', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'test-id', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -1042,7 +1042,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -1062,7 +1062,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -1124,7 +1124,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -1144,7 +1144,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -1207,7 +1207,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span
@@ -1227,7 +1227,7 @@
class="af_panelAccordion_title-link"
href="#"
name="_idXXX"
- onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'_idXXX'});return false;"
+ onclick="_submitPartialChange('formId',1, {partialTargets:'mainId', event:'show',source:'j_idXXX'});return false;"
>
<span