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 2017/02/10 03:56:54 UTC
svn commit: r1782426 [2/2] - in /myfaces/core/branches/2.3.x: api/
api/src/main/java/javax/faces/annotation/
api/src/main/java/javax/faces/application/
api/src/main/java/javax/faces/component/
api/src/main/java/javax/faces/component/behavior/ api/src/m...
Copied: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/behavior/FacesBehaviorCDIWrapper.java (from r1781492, myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/validator/FacesValidatorCDIWrapper.java)
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/behavior/FacesBehaviorCDIWrapper.java?p2=myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/behavior/FacesBehaviorCDIWrapper.java&p1=myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/validator/FacesValidatorCDIWrapper.java&r1=1781492&r2=1782426&rev=1782426&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/validator/FacesValidatorCDIWrapper.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/behavior/FacesBehaviorCDIWrapper.java Fri Feb 10 03:56:53 2017
@@ -17,49 +17,48 @@
* under the License.
*/
-package org.apache.myfaces.cdi.validator;
+package org.apache.myfaces.cdi.behavior;
import javax.faces.FacesWrapper;
import javax.faces.component.PartialStateHolder;
-import javax.faces.component.UIComponent;
+import javax.faces.component.behavior.Behavior;
import javax.faces.context.FacesContext;
-import javax.faces.validator.Validator;
-import javax.faces.validator.ValidatorException;
+import javax.faces.event.BehaviorEvent;
import org.apache.myfaces.cdi.util.CDIUtils;
/**
*
*/
-public class FacesValidatorCDIWrapper implements PartialStateHolder, Validator, FacesWrapper<Validator>
+public class FacesBehaviorCDIWrapper implements PartialStateHolder, Behavior, FacesWrapper<Behavior>
{
- private transient Validator delegate;
+ private transient Behavior delegate;
- private String validatorId;
+ private String behaviorId;
private boolean _transient;
- public FacesValidatorCDIWrapper()
+ public FacesBehaviorCDIWrapper()
{
}
- public FacesValidatorCDIWrapper(Class<? extends Validator> validatorClass, String validatorId)
+ public FacesBehaviorCDIWrapper(Class<? extends Behavior> behaviorClass, String behaviorId)
{
- this.validatorId = validatorId;
+ this.behaviorId = behaviorId;
}
-
+
@Override
- public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException
+ public void broadcast(BehaviorEvent event)
{
- getWrapped().validate(context, component, value);
+ getWrapped().broadcast(event);
}
@Override
- public Validator getWrapped()
+ public Behavior getWrapped()
{
if (delegate == null)
{
- delegate = (Validator) CDIUtils.getInstance(CDIUtils.getBeanManager(
+ delegate = (Behavior) CDIUtils.getInstance(CDIUtils.getBeanManager(
FacesContext.getCurrentInstance().getExternalContext()),
- Validator.class, true, new FacesValidatorAnnotationLiteral(validatorId, false, true));
+ Behavior.class, true, new FacesBehaviorAnnotationLiteral(behaviorId, true));
}
return delegate;
}
@@ -70,7 +69,7 @@ public class FacesValidatorCDIWrapper im
if (!initialStateMarked())
{
Object values[] = new Object[1];
- values[0] = validatorId;
+ values[0] = behaviorId;
return values;
}
return null;
@@ -82,7 +81,7 @@ public class FacesValidatorCDIWrapper im
if (state != null)
{
Object values[] = (Object[])state;
- validatorId = (String)values[0];
+ behaviorId = (String)values[0];
}
}
Copied: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/behavior/FacesBehaviorExtension.java (from r1781492, myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/validator/FacesValidatorExtension.java)
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/behavior/FacesBehaviorExtension.java?p2=myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/behavior/FacesBehaviorExtension.java&p1=myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/validator/FacesValidatorExtension.java&r1=1781492&r2=1782426&rev=1782426&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/validator/FacesValidatorExtension.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/behavior/FacesBehaviorExtension.java Fri Feb 10 03:56:53 2017
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.myfaces.cdi.validator;
+package org.apache.myfaces.cdi.behavior;
import java.lang.reflect.Type;
import java.util.HashSet;
@@ -28,31 +28,31 @@ import javax.enterprise.inject.spi.Annot
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.Extension;
import javax.enterprise.inject.spi.ProcessManagedBean;
-import javax.faces.validator.FacesValidator;
+import javax.faces.component.behavior.FacesBehavior;
/**
*
*/
-public class FacesValidatorExtension implements Extension
+public class FacesBehaviorExtension implements Extension
{
- private Set<ValidatorInfo> types = new HashSet<ValidatorInfo>();
+ private Set<BehaviorInfo> types = new HashSet<BehaviorInfo>();
public <T> void collect(@Observes ProcessManagedBean<T> event)
{
- if (event.getAnnotatedBeanClass().isAnnotationPresent(FacesValidator.class))
+ if (event.getAnnotatedBeanClass().isAnnotationPresent(FacesBehavior.class))
{
Annotated annotated = event.getAnnotatedBeanClass();
Type type = annotated.getBaseType();
- FacesValidator conv = (FacesValidator) annotated.getAnnotation(FacesValidator.class);
+ FacesBehavior conv = (FacesBehavior) annotated.getAnnotation(FacesBehavior.class);
if (conv.managed())
{
boolean hasValue = conv.value().length() > 0;
if (hasValue)
{
- types.add(new ValidatorInfo(type, conv.value()));
+ types.add(new BehaviorInfo(type, conv.value()));
}
}
}
@@ -60,9 +60,9 @@ public class FacesValidatorExtension imp
public void afterBean(@Observes AfterBeanDiscovery afterBeanDiscovery, BeanManager beanManager)
{
- for (ValidatorInfo typeInfo : types)
+ for (BehaviorInfo typeInfo : types)
{
- afterBeanDiscovery.addBean(new DynamicValidatorProducer(beanManager, typeInfo));
+ afterBeanDiscovery.addBean(new DynamicBehaviorProducer(beanManager, typeInfo));
}
}
Copied: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/behavior/FacesClientBehaviorCDIWrapper.java (from r1781492, myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/validator/FacesValidatorCDIWrapper.java)
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/behavior/FacesClientBehaviorCDIWrapper.java?p2=myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/behavior/FacesClientBehaviorCDIWrapper.java&p1=myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/validator/FacesValidatorCDIWrapper.java&r1=1781492&r2=1782426&rev=1782426&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/validator/FacesValidatorCDIWrapper.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/behavior/FacesClientBehaviorCDIWrapper.java Fri Feb 10 03:56:53 2017
@@ -17,49 +17,70 @@
* under the License.
*/
-package org.apache.myfaces.cdi.validator;
+package org.apache.myfaces.cdi.behavior;
+import java.util.Set;
import javax.faces.FacesWrapper;
import javax.faces.component.PartialStateHolder;
import javax.faces.component.UIComponent;
+import javax.faces.component.behavior.ClientBehavior;
+import javax.faces.component.behavior.ClientBehaviorContext;
+import javax.faces.component.behavior.ClientBehaviorHint;
import javax.faces.context.FacesContext;
-import javax.faces.validator.Validator;
-import javax.faces.validator.ValidatorException;
+import javax.faces.event.BehaviorEvent;
import org.apache.myfaces.cdi.util.CDIUtils;
/**
*
*/
-public class FacesValidatorCDIWrapper implements PartialStateHolder, Validator, FacesWrapper<Validator>
+public class FacesClientBehaviorCDIWrapper implements PartialStateHolder, ClientBehavior, FacesWrapper<ClientBehavior>
{
- private transient Validator delegate;
+ private transient ClientBehavior delegate;
- private String validatorId;
+ private String behaviorId;
private boolean _transient;
- public FacesValidatorCDIWrapper()
+ public FacesClientBehaviorCDIWrapper()
{
}
- public FacesValidatorCDIWrapper(Class<? extends Validator> validatorClass, String validatorId)
+ public FacesClientBehaviorCDIWrapper(Class<? extends ClientBehavior> behaviorClass, String behaviorId)
{
- this.validatorId = validatorId;
+ this.behaviorId = behaviorId;
+ }
+
+ @Override
+ public void broadcast(BehaviorEvent event)
+ {
+ getWrapped().broadcast(event);
+ }
+
+ @Override
+ public void decode(FacesContext context, UIComponent component)
+ {
+ getWrapped().decode(context, component);
+ }
+
+ @Override
+ public Set<ClientBehaviorHint> getHints()
+ {
+ return getWrapped().getHints();
}
@Override
- public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException
+ public String getScript(ClientBehaviorContext behaviorContext)
{
- getWrapped().validate(context, component, value);
+ return getWrapped().getScript(behaviorContext);
}
@Override
- public Validator getWrapped()
+ public ClientBehavior getWrapped()
{
if (delegate == null)
{
- delegate = (Validator) CDIUtils.getInstance(CDIUtils.getBeanManager(
+ delegate = (ClientBehavior) CDIUtils.getInstance(CDIUtils.getBeanManager(
FacesContext.getCurrentInstance().getExternalContext()),
- Validator.class, true, new FacesValidatorAnnotationLiteral(validatorId, false, true));
+ ClientBehavior.class, true, new FacesBehaviorAnnotationLiteral(behaviorId, true));
}
return delegate;
}
@@ -70,7 +91,7 @@ public class FacesValidatorCDIWrapper im
if (!initialStateMarked())
{
Object values[] = new Object[1];
- values[0] = validatorId;
+ values[0] = behaviorId;
return values;
}
return null;
@@ -82,7 +103,7 @@ public class FacesValidatorCDIWrapper im
if (state != null)
{
Object values[] = (Object[])state;
- validatorId = (String)values[0];
+ behaviorId = (String)values[0];
}
}
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java?rev=1782426&r1=1782425&r2=1782426&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java Fri Feb 10 03:56:53 2017
@@ -102,6 +102,7 @@ public class PartialViewContextImpl exte
private PartialResponseWriter _partialResponseWriter = null;
private VisitContextFactory _visitContextFactory = null;
private Boolean _resetValues = null;
+ private List<String> _evalScripts = new ArrayList<String>();
public PartialViewContextImpl(FacesContext context)
{
@@ -390,6 +391,12 @@ public class PartialViewContextImpl exte
return _partialResponseWriter;
}
+ @Override
+ public List<String> getEvalScripts()
+ {
+ return _evalScripts;
+ }
+
/**
* process the partial response
* allowed phase ids according to the spec
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/push/WebsocketComponentRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/push/WebsocketComponentRenderer.java?rev=1782426&r1=1782425&r2=1782426&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/push/WebsocketComponentRenderer.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/push/WebsocketComponentRenderer.java Fri Feb 10 03:56:53 2017
@@ -192,7 +192,7 @@ public class WebsocketComponentRenderer
sb.append(",");
sb.append("'"+facesContext.getExternalContext().encodeWebsocketURL(
facesContext.getApplication().getViewHandler().getWebsocketURL(
- facesContext, component.getChannel(), (String) component.getValue()))+"'");
+ facesContext, component.getChannel()+"?"+(String) component.getValue()))+"'");
sb.append(",");
sb.append("'"+component.getChannel()+"'");
sb.append(",");
Modified: myfaces/core/branches/2.3.x/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension?rev=1782426&r1=1782425&r2=1782426&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension Fri Feb 10 03:56:53 2017
@@ -10,3 +10,4 @@ org.apache.myfaces.cdi.component.Compone
org.apache.myfaces.cdi.bean.ManagedPropertyExtension
org.apache.myfaces.cdi.converter.FacesConverterExtension
org.apache.myfaces.cdi.validator.FacesValidatorExtension
+org.apache.myfaces.cdi.behavior.FacesBehaviorExtension