svn commit: r966614 [5/5] - in /myfaces/extensions/validator/trunk: core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/ core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/ test-modules/ test...

[rd...@apache.org]

Added: myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/config/ExtValTrinidadSupportModuleConfigurationDeactivateClientSideValidationTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/config/ExtValTrinidadSupportModuleConfigurationDeactivateClientSideValidationTestCase.java?rev=966614&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/config/ExtValTrinidadSupportModuleConfigurationDeactivateClientSideValidationTestCase.java (added)
+++ myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/config/ExtValTrinidadSupportModuleConfigurationDeactivateClientSideValidationTestCase.java Thu Jul 22 12:24:16 2010
@@ -0,0 +1,102 @@
+/*
+ * 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.test.trinidad.config;
+
+import java.util.List;
+
+import junit.framework.Test;
+
+import org.apache.myfaces.extensions.validator.ExtValInformation;
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
+import org.apache.myfaces.extensions.validator.core.initializer.component.ComponentInitializer;
+import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
+import org.apache.myfaces.extensions.validator.trinidad.DefaultExtValTrinidadSupportModuleConfiguration;
+import org.apache.myfaces.extensions.validator.trinidad.ExtValTrinidadSupportModuleConfiguration;
+
+/**
+ * 
+ * @author Rudy De Busscher
+ * since v4
+ *
+ */
+public class ExtValTrinidadSupportModuleConfigurationDeactivateClientSideValidationTestCase extends
+        ExtValTrinidadSupportModuleConfigurationTestCase
+{
+
+    public ExtValTrinidadSupportModuleConfigurationDeactivateClientSideValidationTestCase(String name)
+    {
+        super(name);
+    }
+
+    public static class CustomExtValTrinidadSupportModuleConfiguration extends
+            DefaultExtValTrinidadSupportModuleConfiguration
+    {
+
+        @Override
+        public boolean deactivateClientSideValidation()
+        {
+            return true;
+        }
+
+    }
+
+    protected void addInitializationParameters()
+    {
+        super.addInitializationParameters();
+        if (needXmlParameters())
+        {
+            addInitParameter(ExtValInformation.WEBXML_PARAM_PREFIX + ".DEACTIVATE_CLIENT_SIDE_TRINIDAD_VALIDATION",
+                    "true");
+
+        }
+    }
+
+    @Override
+    protected ExtValTrinidadSupportModuleConfiguration getCustomTrinidadSupportModuleConfiguration()
+    {
+        return new CustomExtValTrinidadSupportModuleConfiguration();
+    }
+
+    public void testDeactivateClientSideValidationDefault()
+    {
+        List<ComponentInitializer> compInitializer = ExtValContext.getContext().getComponentInitializers();
+        assertEquals(1, compInitializer.size());
+
+    }
+
+    public void testDeactivateClientSideValidationWebXml()
+    {
+        List<ComponentInitializer> compInitializer = ExtValContext.getContext().getComponentInitializers();
+        assertEquals(0, compInitializer.size());
+    }
+
+    public void testDeactivateClientSideValidationCustomConfig()
+    {
+        List<ComponentInitializer> compInitializer = ExtValContext.getContext().getComponentInitializers();
+        assertEquals(0, compInitializer.size());
+    }
+
+    public static Test suite()
+    {
+        return new ClassLoaderTestSuite(
+                ExtValTrinidadSupportModuleConfigurationDeactivateClientSideValidationTestCase.class);
+
+    }
+
+}

Added: myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/config/ExtValTrinidadSupportModuleConfigurationDeactivateCoreOutputLabelInitializationTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/config/ExtValTrinidadSupportModuleConfigurationDeactivateCoreOutputLabelInitializationTestCase.java?rev=966614&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/config/ExtValTrinidadSupportModuleConfigurationDeactivateCoreOutputLabelInitializationTestCase.java (added)
+++ myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/config/ExtValTrinidadSupportModuleConfigurationDeactivateCoreOutputLabelInitializationTestCase.java Thu Jul 22 12:24:16 2010
@@ -0,0 +1,104 @@
+/*
+ * 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.test.trinidad.config;
+
+import java.util.List;
+
+import junit.framework.Test;
+
+import org.apache.myfaces.extensions.validator.ExtValInformation;
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
+import org.apache.myfaces.extensions.validator.core.interceptor.RendererInterceptor;
+import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
+import org.apache.myfaces.extensions.validator.trinidad.DefaultExtValTrinidadSupportModuleConfiguration;
+import org.apache.myfaces.extensions.validator.trinidad.ExtValTrinidadSupportModuleConfiguration;
+
+/**
+ * 
+ * @author Rudy De Busscher
+ * since v4
+ *
+ */
+public class ExtValTrinidadSupportModuleConfigurationDeactivateCoreOutputLabelInitializationTestCase extends
+        ExtValTrinidadSupportModuleConfigurationTestCase
+{
+
+    public ExtValTrinidadSupportModuleConfigurationDeactivateCoreOutputLabelInitializationTestCase(String name)
+    {
+        super(name);
+    }
+
+    public static class CustomExtValTrinidadSupportModuleConfiguration extends
+            DefaultExtValTrinidadSupportModuleConfiguration
+    {
+
+        @Override
+        public boolean deactivateCoreOutputLabelInitialization()
+        {
+            return true;
+        }
+
+    }
+
+    protected void addInitializationParameters()
+    {
+        super.addInitializationParameters();
+        if (needXmlParameters())
+        {
+            addInitParameter(ExtValInformation.WEBXML_PARAM_PREFIX
+                    + ".DEACTIVATE_TRINIDAD_CORE_OUTPUT_LABEL_INITIALIZATION", "true");
+
+        }
+    }
+
+    @Override
+    protected ExtValTrinidadSupportModuleConfiguration getCustomTrinidadSupportModuleConfiguration()
+    {
+        return new CustomExtValTrinidadSupportModuleConfiguration();
+    }
+
+    public void testDeactivateCoreOutputLabelInitializationDefault()
+    {
+        List<RendererInterceptor> interceptors = ExtValContext.getContext().getRendererInterceptors();
+        // Default ValidationInterceptor from core and Trinidad one.
+        assertEquals(2, interceptors.size());
+    }
+
+    public void testDeactivateCoreOutputLabelInitializationWebXml()
+    {
+        List<RendererInterceptor> interceptors = ExtValContext.getContext().getRendererInterceptors();
+        // only Default ValidationInterceptor from core .
+        assertEquals(1, interceptors.size());
+    }
+
+    public void testDeactivateCoreOutputLabelInitializationCustomConfig()
+    {
+        List<RendererInterceptor> interceptors = ExtValContext.getContext().getRendererInterceptors();
+        // only Default ValidationInterceptor from core .
+        assertEquals(1, interceptors.size());
+    }
+
+    public static Test suite()
+    {
+        return new ClassLoaderTestSuite(
+                ExtValTrinidadSupportModuleConfigurationDeactivateCoreOutputLabelInitializationTestCase.class);
+
+    }
+
+}

Added: myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/config/ExtValTrinidadSupportModuleConfigurationDeactivateValidationExceptionInterceptorTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/config/ExtValTrinidadSupportModuleConfigurationDeactivateValidationExceptionInterceptorTestCase.java?rev=966614&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/config/ExtValTrinidadSupportModuleConfigurationDeactivateValidationExceptionInterceptorTestCase.java (added)
+++ myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/config/ExtValTrinidadSupportModuleConfigurationDeactivateValidationExceptionInterceptorTestCase.java Thu Jul 22 12:24:16 2010
@@ -0,0 +1,111 @@
+/*
+ * 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.test.trinidad.config;
+
+import java.util.List;
+
+import junit.framework.Test;
+
+import org.apache.myfaces.extensions.validator.ExtValInformation;
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
+import org.apache.myfaces.extensions.validator.core.interceptor.ValidationExceptionInterceptor;
+import org.apache.myfaces.extensions.validator.test.base.util.ClassLoaderTestSuite;
+import org.apache.myfaces.extensions.validator.trinidad.DefaultExtValTrinidadSupportModuleConfiguration;
+import org.apache.myfaces.extensions.validator.trinidad.ExtValTrinidadSupportModuleConfiguration;
+
+/**
+ * 
+ * @author Rudy De Busscher
+ * since v4
+ *
+ */
+public class ExtValTrinidadSupportModuleConfigurationDeactivateValidationExceptionInterceptorTestCase extends
+        ExtValTrinidadSupportModuleConfigurationTestCase
+{
+
+    public ExtValTrinidadSupportModuleConfigurationDeactivateValidationExceptionInterceptorTestCase(String name)
+    {
+        super(name);
+    }
+
+    public static class CustomExtValTrinidadSupportModuleConfiguration extends
+            DefaultExtValTrinidadSupportModuleConfiguration
+    {
+
+        @Override
+        public boolean deactivateValidationExceptionInterceptor()
+        {
+            return true;
+        }
+
+    }
+
+    protected void addInitializationParameters()
+    {
+        super.addInitializationParameters();
+        if (needXmlParameters())
+        {
+            addInitParameter(ExtValInformation.WEBXML_PARAM_PREFIX
+                    + ".DEACTIVATE_TRINIDAD_VALIDATION_EXCEPTION_INTERCEPTOR", "true");
+
+        }
+    }
+
+    @Override
+    protected ExtValTrinidadSupportModuleConfiguration getCustomTrinidadSupportModuleConfiguration()
+    {
+        return new CustomExtValTrinidadSupportModuleConfiguration();
+    }
+
+    public void testDeactivateValidationExceptionInterceptorDefault()
+    {
+        List<ValidationExceptionInterceptor> interceptors = ExtValContext.getContext()
+                .getValidationExceptionInterceptors();
+        // ViolationSeverityValidationExceptionInterceptor and
+        // HtmlCoreComponentsValidationExceptionInterceptor from core and
+        // trinidad one.
+        assertEquals(4, interceptors.size());
+    }
+
+    public void testDeactivateValidationExceptionInterceptorWebXml()
+    {
+        List<ValidationExceptionInterceptor> interceptors = ExtValContext.getContext()
+                .getValidationExceptionInterceptors();
+        // ViolationSeverityValidationExceptionInterceptor and
+        // HtmlCoreComponentsValidationExceptionInterceptor from core.
+        assertEquals(3, interceptors.size());
+    }
+
+    public void testDeactivateValidationExceptionInterceptorCustomConfig()
+    {
+        List<ValidationExceptionInterceptor> interceptors = ExtValContext.getContext()
+                .getValidationExceptionInterceptors();
+        // ViolationSeverityValidationExceptionInterceptor and
+        // HtmlCoreComponentsValidationExceptionInterceptor from core.
+        assertEquals(3, interceptors.size());
+    }
+
+    public static Test suite()
+    {
+        return new ClassLoaderTestSuite(
+                ExtValTrinidadSupportModuleConfigurationDeactivateValidationExceptionInterceptorTestCase.class);
+
+    }
+
+}

Added: myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/config/ExtValTrinidadSupportModuleConfigurationTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/config/ExtValTrinidadSupportModuleConfigurationTestCase.java?rev=966614&view=auto
==============================================================================
--- myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/config/ExtValTrinidadSupportModuleConfigurationTestCase.java (added)
+++ myfaces/extensions/validator/trunk/test-modules/trinidad-component-support-tests/src/test/java/org/apache/myfaces/extensions/validator/test/trinidad/config/ExtValTrinidadSupportModuleConfigurationTestCase.java Thu Jul 22 12:24:16 2010
@@ -0,0 +1,81 @@
+/*
+ * 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.test.trinidad.config;
+
+import org.apache.myfaces.extensions.validator.core.ExtValModuleConfiguration;
+import org.apache.myfaces.extensions.validator.test.trinidad.AbstractTrinidadSupportTestCase;
+import org.apache.myfaces.extensions.validator.trinidad.ExtValTrinidadSupportModuleConfiguration;
+
+/**
+ * 
+ * @author Rudy De Busscher
+ * since v4
+ *
+ */
+public abstract class ExtValTrinidadSupportModuleConfigurationTestCase extends AbstractTrinidadSupportTestCase
+{
+
+    public ExtValTrinidadSupportModuleConfigurationTestCase(String name)
+    {
+        super(name);
+    }
+
+    protected boolean needXmlParameters()
+    {
+        return getName().contains("Xml");
+    }
+
+    protected boolean needCustomConfig()
+    {
+        return !getName().contains("Xml") && !getName().contains("Default");
+    }
+
+    @Override
+    /*
+     * Made the method final because we do setup by the getCustomConfigObjects
+     */
+    protected final void invokeStartupListeners()
+    {
+        super.invokeStartupListeners();
+    }
+    
+    @Override
+    protected final ExtValModuleConfiguration[] getCustomConfigObjects()
+    {
+        if (needCustomConfig())
+        {
+            ExtValModuleConfiguration[] result = new ExtValModuleConfiguration[]
+            { getCustomTrinidadSupportModuleConfiguration() };
+            if (result.length == 1 && result[0] == null)
+            {
+                // test don't want to specify a custom configuration.
+                return null;
+            } else
+            {
+                return result;
+            }
+        } else
+        {
+            return null;
+        }
+    }
+
+    abstract protected ExtValTrinidadSupportModuleConfiguration getCustomTrinidadSupportModuleConfiguration();
+
+}

Modified: myfaces/extensions/validator/trunk/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/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java?rev=966614&r1=966613&r2=966614&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/resolver/JpaValidationErrorMessageResolver.java Thu Jul 22 12:24:16 2010
@@ -23,6 +23,7 @@ import org.apache.myfaces.extensions.val
 import org.apache.myfaces.extensions.validator.core.ExtValContext;
 import org.apache.myfaces.extensions.validator.internal.UsageInformation;
 import org.apache.myfaces.extensions.validator.internal.UsageCategory;
+import org.apache.myfaces.extensions.validator.util.ClassUtils;
 
 /**
  * @author Gerhard Petracek
@@ -40,8 +41,8 @@ public class JpaValidationErrorMessageRe
     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";
+    private static final String BASE_NAME = ClassUtils.getPackageName(JpaValidationErrorMessageResolver.class).replace(
+            ".message.resolver", ".message.bundle")+ ".jpa_messages";
 
     protected String getCustomBaseName()
     {

Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/ExtValCrossValidationModuleConfiguration.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/ExtValCrossValidationModuleConfiguration.java?rev=966614&r1=966613&r2=966614&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/ExtValCrossValidationModuleConfiguration.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/ExtValCrossValidationModuleConfiguration.java Thu Jul 22 12:24:16 2010
@@ -52,5 +52,5 @@ public abstract class ExtValCrossValidat
      * web.xml config
      */
 
-    abstract boolean deactivateCrossvalidation();
+    public abstract boolean deactivateCrossvalidation();
 }