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 2008/07/14 19:58:22 UTC
svn commit: r676664 [12/12] - in /myfaces/extensions/validator: branches/
branches/jsf_1.1/ branches/jsf_1.1/core/ branches/jsf_1.1/core/src/
branches/jsf_1.1/core/src/main/ branches/jsf_1.1/core/src/main/config/
branches/jsf_1.1/core/src/main/java/ br...
Added: myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/extractor/DefaultValueBindingScanningAnnotationExtractor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/extractor/DefaultValueBindingScanningAnnotationExtractor.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/extractor/DefaultValueBindingScanningAnnotationExtractor.java (added)
+++ myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/extractor/DefaultValueBindingScanningAnnotationExtractor.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,86 @@
+/*
+ * 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.
+ */
+package org.apache.myfaces.extensions.validator.crossval.annotation.extractor;
+
+import org.apache.myfaces.extensions.validator.core.annotation.AnnotationEntry;
+import org.apache.myfaces.extensions.validator.core.annotation.extractor.DefaultComponentAnnotationExtractor;
+import org.apache.myfaces.extensions.validator.util.ELUtils;
+
+import javax.faces.context.FacesContext;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * to support the usage of vb-xpressions (to reference the target bean)
+ *
+ * @author Gerhard Petracek
+ */
+public class DefaultValueBindingScanningAnnotationExtractor extends DefaultComponentAnnotationExtractor {
+
+ @Override
+ public List<AnnotationEntry> extractAnnotations(FacesContext facesContext, Object object) {
+ //should never occur
+ if (!(object instanceof String)) {
+ return new ArrayList<AnnotationEntry>();
+ }
+
+ String valueBindingExpression = ((String) object).trim();
+
+ List<AnnotationEntry> annotationEntries = new ArrayList<AnnotationEntry>();
+
+ Class entity = ELUtils.getTypeOfValueBindingForExpression(facesContext, valueBindingExpression);
+
+ if (entity != null) {
+ //find and add annotations
+ addPropertyAccessAnnotations(entity, annotationEntries, valueBindingExpression);
+ addFieldAccessAnnotations(entity, annotationEntries, valueBindingExpression);
+ }
+
+ return annotationEntries;
+ }
+
+ protected void addPropertyAccessAnnotations(Class entity, List<AnnotationEntry> annotationEntries, String valueBindingExpression) {
+ AnnotationEntry templateEntry;
+
+ for (Method method : entity.getDeclaredMethods()) {
+ templateEntry = new AnnotationEntry();
+ templateEntry.setEntityClass(entity.getClass());
+ templateEntry.setValueBindingExpression(valueBindingExpression);
+ templateEntry.setBoundTo("[method]:" + method.getName());
+
+ addAnnotationToAnnotationEntries(annotationEntries, Arrays.asList(method.getAnnotations()), templateEntry);
+ }
+ }
+
+ protected void addFieldAccessAnnotations(Class entity, List<AnnotationEntry> annotationEntries, String valueBindingExpression) {
+ AnnotationEntry templateEntry;
+
+ for (Field field : entity.getDeclaredFields()) {
+ templateEntry = new AnnotationEntry();
+ templateEntry.setEntityClass(entity.getClass());
+ templateEntry.setValueBindingExpression(valueBindingExpression);
+ templateEntry.setBoundTo("[field]:" + field.getName());
+
+ addAnnotationToAnnotationEntries(annotationEntries, Arrays.asList(field.getAnnotations()), templateEntry);
+ }
+ }
+}
Added: myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages.properties
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages.properties?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages.properties (added)
+++ myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages.properties Mon Jul 14 10:58:09 2008
@@ -0,0 +1,37 @@
+# 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.
+
+duplicated_content_required=input is different
+duplicated_content_required_details=input is different
+
+duplicated_content_denied=same input isn't allowed
+duplicated_content_denied_details=same input isn't allowed
+
+wrong_date=wrong date
+wrong_date_details=wrong date
+
+wrong_date_not_before=date has to be after {0}
+wrong_date_not_before_details=date has to be after {0}
+
+wrong_date_not_after=date has to be before {0}
+wrong_date_not_after_details=date has to be before {0}
+
+wrong_date_not_equal=date isn't equal to {0}
+wrong_date_not_equal_details=date isn't equal to {0}
+
+empty_field=field is required
+empty_field_details=field is required
\ No newline at end of file
Added: myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/resolver/DefaultValidationErrorMessageResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/resolver/DefaultValidationErrorMessageResolver.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/resolver/DefaultValidationErrorMessageResolver.java (added)
+++ myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/resolver/DefaultValidationErrorMessageResolver.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+package org.apache.myfaces.extensions.validator.crossval.message.resolver;
+
+/**
+ * @author Gerhard Petracek
+ */
+public class DefaultValidationErrorMessageResolver extends org.apache.myfaces.extensions.validator.core.validation.message.resolver.DefaultValidationErrorMessageResolver {
+ private static String BASE_NAME = null;
+
+ @Override
+ protected String getBaseName() {
+ if (BASE_NAME == null) {
+ BASE_NAME = super.getBaseName();
+ }
+
+ return BASE_NAME;
+ }
+}
Added: myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractAliasCompareStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractAliasCompareStrategy.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractAliasCompareStrategy.java (added)
+++ myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractAliasCompareStrategy.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,241 @@
+/*
+ * 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.
+ */
+package org.apache.myfaces.extensions.validator.crossval.referencing.strategy;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.extensions.validator.core.annotation.AnnotationEntry;
+import org.apache.myfaces.extensions.validator.core.annotation.extractor.AnnotationExtractor;
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorage;
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorageEntry;
+import org.apache.myfaces.extensions.validator.crossval.annotation.TargetAlias;
+import org.apache.myfaces.extensions.validator.crossval.annotation.extractor.DefaultValueBindingScanningAnnotationExtractor;
+import org.apache.myfaces.extensions.validator.crossval.strategy.AbstractCompareStrategy;
+import org.apache.myfaces.extensions.validator.util.ELUtils;
+
+import javax.faces.context.FacesContext;
+import java.lang.reflect.Field;
+
+/**
+ * referencing validation targets - possible formats:
+ * "#{[bean_name]}:@[alias_name]" ... cross-entity validation with @TargetAlias
+ * or "@[alias_name]" ... global alias -> additional abstraction - doesn't depend on bean names, property names...
+ * component which is annotated with the @TargetAlias has to be within the same page
+ *
+ * @author Gerhard Petracek
+ */
+public class AbstractAliasCompareStrategy implements ReferencingStrategy {
+ protected final Log logger = LogFactory.getLog(getClass());
+
+ public boolean evalReferenceAndValidate(CrossValidationStorageEntry crossValidationStorageEntry, CrossValidationStorage crossValidationStorage, String validationTarget, AbstractCompareStrategy compareStrategy) {
+ if (validationTarget.startsWith("@")) {
+ tryToValidateWithAlias(crossValidationStorageEntry, crossValidationStorage, validationTarget.substring(1), compareStrategy);
+ return true;
+ } else if (validationTarget.contains(":@*")) {
+ if (validateBindingFormatWithAlias(validationTarget)) {
+ tryToValidateBindingWithAlias(crossValidationStorageEntry, validationTarget, crossValidationStorage, compareStrategy, false);
+ return true;
+ }
+ } else if (validationTarget.contains(":@")) {
+ if (validateBindingFormatWithAlias(validationTarget)) {
+ tryToValidateBindingWithAlias(crossValidationStorageEntry, validationTarget, crossValidationStorage, compareStrategy, true);
+ return true;
+ }
+ }
+ return false;
+ }
+
+ protected void tryToValidateWithAlias(CrossValidationStorageEntry crossValidationStorageEntry, CrossValidationStorage crossValidationStorage, String validationTarget, AbstractCompareStrategy compareStrategy) {
+ boolean validationExecuted = false;
+
+ boolean useModelValue = true;
+ if (validationTarget.startsWith("*")) {
+ useModelValue = false;
+ validationTarget = validationTarget.substring(1);
+ }
+
+ //search for TargetAlias annotations
+ for (CrossValidationStorageEntry entry : crossValidationStorage.getCrossValidationStorageEntries()) {
+
+ if (entry.getAnnotationEntry().getAnnotation() instanceof TargetAlias) {
+ validationExecuted = validateTargetWithAlias(validationTarget, crossValidationStorageEntry, entry, useModelValue, compareStrategy);
+ }
+
+ if (validationExecuted) {
+ break;
+ }
+ }
+ }
+
+ protected boolean tryToValidateBindingWithAlias(CrossValidationStorageEntry crossValidationStorageEntry, String targetProperty, CrossValidationStorage crossValidationStorage, AbstractCompareStrategy compareStrategy, boolean useModelValue) {
+ String[] crossEntityReferenceWithBinding = extractCrossEntityReferenceWithBinding(targetProperty);
+
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+
+ if (!ELUtils.isExpressionValid(facesContext, crossEntityReferenceWithBinding[0])) {
+ return false;
+ }
+
+ AnnotationExtractor extractor = new DefaultValueBindingScanningAnnotationExtractor();
+
+ String alias;
+ AnnotationEntry foundAnnotationEntry = null;
+
+ int aliasStartIndex;
+
+ if (useModelValue) {
+ aliasStartIndex = crossEntityReferenceWithBinding[1].indexOf('@') + 1;
+ } else {
+ aliasStartIndex = crossEntityReferenceWithBinding[1].indexOf('@') + 2;
+ }
+ String targetAliasName = crossEntityReferenceWithBinding[1].substring(aliasStartIndex);
+ for (AnnotationEntry entry : extractor.extractAnnotations(facesContext, crossEntityReferenceWithBinding[0])) {
+ if (entry.getAnnotation() instanceof TargetAlias) {
+ alias = ((TargetAlias) entry.getAnnotation()).value();
+ if (targetAliasName.equals(alias)) {
+ foundAnnotationEntry = entry;
+ break;
+ }
+ }
+ }
+
+ if (foundAnnotationEntry == null) {
+ return false;
+ }
+
+ Object referencedBean = null;
+ Object validationTargetObject = null;
+ if (useModelValue) {
+ referencedBean = ELUtils.getValueOfExpression(facesContext, crossEntityReferenceWithBinding[0]);
+ validationTargetObject = getValidationTargetObject(crossValidationStorageEntry, foundAnnotationEntry, referencedBean, crossValidationStorage);
+ } else {
+ for (CrossValidationStorageEntry entry : crossValidationStorage.getCrossValidationStorageEntries()) {
+ if (foundAnnotationEntry.getAnnotation() instanceof TargetAlias && entry.getAnnotationEntry().getAnnotation() != null && entry.getAnnotationEntry().getAnnotation() instanceof TargetAlias) {
+ if (((TargetAlias) foundAnnotationEntry.getAnnotation()).value().equals(((TargetAlias) entry.getAnnotationEntry().getAnnotation()).value())) {
+ validationTargetObject = entry.getConvertedObject();
+ break;
+ }
+ }
+ }
+ }
+
+ validateFoundEntry(crossValidationStorageEntry, foundAnnotationEntry, referencedBean, crossValidationStorage, validationTargetObject, compareStrategy);
+
+ return true;
+ }
+
+ protected Object getValidationTargetObject(CrossValidationStorageEntry crossValidationStorageEntry, AnnotationEntry foundAnnotationEntry, Object referencedBean, CrossValidationStorage crossValidationStorage) {
+ if (foundAnnotationEntry == null || foundAnnotationEntry.getBoundTo() == null || foundAnnotationEntry.getBoundTo().indexOf(":") < 0) {
+ //TODO logging
+ return null;
+ }
+
+ Object validationTargetObject = null;
+ String boundTo = foundAnnotationEntry.getBoundTo();
+ String name = boundTo.substring(boundTo.indexOf(":") + 1);
+ if (boundTo.startsWith("[method]")) {
+ String baseValueBindingExpression = foundAnnotationEntry.getValueBindingExpression();
+
+ String targetValueBindingExpression = baseValueBindingExpression.substring(0, baseValueBindingExpression.length() - 1) + "." + name + "}";
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+
+ if (ELUtils.isExpressionValid(facesContext, targetValueBindingExpression)) {
+ validationTargetObject = ELUtils.getValueOfExpression(facesContext, targetValueBindingExpression);
+ }
+ } else if (boundTo.startsWith("[field]")) {
+ try {
+ Field foundField;
+ try {
+ foundField = referencedBean.getClass().getDeclaredField(name);
+ foundField.setAccessible(true);
+ validationTargetObject = foundField.get(referencedBean);
+ } catch (NoSuchFieldException e) {
+ foundField = referencedBean.getClass().getDeclaredField("_" + name);
+ foundField.setAccessible(true);
+ validationTargetObject = foundField.get(referencedBean);
+ }
+ } catch (Exception e) {
+ logger.warn("couldn't access field " + name + " details: boundTo=" + boundTo, e);
+ }
+ }
+
+ return validationTargetObject;
+ }
+
+ protected void validateFoundEntry(CrossValidationStorageEntry crossValidationStorageEntry, AnnotationEntry foundAnnotationEntry, Object referencedBean, CrossValidationStorage crossValidationStorage, Object validationTargetObject, AbstractCompareStrategy compareStrategy) {
+ boolean violationFound = false;
+
+ if (compareStrategy.isViolation(crossValidationStorageEntry.getConvertedObject(), validationTargetObject, crossValidationStorageEntry.getAnnotationEntry().getAnnotation())) {
+ compareStrategy.handleTargetViolation(crossValidationStorageEntry, null);
+
+ violationFound = true;
+ }
+
+ if (violationFound) {
+ compareStrategy.processSourceComponentAfterViolation(crossValidationStorageEntry);
+ }
+ }
+
+ //TODO
+ protected boolean validateTargetWithAlias(String validationTarget, CrossValidationStorageEntry crossValidationStorageEntry, CrossValidationStorageEntry entry, boolean useModelValue, AbstractCompareStrategy compareStrategy) {
+ boolean validationExecuted = false;
+ boolean violationFound = false;
+
+ if (validationTarget.equals(((TargetAlias) entry.getAnnotationEntry().getAnnotation()).value())) {
+ //get an object to store all results
+
+ Object validationTargetObject;
+
+ if (useModelValue) {
+ validationTargetObject = ELUtils.getValueOfExpression(FacesContext.getCurrentInstance(), entry.getAnnotationEntry().getValueBindingExpression());
+ } else {
+ validationTargetObject = entry.getConvertedObject();
+ }
+ if (compareStrategy.isViolation(crossValidationStorageEntry.getConvertedObject(), validationTargetObject, crossValidationStorageEntry.getAnnotationEntry().getAnnotation())) {
+ violationFound = true;
+
+ compareStrategy.handleTargetViolation(crossValidationStorageEntry, entry);
+ }
+ validationExecuted = true;
+ }
+
+ if (violationFound) {
+ compareStrategy.processSourceComponentAfterViolation(crossValidationStorageEntry);
+ }
+
+ return validationExecuted;
+ }
+
+ protected boolean validateBindingFormatWithAlias(String targetProperty) {
+ int bindingStartIndex = targetProperty.indexOf("#{");
+ int bindingEndIndex = targetProperty.indexOf("}");
+ int separatorIndex = targetProperty.indexOf(":@");
+
+ return (bindingStartIndex > -1 && bindingEndIndex > -1 && separatorIndex > -1 && bindingStartIndex < bindingEndIndex && bindingEndIndex < separatorIndex);
+ }
+
+ protected String[] extractCrossEntityReferenceWithBinding(String targetProperty) {
+ String[] result = new String[2];
+
+ result[0] = targetProperty.substring(0, targetProperty.indexOf(":"));
+ result[1] = targetProperty.substring(targetProperty.indexOf(":") + 1);
+
+ return result;
+ }
+}
\ No newline at end of file
Added: myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractELCompareStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractELCompareStrategy.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractELCompareStrategy.java (added)
+++ myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractELCompareStrategy.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,94 @@
+/*
+ * 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.
+ */
+package org.apache.myfaces.extensions.validator.crossval.referencing.strategy;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.extensions.validator.core.ProcessedInformationEntry;
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorage;
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorageEntry;
+import org.apache.myfaces.extensions.validator.crossval.strategy.AbstractCompareStrategy;
+import org.apache.myfaces.extensions.validator.util.ELUtils;
+import org.apache.myfaces.extensions.validator.util.ExtValUtils;
+
+import javax.faces.context.FacesContext;
+import java.util.Map;
+
+/**
+ * referencing validation targets - possible formats:
+ * "#{[bean_name].[property_name]}" ... cross-entity validation with value binding
+ *
+ * @author Gerhard Petracek
+ */
+public class AbstractELCompareStrategy implements ReferencingStrategy {
+ protected final Log logger = LogFactory.getLog(getClass());
+
+ public boolean evalReferenceAndValidate(CrossValidationStorageEntry crossValidationStorageEntry, CrossValidationStorage crossValidationStorage, String validationTarget, AbstractCompareStrategy compareStrategy) {
+ if (validationTarget.startsWith("#{") && validationTarget.endsWith("}") && validateValueBindingFormat(validationTarget)) {
+ tryToValidateValueBinding(crossValidationStorageEntry, validationTarget, crossValidationStorage, compareStrategy);
+ return true;
+ }
+ return false;
+ }
+
+ protected boolean tryToValidateValueBinding(CrossValidationStorageEntry crossValidationStorageEntry, String validationTarget, CrossValidationStorage crossValidationStorage, AbstractCompareStrategy compareStrategy) {
+ boolean violationFound = false;
+
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+
+ if (!ELUtils.isExpressionValid(facesContext, validationTarget)) {
+ return false;
+ }
+
+ if (compareStrategy.isViolation(crossValidationStorageEntry.getConvertedObject(), ELUtils.getValueOfExpression(facesContext, validationTarget), crossValidationStorageEntry.getAnnotationEntry().getAnnotation())) {
+
+ ProcessedInformationEntry validationTargetEntry;
+ Map<String, ProcessedInformationEntry> valueBindingConvertedValueMapping = ExtValUtils.getOrInitValueBindingConvertedValueMapping();
+
+ validationTargetEntry = valueBindingConvertedValueMapping.get(validationTarget);
+
+ CrossValidationStorageEntry tmpCrossValidationStorageEntry = null;
+
+ if (validationTargetEntry != null) {
+ tmpCrossValidationStorageEntry = new CrossValidationStorageEntry();
+ tmpCrossValidationStorageEntry.setComponent(validationTargetEntry.getComponent());
+ tmpCrossValidationStorageEntry.setConvertedObject(validationTargetEntry.getConvertedValue());
+ tmpCrossValidationStorageEntry.setValidationStrategy(compareStrategy);
+ }
+
+ compareStrategy.handleTargetViolation(crossValidationStorageEntry, tmpCrossValidationStorageEntry);
+
+ violationFound = true;
+ }
+
+ if (violationFound) {
+ compareStrategy.processSourceComponentAfterViolation(crossValidationStorageEntry);
+ }
+
+ return true;
+ }
+
+ protected boolean validateValueBindingFormat(String targetProperty) {
+ int bindingStartIndex = targetProperty.indexOf("#{");
+ int bindingEndIndex = targetProperty.indexOf("}");
+ int separatorIndex = targetProperty.indexOf(".");
+
+ return (bindingStartIndex > -1 && bindingEndIndex > -1 && separatorIndex > -1 && bindingStartIndex < bindingEndIndex && bindingEndIndex > separatorIndex);
+ }
+}
\ No newline at end of file
Added: myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractLocalCompareStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractLocalCompareStrategy.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractLocalCompareStrategy.java (added)
+++ myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractLocalCompareStrategy.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,97 @@
+/*
+ * 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.
+ */
+package org.apache.myfaces.extensions.validator.crossval.referencing.strategy;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.extensions.validator.core.ProcessedInformationEntry;
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorage;
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorageEntry;
+import org.apache.myfaces.extensions.validator.crossval.strategy.AbstractCompareStrategy;
+import org.apache.myfaces.extensions.validator.util.ELUtils;
+import org.apache.myfaces.extensions.validator.util.ExtValUtils;
+
+import javax.faces.context.FacesContext;
+import java.util.Map;
+
+/**
+ * "[property_name]" ... local validation -> cross-component, but no cross-entity validation
+ *
+ * @author Gerhard Petracek
+ */
+public class AbstractLocalCompareStrategy implements ReferencingStrategy {
+ protected final Log logger = LogFactory.getLog(getClass());
+
+ public boolean evalReferenceAndValidate(CrossValidationStorageEntry crossValidationStorageEntry, CrossValidationStorage crossValidationStorage, String validationTarget, AbstractCompareStrategy compareStrategy) {
+ tryToValidateLocally(crossValidationStorageEntry, validationTarget, compareStrategy);
+
+ //TODO
+ return true;
+ }
+
+ protected void tryToValidateLocally(CrossValidationStorageEntry crossValidationStorageEntry, String validationTarget, AbstractCompareStrategy compareStrategy) {
+ boolean violationFound = false;
+
+ String baseValueBindingExpression = crossValidationStorageEntry.getAnnotationEntry().getValueBindingExpression();
+ baseValueBindingExpression = baseValueBindingExpression.substring(0, baseValueBindingExpression.lastIndexOf("."));
+
+ String targetValueBindingExpression;
+
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+
+ Map<String, ProcessedInformationEntry> valueBindingConvertedValueMapping = ExtValUtils.getOrInitValueBindingConvertedValueMapping();
+ ProcessedInformationEntry validationTargetEntry;
+
+ targetValueBindingExpression = baseValueBindingExpression + "." + validationTarget + "}";
+
+ if (!ELUtils.isExpressionValid(facesContext, targetValueBindingExpression)) {
+ return;
+ }
+
+ if (!valueBindingConvertedValueMapping.containsKey(targetValueBindingExpression)) {
+ return;
+ }
+ validationTargetEntry = compareStrategy.resolveValidationTargetEntry(valueBindingConvertedValueMapping, targetValueBindingExpression, crossValidationStorageEntry.getBean());
+
+ if (validationTargetEntry == null) {
+ logger.warn("couldn't find converted object for " + targetValueBindingExpression);
+ return;
+ }
+
+ if (compareStrategy.isViolation(crossValidationStorageEntry.getConvertedObject(), validationTargetEntry.getConvertedValue(), crossValidationStorageEntry.getAnnotationEntry().getAnnotation())) {
+
+ CrossValidationStorageEntry tmpCrossValidationStorageEntry = new CrossValidationStorageEntry();
+ if (compareStrategy.useTargetComponentToDisplayErrorMsg(crossValidationStorageEntry)) {
+ tmpCrossValidationStorageEntry.setComponent(validationTargetEntry.getComponent());
+ } else {
+ tmpCrossValidationStorageEntry.setComponent(crossValidationStorageEntry.getComponent());
+ }
+ tmpCrossValidationStorageEntry.setConvertedObject(validationTargetEntry.getConvertedValue());
+ tmpCrossValidationStorageEntry.setValidationStrategy(compareStrategy);
+
+ compareStrategy.handleTargetViolation(crossValidationStorageEntry, tmpCrossValidationStorageEntry);
+
+ violationFound = true;
+ }
+
+ if (violationFound) {
+ compareStrategy.processSourceComponentAfterViolation(crossValidationStorageEntry);
+ }
+ }
+}
\ No newline at end of file
Added: myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/ReferencingStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/ReferencingStrategy.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/ReferencingStrategy.java (added)
+++ myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/ReferencingStrategy.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+package org.apache.myfaces.extensions.validator.crossval.referencing.strategy;
+
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorage;
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorageEntry;
+import org.apache.myfaces.extensions.validator.crossval.strategy.AbstractCompareStrategy;
+
+/**
+ * @author Gerhard Petracek
+ */
+public interface ReferencingStrategy {
+ boolean evalReferenceAndValidate(CrossValidationStorageEntry crossValidationStorageEntry, CrossValidationStorage crossValidationStorage, String validationTarget, AbstractCompareStrategy abstractCompareStrategy);
+}
\ No newline at end of file
Added: myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCompareStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCompareStrategy.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCompareStrategy.java (added)
+++ myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCompareStrategy.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,219 @@
+/*
+ * 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.
+ */
+package org.apache.myfaces.extensions.validator.crossval.strategy;
+
+import org.apache.myfaces.extensions.validator.core.ProcessedInformationEntry;
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorage;
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorageEntry;
+import org.apache.myfaces.extensions.validator.crossval.referencing.strategy.AbstractAliasCompareStrategy;
+import org.apache.myfaces.extensions.validator.crossval.referencing.strategy.AbstractELCompareStrategy;
+import org.apache.myfaces.extensions.validator.crossval.referencing.strategy.AbstractLocalCompareStrategy;
+import org.apache.myfaces.extensions.validator.crossval.referencing.strategy.ReferencingStrategy;
+import org.apache.myfaces.extensions.validator.util.ClassUtils;
+import org.apache.myfaces.extensions.validator.util.ExtValUtils;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+import javax.faces.validator.ValidatorException;
+import java.lang.annotation.Annotation;
+import java.util.*;
+
+/**
+ * @author Gerhard Petracek
+ */
+public abstract class AbstractCompareStrategy extends AbstractCrossValidationStrategy {
+ protected static List<ReferencingStrategy> referencingStrategies;
+ protected Map<Object, Object> violationResultStorage = new HashMap<Object, Object>();
+
+ public AbstractCompareStrategy() {
+ initReferencingStrategies();
+ }
+
+ protected void initReferencingStrategies() {
+ if (referencingStrategies == null) {
+ referencingStrategies = new ArrayList<ReferencingStrategy>();
+
+ String customReferencingStrategyClassName = ExtValUtils.getBasePackage() + "ReferencingStrategy";
+ ReferencingStrategy customReferencingStrategy = (ReferencingStrategy) ClassUtils.tryToInstantiateClassForName(customReferencingStrategyClassName);
+
+ if (customReferencingStrategy != null) {
+ referencingStrategies.add(customReferencingStrategy);
+ }
+
+ referencingStrategies.add(new AbstractELCompareStrategy());
+ referencingStrategies.add(new AbstractAliasCompareStrategy());
+ referencingStrategies.add(new AbstractLocalCompareStrategy());
+ }
+ }
+
+ public void processCrossValidation(CrossValidationStorageEntry crossValidationStorageEntry, CrossValidationStorage crossValidationStorage) throws ValidatorException {
+
+ String[] validationTargets = getValidationTargets(crossValidationStorageEntry.getAnnotationEntry().getAnnotation());
+
+ for (String validationTarget : validationTargets) {
+ validationTarget = validationTarget.trim();
+
+ //select validation method
+ tryToValidate(crossValidationStorageEntry, crossValidationStorage, validationTarget);
+ }
+ }
+
+ private boolean tryToValidate(CrossValidationStorageEntry crossValidationStorageEntry, CrossValidationStorage crossValidationStorage, String validationTarget) {
+ for (ReferencingStrategy referencingStrategy : referencingStrategies) {
+ if (referencingStrategy.evalReferenceAndValidate(crossValidationStorageEntry, crossValidationStorage, validationTarget, this)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ //has to be public for custom referencing strategies!!!
+ public void handleTargetViolation(CrossValidationStorageEntry crossValidationStorageEntry, CrossValidationStorageEntry entry) {
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+
+ //get validation error messages for the target component
+ String summary = getErrorMessageSummary(crossValidationStorageEntry.getAnnotationEntry().getAnnotation(), true);
+ String details = getErrorMessageDetails(crossValidationStorageEntry.getAnnotationEntry().getAnnotation(), true);
+
+ //validation target isn't bound to a component withing the current page (see validateFoundEntry, tryToValidateLocally and tryToValidateBindingOnly)
+ if (entry == null) {
+ entry = crossValidationStorageEntry;
+ }
+
+ FacesMessage message;
+ if (entry.getAnnotationEntry() != null) {
+ message = getTargetComponentErrorMessage(entry.getAnnotationEntry().getAnnotation(), summary, details);
+ } else {
+ //TODO document possible side effects
+ //due to a missing target annotation (see: tryToValidateLocally)
+ message = getTargetComponentErrorMessage(crossValidationStorageEntry.getAnnotationEntry().getAnnotation(), summary, details);
+ }
+
+ if (message.getSummary() != null || message.getDetail() != null) {
+ facesContext.addMessage(entry.getComponent().getClientId(facesContext), message);
+ }
+ }
+
+ //has to be public for custom referencing strategies!!!
+ public void processSourceComponentAfterViolation(CrossValidationStorageEntry crossValidationStorageEntry) {
+
+ //get validation error messages for the current component
+ String summary = getErrorMessageSummary(crossValidationStorageEntry.getAnnotationEntry().getAnnotation(), false);
+ String details = getErrorMessageDetails(crossValidationStorageEntry.getAnnotationEntry().getAnnotation(), false);
+
+ FacesMessage message = getSourceComponentErrorMessage(crossValidationStorageEntry.getAnnotationEntry().getAnnotation(), summary, details);
+
+ if (message.getSummary() != null || message.getDetail() != null) {
+ //TODO
+ throw new ValidatorException(message);
+ } else {
+ throw new ValidatorException(new FacesMessage());
+ }
+ }
+
+ //has to be public for custom referencing strategies!!!
+ public FacesMessage getSourceComponentErrorMessage(Annotation annotation, String summary, String details) {
+ FacesMessage message = new FacesMessage();
+
+ message.setSeverity(FacesMessage.SEVERITY_ERROR);
+ message.setSummary(summary);
+ message.setDetail(details);
+
+ return message;
+ }
+
+ //has to be public for custom referencing strategies!!!
+ public FacesMessage getTargetComponentErrorMessage(Annotation foundAnnotation, String summary, String details) {
+ FacesMessage message = new FacesMessage();
+
+ message.setSeverity(FacesMessage.SEVERITY_ERROR);
+ message.setSummary(summary);
+ message.setDetail(details);
+
+ return message;
+ }
+
+ //has to be public for custom referencing strategies!!!
+ public ProcessedInformationEntry resolveValidationTargetEntry(Map<String, ProcessedInformationEntry> valueBindingConvertedValueMapping, String targetValueBinding, Object bean) {
+ ProcessedInformationEntry processedInformationEntry = valueBindingConvertedValueMapping.get(targetValueBinding);
+
+ //simple case
+ if (processedInformationEntry.getFurtherEntries() == null) {
+ return processedInformationEntry;
+ }
+
+ //process complex component entries (e.g. a table)
+ //supported: cross-component but no cross-entity validation (= locale validation)
+ if (processedInformationEntry.getBean().equals(bean)) {
+ return processedInformationEntry;
+ }
+
+ for (ProcessedInformationEntry entry : processedInformationEntry.getFurtherEntries()) {
+ if (entry.getBean().equals(bean)) {
+ return entry;
+ }
+ }
+
+ return null;
+ }
+
+ protected String getErrorMessageSummary(Annotation annotation, boolean isTargetComponent) {
+ return resolveMessage(getValidationErrorMsgKey(annotation, isTargetComponent));
+ }
+
+ protected String getErrorMessageDetails(Annotation annotation, boolean isTargetComponent) {
+ try {
+ String key = getValidationErrorMsgKey(annotation, isTargetComponent);
+ return (key != null) ? resolveMessage(key + DETAIL_MESSAGE_KEY_POSTFIX) : null;
+ } catch (MissingResourceException e) {
+ logger.warn("couldn't find key " + getValidationErrorMsgKey(annotation, isTargetComponent) + DETAIL_MESSAGE_KEY_POSTFIX, e);
+ }
+ return null;
+ }
+
+ protected String getValidationErrorMsgKey(Annotation annotation) {
+ return getValidationErrorMsgKey(annotation, false);
+ }
+
+ /*
+ * recommended methods to override - have to be public for custom referencing strategies!!!
+ */
+
+ /*
+ * abstract methods
+ */
+
+ protected abstract String getValidationErrorMsgKey(Annotation annotation, boolean isTargetComponent);
+
+ public abstract boolean useTargetComponentToDisplayErrorMsg(CrossValidationStorageEntry crossValidationStorageEntry);
+
+ /*
+ * implements the specific validation logic
+ */
+
+ public abstract boolean isViolation(Object object1, Object object2, Annotation annotation);
+
+ /*
+ * returns the referenced validation targets of the annotation
+ * e.g. @DateIs(type = DateIsType.before, value = "finalExam")
+ * -> method returns an array with one value ("finalExam")
+ */
+ public abstract String[] getValidationTargets(Annotation annotation);
+}
\ No newline at end of file
Added: myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCrossValidationStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCrossValidationStrategy.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCrossValidationStrategy.java (added)
+++ myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCrossValidationStrategy.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,54 @@
+/*
+ * 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.
+ */
+package org.apache.myfaces.extensions.validator.crossval.strategy;
+
+import org.apache.myfaces.extensions.validator.core.annotation.AnnotationEntry;
+import org.apache.myfaces.extensions.validator.core.validation.strategy.AbstractValidationStrategy;
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorageEntry;
+import org.apache.myfaces.extensions.validator.util.CrossValidationUtils;
+import org.apache.myfaces.extensions.validator.util.ELUtils;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.validator.ValidatorException;
+
+/**
+ * @author Gerhard Petracek
+ */
+public abstract class AbstractCrossValidationStrategy extends AbstractValidationStrategy implements CrossValidationStrategy {
+
+ //init cross-validation
+ public void processValidation(FacesContext facesContext, UIComponent uiComponent, AnnotationEntry annotationEntry, Object convertedObject) throws ValidatorException {
+ CrossValidationStorageEntry entry = getCrossValidationStorageEntry(facesContext, uiComponent, annotationEntry, convertedObject);
+
+ CrossValidationUtils.getOrInitCrossValidationStorage().add(entry);
+ }
+
+ public CrossValidationStorageEntry getCrossValidationStorageEntry(FacesContext facesContext, UIComponent uiComponent, AnnotationEntry annotationEntry, Object convertedObject) {
+ CrossValidationStorageEntry entry = new CrossValidationStorageEntry();
+
+ entry.setAnnotationEntry(annotationEntry);
+ entry.setBean(ELUtils.getBeanObject(annotationEntry.getValueBindingExpression()));
+ entry.setComponent(uiComponent);
+ entry.setConvertedObject(convertedObject);
+ entry.setValidationStrategy(this);
+
+ return entry;
+ }
+}
Added: myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/CrossValidationStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/CrossValidationStrategy.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/CrossValidationStrategy.java (added)
+++ myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/CrossValidationStrategy.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+package org.apache.myfaces.extensions.validator.crossval.strategy;
+
+import org.apache.myfaces.extensions.validator.core.annotation.AnnotationEntry;
+import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorage;
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorageEntry;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.validator.ValidatorException;
+
+/**
+ * @author Gerhard Petracek
+ */
+public interface CrossValidationStrategy extends ValidationStrategy {
+ CrossValidationStorageEntry getCrossValidationStorageEntry(FacesContext facesContext, UIComponent uiComponent, AnnotationEntry annotationEntry, Object convertedObject);
+
+ void processCrossValidation(CrossValidationStorageEntry crossValidationStorageEntry, CrossValidationStorage crossValidationStorage) throws ValidatorException;
+}
Added: myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/DateIsStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/DateIsStrategy.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/DateIsStrategy.java (added)
+++ myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/DateIsStrategy.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,155 @@
+/*
+ * 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.
+ */
+package org.apache.myfaces.extensions.validator.crossval.strategy;
+
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorageEntry;
+import org.apache.myfaces.extensions.validator.crossval.annotation.DateIs;
+import org.apache.myfaces.extensions.validator.crossval.annotation.DateIsType;
+
+import javax.faces.context.FacesContext;
+import java.lang.annotation.Annotation;
+import java.text.DateFormat;
+import java.util.Date;
+import java.util.MissingResourceException;
+
+/**
+ * @author Gerhard Petracek
+ */
+public class DateIsStrategy extends AbstractCompareStrategy {
+ //TODO
+ protected static final String TOO_EARLY = "early";
+ protected static final String TOO_LATE = "late";
+ protected static final String NOT_EQUAL_DATE_TIME = "not equal";
+ protected static final String RESULT_KEY = "result";
+ protected static final String COMPARED_VALUE_KEY = "target value";
+
+ public boolean useTargetComponentToDisplayErrorMsg(CrossValidationStorageEntry crossValidationStorageEntry) {
+ return true;
+ }
+
+ //TODO
+ public boolean isViolation(Object object1, Object object2, Annotation annotation) {
+ boolean violationFound;
+
+ if (((DateIs) annotation).type().equals(DateIsType.same)) {
+ violationFound = object1 != null && !object1.equals(object2);
+
+ if (violationFound) {
+ this.violationResultStorage.put(RESULT_KEY, NOT_EQUAL_DATE_TIME);
+ }
+ } else if (((DateIs) annotation).type().equals(DateIsType.before)) {
+ violationFound = object1 != null && object2 != null && (!new Date(((Date) object1).getTime()).before((Date) object2) || object1.equals(object2));
+
+ if (violationFound) {
+ this.violationResultStorage.put(RESULT_KEY, TOO_LATE);
+ }
+ } else {
+ violationFound = object1 != null && object2 != null && (!new Date(((Date) object1).getTime()).after((Date) object2) || object1.equals(object2));
+
+ if (violationFound) {
+ this.violationResultStorage.put(RESULT_KEY, TOO_EARLY);
+ }
+ }
+
+ if (violationFound) {
+ this.violationResultStorage.put(COMPARED_VALUE_KEY, object1);
+ }
+
+ return violationFound;
+ }
+
+ public String[] getValidationTargets(Annotation annotation) {
+ return ((DateIs) annotation).valueOf();
+ }
+
+ /*
+ * protected
+ */
+ protected String getValidationErrorMsgKey(Annotation annotation, boolean isTargetComponent) {
+ if (!isTargetComponent) {
+ return null;
+ }
+
+ String result = (String) this.violationResultStorage.get(RESULT_KEY);
+ if (TOO_EARLY.equals(result)) {
+ return getNotAfterErrorMsgKey((DateIs) annotation);
+ } else if (TOO_LATE.equals(result)) {
+ return getNotBeforeErrorMsgKey((DateIs) annotation);
+ } else {
+ return getNotEqualErrorMsgKey((DateIs) annotation);
+ }
+ }
+
+ @Override
+ protected String getErrorMessageSummary(Annotation annotation, boolean isTargetComponent) {
+ if (!isTargetComponent) {
+ return super.getErrorMessageSummary(annotation, isTargetComponent);
+ }
+
+ return getErrorMessage(getValidationErrorMsgKey(annotation, isTargetComponent), annotation, isTargetComponent);
+ }
+
+ @Override
+ protected String getErrorMessageDetails(Annotation annotation, boolean isTargetComponent) {
+ if (!isTargetComponent) {
+ return super.getErrorMessageDetails(annotation, isTargetComponent);
+ }
+
+ try {
+ return getErrorMessage(getValidationErrorMsgKey(annotation, isTargetComponent) + DETAIL_MESSAGE_KEY_POSTFIX, annotation, isTargetComponent);
+ } catch (MissingResourceException e) {
+ logger.warn("couldn't find key " + getValidationErrorMsgKey(annotation, isTargetComponent) + DETAIL_MESSAGE_KEY_POSTFIX, e);
+ }
+ return null;
+ }
+
+ //TODO
+ protected String getErrorMessage(String key, Annotation annotation, boolean isTargetComponent) {
+ String message = resolveMessage(key);
+
+ DateFormat dateFormat = DateFormat.getDateInstance(((DateIs) annotation).errorMessageDateStyle(), FacesContext.getCurrentInstance().getViewRoot().getLocale());
+
+ //replace placeholder with the value of the other component
+ return message.replace("{0}", dateFormat.format((Date) this.violationResultStorage.get(COMPARED_VALUE_KEY)));
+ }
+
+ /*
+ * private
+ */
+ private String getNotAfterErrorMsgKey(DateIs annotation) {
+ if (annotation.validationErrorMsgKey().equals("")) {
+ return annotation.notAfterErrorMsgKey();
+ }
+ return annotation.validationErrorMsgKey();
+ }
+
+ private String getNotBeforeErrorMsgKey(DateIs annotation) {
+ if (annotation.validationErrorMsgKey().equals("")) {
+ return annotation.notBeforeErrorMsgKey();
+ }
+ return annotation.validationErrorMsgKey();
+ }
+
+ private String getNotEqualErrorMsgKey(DateIs annotation) {
+ if (annotation.validationErrorMsgKey().equals("")) {
+ return annotation.notEqualErrorMsgKey();
+ }
+ return annotation.validationErrorMsgKey();
+ }
+}
\ No newline at end of file
Added: myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/EqualsStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/EqualsStrategy.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/EqualsStrategy.java (added)
+++ myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/EqualsStrategy.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+package org.apache.myfaces.extensions.validator.crossval.strategy;
+
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorageEntry;
+import org.apache.myfaces.extensions.validator.crossval.annotation.Equals;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * @author Gerhard Petracek
+ */
+//TODO test custom message bundle
+public class EqualsStrategy extends AbstractCompareStrategy {
+
+ public boolean useTargetComponentToDisplayErrorMsg(CrossValidationStorageEntry crossValidationStorageEntry) {
+ return true;
+ }
+
+ protected String getValidationErrorMsgKey(Annotation annotation, boolean isTargetComponent) {
+ return ((Equals) annotation).validationErrorMsgKey();
+ }
+
+ public boolean isViolation(Object object1, Object object2, Annotation annotation) {
+ return object1 != null && !object1.equals(object2);
+ }
+
+ public String[] getValidationTargets(Annotation annotation) {
+ return ((Equals) annotation).value();
+ }
+}
\ No newline at end of file
Added: myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/NotEqualsStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/NotEqualsStrategy.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/NotEqualsStrategy.java (added)
+++ myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/NotEqualsStrategy.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+package org.apache.myfaces.extensions.validator.crossval.strategy;
+
+import org.apache.myfaces.extensions.validator.crossval.annotation.NotEquals;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * @author Gerhard Petracek
+ */
+public class NotEqualsStrategy extends EqualsStrategy {
+
+ @Override
+ protected String getValidationErrorMsgKey(Annotation annotation, boolean isTargetComponent) {
+ return ((NotEquals) annotation).validationErrorMsgKey();
+ }
+
+ @Override
+ public boolean isViolation(Object object1, Object object2, Annotation annotation) {
+ return !super.isViolation(object1, object2, annotation);
+ }
+
+ @Override
+ public String[] getValidationTargets(Annotation annotation) {
+ return ((NotEquals) annotation).value();
+ }
+}
Added: myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/RequiredIfStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/RequiredIfStrategy.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/RequiredIfStrategy.java (added)
+++ myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/RequiredIfStrategy.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+package org.apache.myfaces.extensions.validator.crossval.strategy;
+
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorageEntry;
+import org.apache.myfaces.extensions.validator.crossval.annotation.RequiredIf;
+import org.apache.myfaces.extensions.validator.crossval.annotation.RequiredIfType;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * @author Gerhard Petracek
+ */
+public class RequiredIfStrategy extends AbstractCompareStrategy {
+
+ public boolean useTargetComponentToDisplayErrorMsg(CrossValidationStorageEntry crossValidationStorageEntry) {
+ return false;
+ }
+
+ protected String getValidationErrorMsgKey(Annotation annotation, boolean isTargetComponent) {
+ return ((RequiredIf) annotation).validationErrorMsgKey();
+ }
+
+ public boolean isViolation(Object object1, Object object2, Annotation annotation) {
+ boolean violationFound = false;
+
+ if (((RequiredIf) annotation).is().equals(RequiredIfType.empty)) {
+ violationFound = (object2 == null || object2.equals("")) && (object1 == null || object1.equals(""));
+ } else if (((RequiredIf) annotation).is().equals(RequiredIfType.not_empty)) {
+ violationFound = (object2 != null && !object2.equals("")) && (object1 == null || object1.equals(""));
+ }
+
+ return violationFound;
+ }
+
+ public String[] getValidationTargets(Annotation annotation) {
+ return ((RequiredIf) annotation).valueOf();
+ }
+}
\ No newline at end of file
Added: myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/TargetAliasStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/TargetAliasStrategy.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/TargetAliasStrategy.java (added)
+++ myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/TargetAliasStrategy.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+package org.apache.myfaces.extensions.validator.crossval.strategy;
+
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorage;
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorageEntry;
+
+import javax.faces.validator.ValidatorException;
+import java.lang.annotation.Annotation;
+
+/**
+ * @author Gerhard Petracek
+ */
+public class TargetAliasStrategy extends AbstractCrossValidationStrategy {
+ public void processCrossValidation(CrossValidationStorageEntry crossValidationStorageEntry, CrossValidationStorage crossValidationStorage) throws ValidatorException {
+ //do nothing - it's just a marker - the inherited functionality is required and enough
+ }
+
+ //TODO
+ protected String getValidationErrorMsgKey(Annotation annotation) {
+ //do nothing - it's just a marker - the inherited functionality is required and enough
+ return null;
+ }
+}
Added: myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/util/CrossValidationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/util/CrossValidationUtils.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/util/CrossValidationUtils.java (added)
+++ myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/util/CrossValidationUtils.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+package org.apache.myfaces.extensions.validator.util;
+
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorage;
+
+import javax.faces.context.FacesContext;
+import java.util.Map;
+
+/**
+ * @author Gerhard Petracek
+ */
+public class CrossValidationUtils {
+ public static final String CROSS_VALIDATION_STORAGE_KEY = CrossValidationStorage.class.getName();
+
+ public static CrossValidationStorage getOrInitCrossValidationStorage() {
+ Map requestMap = FacesContext.getCurrentInstance().getExternalContext().getRequestMap();
+
+ if (!requestMap.containsKey(CROSS_VALIDATION_STORAGE_KEY)) {
+ resetCrossValidationStorage();
+ }
+
+ return (CrossValidationStorage) requestMap.get(CROSS_VALIDATION_STORAGE_KEY);
+ }
+
+ public static void resetCrossValidationStorage() {
+ FacesContext.getCurrentInstance().getExternalContext().getRequestMap().put(CROSS_VALIDATION_STORAGE_KEY, new CrossValidationStorage());
+ }
+}
Added: myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/resources/LICENSE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/resources/LICENSE.txt?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/resources/LICENSE.txt (added)
+++ myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/resources/LICENSE.txt Mon Jul 14 10:58:09 2008
@@ -0,0 +1,174 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
Added: myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/resources/NOTICE.txt?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/resources/NOTICE.txt (added)
+++ myfaces/extensions/validator/trunk/validation-modules/cross-validation/src/main/resources/NOTICE.txt Mon Jul 14 10:58:09 2008
@@ -0,0 +1,9 @@
+Apache MyFaces Extensions Validator
+Copyright 2007-2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+------------------------------------------------------------------------
+See the file LICENSE.txt
+------------------------------------------------------------------------
\ No newline at end of file
Added: myfaces/extensions/validator/trunk/validation-modules/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/pom.xml?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/pom.xml (added)
+++ myfaces/extensions/validator/trunk/validation-modules/pom.xml Mon Jul 14 10:58:09 2008
@@ -0,0 +1,34 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <packaging>pom</packaging>
+
+ <groupId>org.apache.myfaces.extensions.validator.validation-modules</groupId>
+ <artifactId>validation-modules-project</artifactId>
+
+ <name>MyFaces Extensions-Validator Validation-Modules</name>
+ <version>${build.version}</version>
+
+ <parent>
+ <groupId>org.apache.myfaces.extensions.validator</groupId>
+ <artifactId>validator-project</artifactId>
+ <version>${build.version}</version>
+ </parent>
+
+ <modules>
+ <module>base-validation</module>
+ <module>cross-validation</module>
+ </modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.validator</groupId>
+ <artifactId>myfaces-extval-core</artifactId>
+ <version>${build.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+</project>