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/06/23 01:04:21 UTC
svn commit: r957073 [3/3] - in
/myfaces/extensions/validator/branches/branch_for_extval-100:
component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/
component-support/trinidad-support/src/main/java/org...
Added: myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/ExtValBaseValidationModuleConfiguration.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/ExtValBaseValidationModuleConfiguration.java?rev=957073&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/ExtValBaseValidationModuleConfiguration.java (added)
+++ myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/ExtValBaseValidationModuleConfiguration.java Tue Jun 22 23:04:19 2010
@@ -0,0 +1,57 @@
+/*
+ * 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.baseval;
+
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
+import org.apache.myfaces.extensions.validator.core.ExtValModuleConfiguration;
+import org.apache.myfaces.extensions.validator.internal.UsageInformation;
+import org.apache.myfaces.extensions.validator.internal.UsageCategory;
+
+/**
+ * @author Gerhard Petracek
+ * @since r4
+ */
+@UsageInformation(UsageCategory.INTERNAL)
+public abstract class ExtValBaseValidationModuleConfiguration implements ExtValModuleConfiguration
+{
+ private static ExtValContext extValContext = ExtValContext.getContext();
+
+ protected ExtValBaseValidationModuleConfiguration()
+ {
+ }
+
+ public static ExtValBaseValidationModuleConfiguration get()
+ {
+ return extValContext.getModuleConfiguration(ExtValBaseValidationModuleConfiguration.class);
+ }
+
+ public static boolean use(ExtValBaseValidationModuleConfiguration config, boolean forceOverride)
+ {
+ return extValContext.addModuleConfiguration(
+ ExtValBaseValidationModuleConfiguration.class, config, forceOverride);
+ }
+
+ /*
+ * web.xml config
+ */
+
+ public abstract String jpaValidationErrorMessages();
+
+ public abstract boolean deactivateJpaBasedValidation();
+}
Modified: myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/WebXmlParameter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/WebXmlParameter.java?rev=957073&r1=957072&r2=957073&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/WebXmlParameter.java (original)
+++ myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/WebXmlParameter.java Tue Jun 22 23:04:19 2010
@@ -32,10 +32,10 @@ import org.apache.myfaces.extensions.val
*/
@ToDo(value = Priority.MEDIUM, description = "documentation")
@UsageInformation(UsageCategory.INTERNAL)
-public interface WebXmlParameter
+interface WebXmlParameter
{
static final String VALIDATION_MESSAGES_JPA = WebXmlUtils
.getInitParameter("JPA_VALIDATION_ERROR_MESSAGES");
static final String DEACTIVATE_JPA_BASED_VALIDATION = WebXmlUtils
.getInitParameter("DEACTIVATE_JPA_BASED_VALIDATION");
-}
\ No newline at end of file
+}
Modified: myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java?rev=957073&r1=957072&r2=957073&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java (original)
+++ myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java Tue Jun 22 23:04:19 2010
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.extensions.validator.baseval.message.resolver;
-import org.apache.myfaces.extensions.validator.baseval.WebXmlParameter;
+import org.apache.myfaces.extensions.validator.baseval.ExtValBaseValidationModuleConfiguration;
import org.apache.myfaces.extensions.validator.core.validation.message.resolver.AbstractValidationErrorMessageResolver;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -37,7 +37,9 @@ public class JpaValidationErrorMessageRe
{
public static final String JPA_VALIDATION_ERROR_MESSAGES = "JPA_VALIDATION_ERROR_MESSAGES";
- private static final String CUSTOM_BASE_NAME = WebXmlParameter.VALIDATION_MESSAGES_JPA;
+ private static final String CUSTOM_BASE_NAME =
+ ExtValBaseValidationModuleConfiguration.get().jpaValidationErrorMessages();
+
private static final String BASE_NAME = JpaValidationErrorMessageResolver.class
.getPackage().getName().replace(".message.resolver", ".message.bundle")+ ".jpa_messages";
@@ -56,4 +58,4 @@ public class JpaValidationErrorMessageRe
return BASE_NAME;
}
-}
\ No newline at end of file
+}
Modified: myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java?rev=957073&r1=957072&r2=957073&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java (original)
+++ myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java Tue Jun 22 23:04:19 2010
@@ -151,8 +151,7 @@ public class CrossValidationPhaseListene
{
if (!isInitialized)
{
- if (WebXmlParameter.DEACTIVATE_CROSSVALIDATION != null
- && WebXmlParameter.DEACTIVATE_CROSSVALIDATION.equalsIgnoreCase("true"))
+ if (ExtValCrossValidationModuleConfiguration.get().deactivateCrossvalidation())
{
JsfUtils.deregisterPhaseListener(this);
}
Added: myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/DefaultExtValCrossValidationModuleConfiguration.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/DefaultExtValCrossValidationModuleConfiguration.java?rev=957073&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/DefaultExtValCrossValidationModuleConfiguration.java (added)
+++ myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/DefaultExtValCrossValidationModuleConfiguration.java Tue Jun 22 23:04:19 2010
@@ -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;
+
+import org.apache.myfaces.extensions.validator.internal.UsageInformation;
+import org.apache.myfaces.extensions.validator.internal.UsageCategory;
+
+/**
+ * @author Gerhard Petracek
+ * @since r4
+ */
+@UsageInformation(UsageCategory.INTERNAL)
+public class DefaultExtValCrossValidationModuleConfiguration extends ExtValCrossValidationModuleConfiguration
+{
+ public boolean deactivateCrossvalidation()
+ {
+ return "true".equalsIgnoreCase(WebXmlParameter.DEACTIVATE_CROSSVALIDATION);
+ }
+}
Added: myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/ExtValCrossValidationModuleConfiguration.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/ExtValCrossValidationModuleConfiguration.java?rev=957073&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/ExtValCrossValidationModuleConfiguration.java (added)
+++ myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/ExtValCrossValidationModuleConfiguration.java Tue Jun 22 23:04:19 2010
@@ -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;
+
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
+import org.apache.myfaces.extensions.validator.core.ExtValModuleConfiguration;
+import org.apache.myfaces.extensions.validator.internal.UsageInformation;
+import org.apache.myfaces.extensions.validator.internal.UsageCategory;
+
+/**
+ * @author Gerhard Petracek
+ * @since r4
+ */
+@UsageInformation(UsageCategory.INTERNAL)
+public abstract class ExtValCrossValidationModuleConfiguration implements ExtValModuleConfiguration
+{
+ private static ExtValContext extValContext = ExtValContext.getContext();
+
+ protected ExtValCrossValidationModuleConfiguration()
+ {
+ }
+
+ public static ExtValCrossValidationModuleConfiguration get()
+ {
+ return extValContext.getModuleConfiguration(ExtValCrossValidationModuleConfiguration.class);
+ }
+
+ public static boolean use(ExtValCrossValidationModuleConfiguration config, boolean forceOverride)
+ {
+ return extValContext.addModuleConfiguration(
+ ExtValCrossValidationModuleConfiguration.class, config, forceOverride);
+ }
+
+ /*
+ * web.xml config
+ */
+
+ abstract boolean deactivateCrossvalidation();
+}
Modified: myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/WebXmlParameter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/WebXmlParameter.java?rev=957073&r1=957072&r2=957073&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/WebXmlParameter.java (original)
+++ myfaces/extensions/validator/branches/branch_for_extval-100/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/WebXmlParameter.java Tue Jun 22 23:04:19 2010
@@ -29,8 +29,8 @@ import org.apache.myfaces.extensions.val
* @since 1.x.1
*/
@UsageInformation(UsageCategory.INTERNAL)
-public interface WebXmlParameter
+interface WebXmlParameter
{
static final String DEACTIVATE_CROSSVALIDATION = WebXmlUtils
.getInitParameter("DEACTIVATE_CROSSVALIDATION");
-}
\ No newline at end of file
+}