You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2009/11/10 22:34:35 UTC
svn commit: r834680 - in /myfaces/core/trunk:
api/src/main/java/javax/faces/component/
api/src/main/java/javax/faces/component/html/
api/src/main/java/javax/faces/context/ api/src/main/java/javax/faces/event/
api/src/main/java/javax/faces/render/ api/s...
Author: lu4242
Date: Tue Nov 10 21:34:34 2009
New Revision: 834680
URL: http://svn.apache.org/viewvc?rev=834680&view=rev
Log:
add/remove code that is not present in 2.0 release, to achieve binary compatibility with ri
Removed:
myfaces/core/trunk/api/src/main/java/javax/faces/event/InitialStateEvent.java
Modified:
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_SelectItemsUtil.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/html/_HtmlOutcomeTargetLink.java
myfaces/core/trunk/api/src/main/java/javax/faces/context/PartialViewContext.java
myfaces/core/trunk/api/src/main/java/javax/faces/event/ExceptionQueuedEventContext.java
myfaces/core/trunk/api/src/main/java/javax/faces/render/RenderKitWrapper.java
myfaces/core/trunk/api/src/main/java/javax/faces/validator/RegexValidator.java
myfaces/core/trunk/api/src/test/java/javax/faces/component/UIInputTest.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/context/ExecutePhaseClientIdsTest.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/context/RenderPhaseClientIdsTest.java
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java?rev=834680&r1=834679&r2=834680&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java Tue Nov 10 21:34:34 2009
@@ -58,7 +58,8 @@
public static final String UPDATE_MESSAGE_ID = "javax.faces.component.UIInput.UPDATE";
private static final String ERROR_HANDLING_EXCEPTION_LIST = "org.apache.myfaces.errorHandling.exceptionList";
- public static final String EMPTY_VALUES_AS_NULL_PARAM_NAME = "javax.faces.INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL";
+ //TODO: Remove this constant
+ //public static final String EMPTY_VALUES_AS_NULL_PARAM_NAME = "javax.faces.INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL";
public static final String VALIDATE_EMPTY_FIELDS_PARAM_NAME = "javax.faces.VALIDATE_EMPTY_FIELDS";
private static final Validator[] EMPTY_VALIDATOR_ARRAY = new Validator[0];
@@ -481,15 +482,15 @@
}
// Begin new JSF 2.0 requirement (INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL)
- String contextParam = context.getExternalContext().getInitParameter(EMPTY_VALUES_AS_NULL_PARAM_NAME);
- if (contextParam != null && contextParam.toLowerCase().equals("true"))
- {
- if (submittedValue.toString().length() == 0)
- {
- setSubmittedValue(null);
- submittedValue = null;
- }
- }
+ // String contextParam = context.getExternalContext().getInitParameter(EMPTY_VALUES_AS_NULL_PARAM_NAME);
+ //if (contextParam != null && contextParam.toLowerCase().equals("true"))
+ //{
+ // if (submittedValue.toString().length() == 0)
+ // {
+ // setSubmittedValue(null);
+ // submittedValue = null;
+ // }
+ //}
// End new JSF 2.0 requirement (INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL)
Object convertedValue = getConvertedValue(context, submittedValue);
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_SelectItemsUtil.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_SelectItemsUtil.java?rev=834680&r1=834679&r2=834680&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_SelectItemsUtil.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_SelectItemsUtil.java Tue Nov 10 21:34:34 2009
@@ -31,7 +31,7 @@
*/
class _SelectItemsUtil
{
- public static interface _ValueConverter
+ static interface _ValueConverter
{
Object getConvertedValue(FacesContext context, String value);
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/html/_HtmlOutcomeTargetLink.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/html/_HtmlOutcomeTargetLink.java?rev=834680&r1=834679&r2=834680&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/html/_HtmlOutcomeTargetLink.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/html/_HtmlOutcomeTargetLink.java Tue Nov 10 21:34:34 2009
@@ -44,11 +44,4 @@
static public final String COMPONENT_TYPE =
"javax.faces.HtmlOutcomeTargetLink";
- /**
- * HTML: the value to put as image attribute
- *
- * @return
- */
- @JSFProperty
- public abstract String getImage();
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/context/PartialViewContext.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/context/PartialViewContext.java?rev=834680&r1=834679&r2=834680&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/context/PartialViewContext.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/context/PartialViewContext.java Tue Nov 10 21:34:34 2009
@@ -31,7 +31,7 @@
public abstract class PartialViewContext
{
public static final String ALL_PARTIAL_PHASE_CLIENT_IDS = "@all";
- public static final String NO_PARTIAL_PHASE_CLIENT_IDS = "@none";
+ //public static final String NO_PARTIAL_PHASE_CLIENT_IDS = "@none";
public static final String PARTIAL_EXECUTE_PARAM_NAME = "javax.faces.partial.execute";
public static final String PARTIAL_RENDER_PARAM_NAME = "javax.faces.partial.render";
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/event/ExceptionQueuedEventContext.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/event/ExceptionQueuedEventContext.java?rev=834680&r1=834679&r2=834680&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/event/ExceptionQueuedEventContext.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/event/ExceptionQueuedEventContext.java Tue Nov 10 21:34:34 2009
@@ -34,8 +34,10 @@
*/
public class ExceptionQueuedEventContext implements SystemEventListenerHolder
{
- public static final String IN_AFTER_PHASE_KEY = "ExceptionQueuedEventContext.IN_AFTER_PHASE_KEY";
- public static final String IN_BEFORE_PHASE_KEY = "ExceptionQueuedEventContext.IN_BEFORE_PHASE_KEY";
+ // TODO: -=Leonardo Uribe=- This type of constants should be the same
+ // for ri and myfaces, to keep binary compatibility and pass TCK test.
+ public static final String IN_AFTER_PHASE_KEY = ExceptionQueuedEventContext.class.getName() + ".IN_AFTER_PHASE";
+ public static final String IN_BEFORE_PHASE_KEY = ExceptionQueuedEventContext.class.getName() + ".IN_BEFORE_PHASE";
private Map<Object, Object> _attributes;
private UIComponent _component;
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/render/RenderKitWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/render/RenderKitWrapper.java?rev=834680&r1=834679&r2=834680&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/render/RenderKitWrapper.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/render/RenderKitWrapper.java Tue Nov 10 21:34:34 2009
@@ -40,52 +40,61 @@
*/
public abstract class RenderKitWrapper extends RenderKit implements FacesWrapper<RenderKit>
{
+ @Override
public void addClientBehaviorRenderer(String type, ClientBehaviorRenderer renderer)
{
getWrapped().addClientBehaviorRenderer(type,renderer);
}
/** {@inheritDoc} */
+ @Override
public void addRenderer(String family, String rendererType, Renderer renderer)
{
getWrapped().addRenderer(family, rendererType, renderer);
}
/** {@inheritDoc} */
+ @Override
public ResponseStream createResponseStream(OutputStream out)
{
return getWrapped().createResponseStream(out);
}
/** {@inheritDoc} */
+ @Override
public ResponseWriter createResponseWriter(Writer writer, String contentTypeList, String characterEncoding)
{
return getWrapped().createResponseWriter(writer, contentTypeList, characterEncoding);
}
- public ClientBehaviorRenderer getClientBenaviorRenderer(String type)
+ @Override
+ public ClientBehaviorRenderer getClientBehaviorRenderer(String type)
{
return getWrapped().getClientBehaviorRenderer(type);
}
+ @Override
public Iterator<String> getClientBehaviorRendererTypes()
{
return getWrapped().getClientBehaviorRendererTypes();
}
/** {@inheritDoc} */
+ @Override
public Renderer getRenderer(String family, String rendererType)
{
return getWrapped().getRenderer(family, rendererType);
}
/** {@inheritDoc} */
+ @Override
public ResponseStateManager getResponseStateManager()
{
return getWrapped().getResponseStateManager();
}
/** {@inheritDoc} */
+ @Override
public abstract RenderKit getWrapped();
/** {@inheritDoc} */
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/validator/RegexValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/validator/RegexValidator.java?rev=834680&r1=834679&r2=834680&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/validator/RegexValidator.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/validator/RegexValidator.java Tue Nov 10 21:34:34 2009
@@ -96,7 +96,8 @@
/**
* This message ID is used when the pattern does not resolve to a String.
*/
- public static final String NOT_STRING_MESSAGE_ID = "javax.faces.validator.RegexValidator.NOT_STRING";
+ //TODO: Remove it
+ //private static final String NOT_STRING_MESSAGE_ID = "javax.faces.validator.RegexValidator.NOT_STRING";
/**
* This message ID is used when the pattern is <code>null</code>, or an empty String.
Modified: myfaces/core/trunk/api/src/test/java/javax/faces/component/UIInputTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/test/java/javax/faces/component/UIInputTest.java?rev=834680&r1=834679&r2=834680&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/javax/faces/component/UIInputTest.java (original)
+++ myfaces/core/trunk/api/src/test/java/javax/faces/component/UIInputTest.java Tue Nov 10 21:34:34 2009
@@ -125,6 +125,7 @@
assertEquals("testValue", updatedValue);
}
+ /*
public void testValidateWithEmptyStringWithEmptyStringAsNullEnabled()
{
try
@@ -143,6 +144,7 @@
facesContext.setExternalContext(externalContext);
}
}
+ */
public void testValidateWithNonEmptyStringWithEmptyStringAsNullEnabled()
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java?rev=834680&r1=834679&r2=834680&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java Tue Nov 10 21:34:34 2009
@@ -147,7 +147,7 @@
PartialViewContext.PARTIAL_EXECUTE_PARAM_NAME);
if (executeMode != null && !"".equals(executeMode) &&
- !PartialViewContext.NO_PARTIAL_PHASE_CLIENT_IDS.equals(executeMode) &&
+ //!PartialViewContext.NO_PARTIAL_PHASE_CLIENT_IDS.equals(executeMode) &&
!PartialViewContext.ALL_PARTIAL_PHASE_CLIENT_IDS.equals(executeMode)) {
String[] clientIds = StringUtils.splitShortString(_replaceTabOrEnterCharactersWithSpaces(executeMode), ' ');
@@ -197,7 +197,7 @@
PartialViewContext.PARTIAL_RENDER_PARAM_NAME);
if (renderMode != null && !"".equals(renderMode) &&
- !PartialViewContext.NO_PARTIAL_PHASE_CLIENT_IDS.equals(renderMode) &&
+ //!PartialViewContext.NO_PARTIAL_PHASE_CLIENT_IDS.equals(renderMode) &&
!PartialViewContext.ALL_PARTIAL_PHASE_CLIENT_IDS.equals(renderMode))
{
String[] clientIds = StringUtils.splitShortString(_replaceTabOrEnterCharactersWithSpaces(renderMode), ' ');
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/context/ExecutePhaseClientIdsTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/context/ExecutePhaseClientIdsTest.java?rev=834680&r1=834679&r2=834680&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/context/ExecutePhaseClientIdsTest.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/context/ExecutePhaseClientIdsTest.java Tue Nov 10 21:34:34 2009
@@ -78,6 +78,7 @@
/**
* NO_PARTIAL_PHASE_CLIENT_IDS as request param, has to result in an empty list
*/
+ /*
public void testRequestParams4() {
Map<String, String> requestParamMap = new HashMap<String, String>();
requestParamMap.put(PartialViewContext.PARTIAL_EXECUTE_PARAM_NAME,
@@ -89,7 +90,7 @@
PartialViewContext pprContext = context.getPartialViewContext();
assertTrue(pprContext.getExecuteIds().isEmpty());
- }
+ }*/
/**
* list with one element has to result in a list with one element
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/context/RenderPhaseClientIdsTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/context/RenderPhaseClientIdsTest.java?rev=834680&r1=834679&r2=834680&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/context/RenderPhaseClientIdsTest.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/context/RenderPhaseClientIdsTest.java Tue Nov 10 21:34:34 2009
@@ -82,6 +82,7 @@
/**
* NO_PARTIAL_PHASE_CLIENT_IDS as request param, has to result in an empty list
*/
+ /*
public void testRequestParams4() {
Map<String, String> requestParamMap = new HashMap<String, String>();
requestParamMap.put(PartialViewContext.PARTIAL_RENDER_PARAM_NAME,
@@ -93,7 +94,7 @@
PartialViewContext pprContext = context.getPartialViewContext();
assertTrue(pprContext.getRenderIds().isEmpty());
- }
+ }*/
/**
* list with one element has to result in a list with one element