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 2010/11/19 03:52:30 UTC
svn commit: r1036719 - in
/myfaces/extensions/validator/branches/branch_for_jsf_1_1: ./ assembly/
assembly/src/main/assembly/
component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/
core/src/main/java/...
Author: gpetracek
Date: Fri Nov 19 02:52:29 2010
New Revision: 1036719
URL: http://svn.apache.org/viewvc?rev=1036719&view=rev
Log:
sync trunk and branches
Removed:
myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/
myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/
myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/jpa_strategy_mappings.properties
Modified:
myfaces/extensions/validator/branches/branch_for_jsf_1_1/assembly/pom.xml
myfaces/extensions/validator/branches/branch_for_jsf_1_1/assembly/src/main/assembly/corebin.xml
myfaces/extensions/validator/branches/branch_for_jsf_1_1/assembly/src/main/assembly/coresrc.xml
myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRenderKit.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRendererWrapper.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/WebXmlParameter.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/ELHelper.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/FaceletsTaglibExpressionHelper.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/MetaDataEntry.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapter.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapterImpl.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/BeanValidationStrategyToMetaDataTransformerNameMapper.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/DefaultPropertyInformation.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/PropertyDetails.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractAnnotationValidationStrategy.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/BeanValidationStrategyAdapter.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/BeanValidationStrategyAdapterImpl.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/parent/pom.xml
myfaces/extensions/validator/branches/branch_for_jsf_1_1/pom.xml
myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/pom.xml
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/assembly/pom.xml?rev=1036719&r1=1036718&r2=1036719&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/assembly/pom.xml (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/assembly/pom.xml Fri Nov 19 02:52:29 2010
@@ -170,7 +170,7 @@
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
</exclusion>
- </exclusions>
+ </exclusions>
</dependency>
<dependency>
@@ -183,9 +183,9 @@
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</exclusion>
- </exclusions>
+ </exclusions>
</dependency>
-
+
<dependency>
<groupId>org.apache.myfaces.extensions.validator.component-support-modules</groupId>
<artifactId>myfaces-extval-trinidad-support</artifactId>
@@ -203,7 +203,7 @@
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
</exclusion>
- </exclusions>
+ </exclusions>
</dependency>
</dependencies>
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/assembly/src/main/assembly/corebin.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/assembly/src/main/assembly/corebin.xml?rev=1036719&r1=1036718&r2=1036719&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/assembly/src/main/assembly/corebin.xml (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/assembly/src/main/assembly/corebin.xml Fri Nov 19 02:52:29 2010
@@ -1,3 +1,21 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<assembly>
<id>corebin</id>
<formats>
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/assembly/src/main/assembly/coresrc.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/assembly/src/main/assembly/coresrc.xml?rev=1036719&r1=1036718&r2=1036719&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/assembly/src/main/assembly/coresrc.xml (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/assembly/src/main/assembly/coresrc.xml Fri Nov 19 02:52:29 2010
@@ -1,3 +1,21 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<assembly>
<id>coresrc</id>
<formats>
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRenderKit.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRenderKit.java?rev=1036719&r1=1036718&r2=1036719&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRenderKit.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRenderKit.java Fri Nov 19 02:52:29 2010
@@ -68,7 +68,15 @@ public class ExtValGenericRenderKit exte
}
else
{
- return proxy.invokeSuper(obj, args);
+ try
+ {
+ method.setAccessible(true);
+ return method.invoke(obj, args);
+ }
+ catch (Throwable t)
+ {
+ return proxy.invokeSuper(obj, args);
+ }
}
return null;
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRendererWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRendererWrapper.java?rev=1036719&r1=1036718&r2=1036719&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRendererWrapper.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/ExtValGenericRendererWrapper.java Fri Nov 19 02:52:29 2010
@@ -91,7 +91,15 @@ public final class ExtValGenericRenderer
{
logger.finest("method " + method.getName() + " called without rendering-interceptors");
- return proxy.invokeSuper(obj, args);
+ try
+ {
+ method.setAccessible(true);
+ return method.invoke(this.wrapped, args);
+ }
+ catch (Throwable t)
+ {
+ return proxy.invokeSuper(obj, args);
+ }
}
return null;
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/WebXmlParameter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/WebXmlParameter.java?rev=1036719&r1=1036718&r2=1036719&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/WebXmlParameter.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/WebXmlParameter.java Fri Nov 19 02:52:29 2010
@@ -49,9 +49,6 @@ interface WebXmlParameter
static final String CUSTOM_VALIDATION_PARAMETER_EXTRACTOR = WebXmlUtils
.getInitParameter("CUSTOM_VALIDATION_PARAMETER_EXTRACTOR");
- static final String CUSTOM_VALIDATION_PARAMETER_FACTORY = WebXmlUtils
- .getInitParameter("CUSTOM_VALIDATION_PARAMETER_FACTORY");
-
static final String CUSTOM_STATIC_VALIDATION_STRATEGY_MAPPING = WebXmlUtils
.getInitParameter("CUSTOM_STATIC_VALIDATION_STRATEGY_MAPPING");
@@ -103,6 +100,9 @@ interface WebXmlParameter
static final String CUSTOM_VALIDATION_PARAMETER_EXTRACTOR_FACTORY = WebXmlUtils
.getInitParameter("CUSTOM_VALIDATION_PARAMETER_EXTRACTOR_FACTORY");
+ static final String CUSTOM_VALIDATION_PARAMETER_FACTORY = WebXmlUtils
+ .getInitParameter("CUSTOM_VALIDATION_PARAMETER_FACTORY");
+
static final String CUSTOM_META_DATA_TRANSFORMER_FACTORY = WebXmlUtils
.getInitParameter("CUSTOM_META_DATA_TRANSFORMER_FACTORY");
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/ELHelper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/ELHelper.java?rev=1036719&r1=1036718&r2=1036719&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/ELHelper.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/ELHelper.java Fri Nov 19 02:52:29 2010
@@ -26,7 +26,7 @@ import javax.faces.component.UIComponent
import javax.faces.context.FacesContext;
/**
- * Structure of the object that handles EL here centralized to isolate the jsf version dependency within the core.
+ * Encapulates EL handling to isolate the dependency to the specific jsf version.
*
* @author Gerhard Petracek
* @since 1.x.1
@@ -35,58 +35,66 @@ import javax.faces.context.FacesContext;
public interface ELHelper
{
/**
- * Return the bean instance from the JSF contexts with the specified name.
+ * Resolves the bean instance for the specified name.
+ *
* @param beanName The bean name we are interested in, no EL expression.
* @return instance for the bean name or null.
*/
Object getBean(String beanName);
/**
- * Evaluates the expression equivalent of the ValueBindingExpression parameter and returns the result.
- * @param facesContext The JSF Context
- * @param valueBindingExpression information about expression to evaluate.
- * @return result of the expression equivalent of the ValueBindingExpression parameter
+ * Evaluates the given expression within the current {@link javax.faces.context.FacesContext}
+ *
+ * @param facesContext <code>FacesContext</code> for the current request
+ * @param valueBindingExpression value-binding to evaluate
+ * @return result for the given expression
*/
Object getValueOfExpression(FacesContext facesContext, ValueBindingExpression valueBindingExpression);
/**
- * Returns the type of the expression equivalent of the ValueBindingExpression parameter.
- * @param facesContext The JSF Context
- * @param valueBindingExpression information about expression to evaluate.
- * @return type of the expression equivalent of the ValueBindingExpression parameter
+ * Evaluates the type returned by {@link #getValueOfExpression}
+ *
+ * @param facesContext <code>FacesContext</code> for the current request
+ * @param valueBindingExpression value-binding to evaluate
+ * @return type of the result of the expression
*/
Class getTypeOfExpression(FacesContext facesContext, ValueBindingExpression valueBindingExpression);
/**
- * Extracts the property details (expression, base object and property name) information from the UIComponent's
+ * Extracts the property details (expression, base object and property name) information of the value attribute of
+ * the given {@link javax.faces.component.UIComponent}
* value attribute.
- * @param uiComponent The UIComponent of interest.
- * @return property details information
+ *
+ * @param uiComponent The {@link javax.faces.component.UIComponent} in question
+ * @return property details for the value of the given {@link javax.faces.component.UIComponent}
*/
PropertyDetails getPropertyDetailsOfValueBinding(UIComponent uiComponent);
/**
* Determines if the expression is a valid expression, meaning that the expression can be evaluated without
- * exception.
+ * an exception.
+ *
* @param facesContext The JSF Context
* @param valueBindingExpression The EL expression we want to evaluate.
- * @return valid EL expression ?
+ * @return true if the expression is valid - false otherwise
*/
boolean isELTermValid(FacesContext facesContext, String valueBindingExpression);
/**
- * A very basic check of the EL expression is well formed.
- * @param o Object
- * @return
+ * A very basic check of the EL expression
+ *
+ * @param o Object in question
+ * @return true if the given object is a well formed string - false otherwise
*/
boolean isELTermWellFormed(Object o);
/**
* Gets the value of the attribute specified by the parameter name for the UIComponent.
*
- * @param uiComponent The UIComponent
+ * @param uiComponent The {@link javax.faces.component.UIComponent} in question
* @param name The name of the attribute.
* @return The ValueExpression assigned to the attribute.
*/
+ @Deprecated
Object getBindingOfComponent(UIComponent uiComponent, String name);
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/FaceletsTaglibExpressionHelper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/FaceletsTaglibExpressionHelper.java?rev=1036719&r1=1036718&r2=1036719&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/FaceletsTaglibExpressionHelper.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/el/FaceletsTaglibExpressionHelper.java Fri Nov 19 02:52:29 2010
@@ -70,7 +70,7 @@ class FaceletsTaglibExpressionHelper
}
return vbe;
}
- catch (Throwable t)
+ catch (Exception e)
{
return new ValueBindingExpression(faceletsValueBindingExpression);
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/MetaDataEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/MetaDataEntry.java?rev=1036719&r1=1036718&r2=1036719&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/MetaDataEntry.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/MetaDataEntry.java Fri Nov 19 02:52:29 2010
@@ -180,8 +180,20 @@ public class MetaDataEntry
public int hashCode()
{
int result = key != null ? key.hashCode() : 0;
- result = 31 * result + (value != null ? value.hashCode() : 0);
- result = 31 * result + (properties != null ? properties.hashCode() : 0);
+ result = 31 * result + (value != null ? createNullAwareHashCode(value) : 0);
+ result = 31 * result + (properties != null ? createNullAwareHashCode(properties) : 0);
return result;
}
+
+ private int createNullAwareHashCode(Object o)
+ {
+ try
+ {
+ return o.hashCode();
+ }
+ catch (NullPointerException e)
+ {
+ return 0;
+ }
+ }
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapter.java?rev=1036719&r1=1036718&r2=1036719&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapter.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapter.java Fri Nov 19 02:52:29 2010
@@ -18,6 +18,8 @@
*/
package org.apache.myfaces.extensions.validator.core.metadata.transformer;
+import org.apache.myfaces.extensions.validator.internal.Priority;
+import org.apache.myfaces.extensions.validator.internal.ToDo;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -33,6 +35,7 @@ import org.apache.myfaces.extensions.val
* @author Gerhard Petracek
* @since 1.x.1
*/
+@ToDo(value = Priority.HIGH, description = "see EXTVAL-116")
@UsageInformation({UsageCategory.REUSE})
public interface BeanMetaDataTransformerAdapter extends MetaDataTransformer
{
@@ -41,4 +44,4 @@ public interface BeanMetaDataTransformer
* @return Class name of the MetaDataTransformer
*/
String getMetaDataTransformerClassName();
-}
\ No newline at end of file
+}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapterImpl.java?rev=1036719&r1=1036718&r2=1036719&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapterImpl.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/BeanMetaDataTransformerAdapterImpl.java Fri Nov 19 02:52:29 2010
@@ -18,6 +18,8 @@
*/
package org.apache.myfaces.extensions.validator.core.metadata.transformer;
+import org.apache.myfaces.extensions.validator.internal.Priority;
+import org.apache.myfaces.extensions.validator.internal.ToDo;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
@@ -37,6 +39,7 @@ import java.util.logging.Logger;
* @author Gerhard Petracek
* @since 1.x.1
*/
+@ToDo(value = Priority.HIGH, description = "see EXTVAL-116")
@UsageInformation({UsageCategory.REUSE})
public class BeanMetaDataTransformerAdapterImpl implements MetaDataTransformer, BeanMetaDataTransformerAdapter
{
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/BeanValidationStrategyToMetaDataTransformerNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/BeanValidationStrategyToMetaDataTransformerNameMapper.java?rev=1036719&r1=1036718&r2=1036719&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/BeanValidationStrategyToMetaDataTransformerNameMapper.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/transformer/mapper/BeanValidationStrategyToMetaDataTransformerNameMapper.java Fri Nov 19 02:52:29 2010
@@ -21,6 +21,8 @@ package org.apache.myfaces.extensions.va
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
import org.apache.myfaces.extensions.validator.core.validation.strategy.BeanValidationStrategyAdapter;
import org.apache.myfaces.extensions.validator.core.InvocationOrder;
+import org.apache.myfaces.extensions.validator.internal.Priority;
+import org.apache.myfaces.extensions.validator.internal.ToDo;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -30,6 +32,7 @@ import org.apache.myfaces.extensions.val
* @author Gerhard Petracek
* @since 1.x.1
*/
+@ToDo(value = Priority.HIGH, description = "see EXTVAL-116")
@InvocationOrder(500)
@UsageInformation({UsageCategory.INTERNAL})
public class BeanValidationStrategyToMetaDataTransformerNameMapper extends
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/DefaultPropertyInformation.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/DefaultPropertyInformation.java?rev=1036719&r1=1036718&r2=1036719&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/DefaultPropertyInformation.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/DefaultPropertyInformation.java Fri Nov 19 02:52:29 2010
@@ -109,8 +109,20 @@ public class DefaultPropertyInformation
@Override
public int hashCode()
{
- int result = informationMap.hashCode();
- result = 31 * result + metaDataList.hashCode();
+ int result = createNullAwareHashCode(informationMap);
+ result = 31 * result + createNullAwareHashCode(metaDataList);
return result;
}
+
+ private int createNullAwareHashCode(Object o)
+ {
+ try
+ {
+ return o.hashCode();
+ }
+ catch (NullPointerException e)
+ {
+ return 0;
+ }
+ }
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/PropertyDetails.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/PropertyDetails.java?rev=1036719&r1=1036718&r2=1036719&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/PropertyDetails.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/property/PropertyDetails.java Fri Nov 19 02:52:29 2010
@@ -104,8 +104,20 @@ public class PropertyDetails
public int hashCode()
{
int result = key != null ? key.hashCode() : 0;
- result = 31 * result + (baseObject != null ? baseObject.hashCode() : 0);
+ result = 31 * result + (baseObject != null ? createNullAwareHashCode(baseObject) : 0);
result = 31 * result + (property != null ? property.hashCode() : 0);
return result;
}
+
+ private int createNullAwareHashCode(Object o)
+ {
+ try
+ {
+ return o.hashCode();
+ }
+ catch (NullPointerException e)
+ {
+ return 0;
+ }
+ }
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractAnnotationValidationStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractAnnotationValidationStrategy.java?rev=1036719&r1=1036718&r2=1036719&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractAnnotationValidationStrategy.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractAnnotationValidationStrategy.java Fri Nov 19 02:52:29 2010
@@ -21,6 +21,8 @@ package org.apache.myfaces.extensions.va
import org.apache.myfaces.extensions.validator.core.validation.message.resolver.MessageResolver;
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
import org.apache.myfaces.extensions.validator.core.property.PropertyInformationKeys;
+import org.apache.myfaces.extensions.validator.internal.Priority;
+import org.apache.myfaces.extensions.validator.internal.ToDo;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.util.ExtValUtils;
@@ -35,8 +37,8 @@ import java.util.MissingResourceExceptio
import java.util.logging.Level;
/**
- * Provides the ability of message resolving to ValidationStrategies. This abstract class is a good candidate as parent
- * class of your custom validation strategies.
+ * This class provides an easier handling of violation messages.
+ * This abstract class is a good candidate as super-class for custom validation strategies.
*
* @author Gerhard Petracek
* @since 1.x.1
@@ -49,10 +51,14 @@ public abstract class AbstractAnnotation
private MessageResolver messageResolver;
/**
- * Resolves the key from the error message to get the actual message in the correct language. The language is taken
- * from the viewRoot. When a messageResolver is injected into this object, it is used to resolve the message.
- * Otherwise the default rules are taken to define the messageResolver.
- * {@see org.apache.myfaces.extensions.validator.util.ExtValUtils#getMessageResolverForValidationStrategy(org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy)}
+ * Uses the given message key to resolve the actual message in the correct language.
+ * The current {@link javax.faces.component.UIViewRoot} provides the target locale.
+ * When a {@link org.apache.myfaces.extensions.validator.core.validation.message.resolver.MessageResolver}
+ * is available, it is used to resolve the message.
+ * Otherwise the default rules are taken to define the
+ * {@link org.apache.myfaces.extensions.validator.core.validation.message.resolver.MessageResolver}.
+ * {@link org.apache.myfaces.extensions.validator.util.ExtValUtils#getMessageResolverForValidationStrategy(
+ * org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy)}
*
* @param key key of the error message that needs to be resolved.
* @return Resolved message.
@@ -66,12 +72,14 @@ public abstract class AbstractAnnotation
}
/**
- * Returns the error message for the validation failure associated with the annotation. The message is determined
- * by using the {@see getValidationErrorMsgKey} method for obtaining the key of the message which then is
- * resolved by the method {@see resolveMessage}.
- *
- * @param annotation The annotation associated with the validation Strategy.
- * @return The error message used in the summary part of the FacesMessage.
+ * Returns the error message (the summary) provided by the given constraint. The message is determined
+ * by using the {@link #getValidationErrorMsgKey} method for obtaining the message-/key which then is
+ * resolved by the method {@link #resolveMessage(String) resolveMessage}.
+ *
+ * @param annotation The annotation associated with the
+ * {@link org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy}.
+ * @return The error message used in the summary part of the
+ * {@link javax.faces.application.FacesMessage FacesMessage}.
*/
protected String getErrorMessageSummary(A annotation)
{
@@ -79,15 +87,18 @@ public abstract class AbstractAnnotation
}
/**
- * Returns the error message for the validation failure associated with the annotation the is used in the detail
- * part of the FacesMessage. The message is determined by using the {@see getValidationErrorMsgKey} method for
- * obtaining the key where the suffix '_detail' is added to. Then it is resolved by the method
- * {@see resolveMessage}. When the key isn't found, the resulting exception is just logged but not propagated.
+ * Returns the error message (the detailed message) provided by the given constraint. The message is determined
+ * by using the {@link #getValidationErrorMsgKey} method for obtaining the message-/key which then is
+ * resolved by the method {@link #resolveMessage(String) resolveMessage}.
+ * When the key isn't found, the resulting exception is just logged but not propagated.
* So the detail message isn't required and null is returned instead.
*
- * @param annotation The annotation associated with the validation Strategy.
- * @return The error message used in the detail part of the FacesMessage or null.
+ * @param annotation The annotation associated with the
+ * {@link org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy}.
+ * @return The error message used in the detail part of the
+ * {@link javax.faces.application.FacesMessage FacesMessage} or null.
*/
+ @ToDo(value = Priority.MEDIUM, description = "just log it in case of project stage development")
protected String getErrorMessageDetail(A annotation)
{
try
@@ -104,11 +115,13 @@ public abstract class AbstractAnnotation
}
/**
- * Creates the FacesMessage that can be used to inform the user of a validation error. This method can be called by
- * subclasses in the {@see processValidation} method when a ValidationException is created in response of a
- * violation.
+ * Creates the {@link javax.faces.application.FacesMessage FacesMessage} that
+ * will be used to inform the user of a validation error. This method can be called by
+ * subclasses in the {@link #processValidation(FacesContext, UIComponent, MetaDataEntry, Object) processValidation}
+ * method when a {@link ValidatorException} is thrown.
*
- * @param annotation The annotation associated with the validation Strategy
+ * @param annotation The annotation associated with the
+ * {@link org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy}.
* @return FacesMessage for informing user of the problem.
*/
protected FacesMessage getValidationErrorFacesMessage(A annotation)
@@ -117,18 +130,23 @@ public abstract class AbstractAnnotation
}
/**
- * Determines the key of the message that needs to be resolved in case this ValidationStrategy.
+ * Returns the key for the message that needs to be resolved for the violation-message.
*
- * @param annotation The annotation associated with the validation Strategy.
+ * @param annotation The annotation associated with the
+ * {@link org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy}.
* @return The key of the error message.
*/
protected abstract String getValidationErrorMsgKey(A annotation);
/**
- * Injection point for a messageResolver that needs to be used by this validationStrategy.
+ * Injection point for a
+ * {@link org.apache.myfaces.extensions.validator.core.validation.message.resolver.MessageResolver}
+ * that needs to be used by this
+ * {@link org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy}.
*
* @param messageResolver messageResolver that needs to be used by this validationStrategy.
*/
+ @SuppressWarnings({"UnusedDeclaration"})
public void setMessageResolver(MessageResolver messageResolver)
{
this.messageResolver = messageResolver;
@@ -136,7 +154,8 @@ public abstract class AbstractAnnotation
/**
* {@inheritDoc}
- * Adds the label of the component to the metaDataEntry dataHolder parameter.
+ * Adds the label of the component to the
+ * {@link org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry}.
*/
@Override
protected boolean processAfterValidatorException(FacesContext facesContext,
@@ -158,7 +177,7 @@ public abstract class AbstractAnnotation
* @param uiComponent The JSF component that contained the value entered by the user.
* @param metaDataEntry The data holder which stores the meta-data and some information where the meta-data was
* around.
- * @return The label of the uiComponent field to use in error messages.
+ * @return The label-text of the {@link javax.faces.component.UIComponent} which can be used in the violation msg.
*/
//e.g. for custom annotations - override if needed
protected String getLabel(FacesContext facesContext, UIComponent uiComponent, MetaDataEntry metaDataEntry)
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/BeanValidationStrategyAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/BeanValidationStrategyAdapter.java?rev=1036719&r1=1036718&r2=1036719&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/BeanValidationStrategyAdapter.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/BeanValidationStrategyAdapter.java Fri Nov 19 02:52:29 2010
@@ -18,6 +18,8 @@
*/
package org.apache.myfaces.extensions.validator.core.validation.strategy;
+import org.apache.myfaces.extensions.validator.internal.Priority;
+import org.apache.myfaces.extensions.validator.internal.ToDo;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -33,6 +35,7 @@ import org.apache.myfaces.extensions.val
* @author Gerhard Petracek
* @since 1.x.1
*/
+@ToDo(value = Priority.HIGH, description = "see EXTVAL-116")
@UsageInformation({UsageCategory.REUSE})
public interface BeanValidationStrategyAdapter extends ValidationStrategy
{
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/BeanValidationStrategyAdapterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/BeanValidationStrategyAdapterImpl.java?rev=1036719&r1=1036718&r2=1036719&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/BeanValidationStrategyAdapterImpl.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/BeanValidationStrategyAdapterImpl.java Fri Nov 19 02:52:29 2010
@@ -21,6 +21,8 @@ package org.apache.myfaces.extensions.va
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
import org.apache.myfaces.extensions.validator.core.metadata.transformer.MetaDataTransformer;
import org.apache.myfaces.extensions.validator.core.metadata.transformer.BeanMetaDataTransformerAdapter;
+import org.apache.myfaces.extensions.validator.internal.Priority;
+import org.apache.myfaces.extensions.validator.internal.ToDo;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -40,6 +42,7 @@ import java.util.logging.Logger;
* @author Gerhard Petracek
* @since 1.x.1
*/
+@ToDo(value = Priority.HIGH, description = "see EXTVAL-116")
@UsageInformation({UsageCategory.REUSE})
public class BeanValidationStrategyAdapterImpl implements BeanValidationStrategyAdapter
{
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/parent/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/parent/pom.xml?rev=1036719&r1=1036718&r2=1036719&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/parent/pom.xml (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/parent/pom.xml Fri Nov 19 02:52:29 2010
@@ -234,12 +234,6 @@
</scm>
<distributionManagement>
- <snapshotRepository>
- <uniqueVersion>false</uniqueVersion>
- <id>apache.snapshots</id>
- <name>Apache Maven Snapshot Repository</name>
- <url>scpexe://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
- </snapshotRepository>
<site>
<id>apache-site</id>
<url>scpexe://people.apache.org/www/myfaces.apache.org/extensions/validator11</url>
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/pom.xml?rev=1036719&r1=1036718&r2=1036719&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/pom.xml (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/pom.xml Fri Nov 19 02:52:29 2010
@@ -42,12 +42,6 @@
</scm>
<distributionManagement>
- <snapshotRepository>
- <uniqueVersion>false</uniqueVersion>
- <id>apache.snapshots</id>
- <name>Apache Maven Snapshot Repository</name>
- <url>scpexe://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
- </snapshotRepository>
<site>
<id>apache-site</id>
<url>scpexe://people.apache.org/www/myfaces.apache.org/extensions/validator12</url>
@@ -97,7 +91,7 @@
</build>
</profile>
</profiles>
-
+
<properties>
<jsf.version>1.1.5</jsf.version>
</properties>
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/pom.xml?rev=1036719&r1=1036718&r2=1036719&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/pom.xml (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/pom.xml Fri Nov 19 02:52:29 2010
@@ -109,6 +109,17 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*properties</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<inherited>true</inherited>