You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2014/01/13 10:31:44 UTC
svn commit: r1557672 - in /myfaces/extensions/cdi/trunk:
core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/
jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/
jee-modules/jsf-module/impl/src/main/java/...
Author: gpetracek
Date: Mon Jan 13 09:31:44 2014
New Revision: 1557672
URL: http://svn.apache.org/r1557672
Log:
EXTCDI-313 ee7 support
Modified:
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/AbstractStartupObserver.java
myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableConstraintValidatorFactory.java
myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableMessageInterpolator.java
myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidator.java
myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidatorFactory.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/InvalidValueAwareMessageInterpolator.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/InvalidValueAwareValidatorContext.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/JsfValidatorFactoryProducer.java
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/AbstractStartupObserver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/AbstractStartupObserver.java?rev=1557672&r1=1557671&r2=1557672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/AbstractStartupObserver.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/AbstractStartupObserver.java Mon Jan 13 09:31:44 2014
@@ -22,7 +22,6 @@ import org.apache.myfaces.extensions.cdi
import org.apache.myfaces.extensions.cdi.core.api.config.CodiConfig;
import org.apache.myfaces.extensions.cdi.core.api.config.CodiCoreConfig;
import org.apache.myfaces.extensions.cdi.core.api.config.ConfigEntry;
-import org.apache.myfaces.extensions.cdi.core.api.logging.Logger;
import org.apache.myfaces.extensions.cdi.core.impl.util.ProxyUtils;
import javax.inject.Inject;
@@ -30,14 +29,14 @@ import java.lang.reflect.InvocationTarge
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
+import java.util.logging.Logger;
/**
* Base implementation for startup observers
*/
public abstract class AbstractStartupObserver
{
- @Inject
- protected Logger logger;
+ protected Logger logger = Logger.getLogger(getClass().getName());
@Inject
protected CodiCoreConfig codiCoreConfig;
Modified: myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableConstraintValidatorFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableConstraintValidatorFactory.java?rev=1557672&r1=1557671&r2=1557672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableConstraintValidatorFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableConstraintValidatorFactory.java Mon Jan 13 09:31:44 2014
@@ -18,6 +18,7 @@
*/
package org.apache.myfaces.extensions.cdi.bv.impl;
+import javax.enterprise.inject.Typed;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorFactory;
import java.io.Serializable;
@@ -28,6 +29,7 @@ import static org.apache.myfaces.extensi
* {@link ConstraintValidatorFactory} which can be serialized and adds support for dependency injection in
* {@link ConstraintValidator} instances.
*/
+@Typed()
class InjectableConstraintValidatorFactory implements ConstraintValidatorFactory, Serializable
{
private static final long serialVersionUID = -4851853797257005554L;
Modified: myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableMessageInterpolator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableMessageInterpolator.java?rev=1557672&r1=1557671&r2=1557672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableMessageInterpolator.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableMessageInterpolator.java Mon Jan 13 09:31:44 2014
@@ -18,6 +18,7 @@
*/
package org.apache.myfaces.extensions.cdi.bv.impl;
+import javax.enterprise.inject.Typed;
import javax.validation.MessageInterpolator;
import java.io.Serializable;
import java.util.Locale;
@@ -25,6 +26,7 @@ import java.util.Locale;
/**
* {@link MessageInterpolator} which can be serialized
*/
+@Typed()
class InjectableMessageInterpolator implements MessageInterpolator, Serializable
{
private static final long serialVersionUID = -68329117991255147L;
Modified: myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidator.java?rev=1557672&r1=1557671&r2=1557672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidator.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidator.java Mon Jan 13 09:31:44 2014
@@ -18,6 +18,7 @@
*/
package org.apache.myfaces.extensions.cdi.bv.impl;
+import javax.enterprise.inject.Typed;
import javax.validation.ConstraintViolation;
import javax.validation.Validator;
import javax.validation.metadata.BeanDescriptor;
@@ -27,6 +28,7 @@ import java.util.Set;
/**
* {@link Validator} which can be serialized
*/
+@Typed()
class InjectableValidator implements Validator, Serializable
{
private static final long serialVersionUID = 7925077169313672595L;
Modified: myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidatorFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidatorFactory.java?rev=1557672&r1=1557671&r2=1557672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidatorFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidatorFactory.java Mon Jan 13 09:31:44 2014
@@ -18,6 +18,7 @@
*/
package org.apache.myfaces.extensions.cdi.bv.impl;
+import javax.enterprise.inject.Typed;
import javax.validation.ValidatorFactory;
import javax.validation.Validator;
import javax.validation.ValidatorContext;
@@ -29,6 +30,7 @@ import java.io.Serializable;
/**
* {@link ValidatorFactory} which can be serialized
*/
+@Typed()
class InjectableValidatorFactory implements ValidatorFactory, Serializable
{
private static final long serialVersionUID = 2200415478496396632L;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/InvalidValueAwareMessageInterpolator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/InvalidValueAwareMessageInterpolator.java?rev=1557672&r1=1557671&r2=1557672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/InvalidValueAwareMessageInterpolator.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/InvalidValueAwareMessageInterpolator.java Mon Jan 13 09:31:44 2014
@@ -18,7 +18,6 @@
*/
package org.apache.myfaces.extensions.cdi.jsf.impl.bv;
-import org.apache.myfaces.extensions.cdi.core.api.logging.Logger;
import org.apache.myfaces.extensions.cdi.jsf.api.Jsf;
import org.apache.myfaces.extensions.cdi.message.api.MessageContext;
import org.apache.myfaces.extensions.cdi.message.api.MessageResolver;
@@ -32,6 +31,7 @@ import java.lang.annotation.Annotation;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
+import java.util.logging.Logger;
/**
* Allows to use 'invalidValue' as placeholder in violation messages
@@ -41,15 +41,14 @@ public class InvalidValueAwareMessageInt
{
private static final String INVALID_VALUE_KEY = "invalidValue";
+ private static final Logger LOGGER = Logger.getLogger(InvalidValueAwareMessageInterpolator.class.getName());
+
private MessageInterpolator wrapped;
@Inject
@Jsf
private MessageContext messageContext;
- @Inject
- private Logger logger;
-
protected InvalidValueAwareMessageInterpolator()
{
}
@@ -134,7 +133,7 @@ public class InvalidValueAwareMessageInt
String warnMessage = constraintName + " uses 'invalidValue' as custom constraint attribute." +
"So it isn't possible to use it as implicit key in the violation message.";
- this.logger.warning(warnMessage);
+ LOGGER.warning(warnMessage);
}
private Map<String, Serializable> getCustomAttributesOfConstraint(Map<String, Object> attributesOfConstraint)
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/InvalidValueAwareValidatorContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/InvalidValueAwareValidatorContext.java?rev=1557672&r1=1557671&r2=1557672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/InvalidValueAwareValidatorContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/InvalidValueAwareValidatorContext.java Mon Jan 13 09:31:44 2014
@@ -21,6 +21,7 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils;
import org.apache.myfaces.extensions.cdi.jsf.impl.bv.InvalidValueAwareMessageInterpolator;
+import javax.enterprise.inject.Typed;
import javax.validation.MessageInterpolator;
import javax.validation.ValidatorContext;
import javax.validation.TraversableResolver;
@@ -32,6 +33,7 @@ import javax.validation.Validator;
* {@link ValidatorContext} which allows to use 'invalidValue' as placeholder in violation messages
*/
//TODO move to a different package
+@Typed()
class InvalidValueAwareValidatorContext implements ValidatorContext
{
private ValidatorContext wrapped;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/JsfValidatorFactoryProducer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/JsfValidatorFactoryProducer.java?rev=1557672&r1=1557671&r2=1557672&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/JsfValidatorFactoryProducer.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/JsfValidatorFactoryProducer.java Mon Jan 13 09:31:44 2014
@@ -18,6 +18,7 @@
*/
package org.apache.myfaces.extensions.cdi.jsf.impl.bv.resolver;
+import org.apache.myfaces.extensions.cdi.core.api.Advanced;
import org.apache.myfaces.extensions.cdi.jsf.api.config.JsfModuleConfig;
import javax.enterprise.context.ApplicationScoped;
@@ -46,6 +47,7 @@ public class JsfValidatorFactoryProducer
@Produces
@Dependent
+ @Advanced
@Named(BEAN_VALIDATION_VALIDATOR_FACTORY)
public ValidatorFactory createValidatorFactory(JsfModuleConfig jsfModuleConfig)
{