diff --git a/assembly/pom.xml b/assembly/pom.xml
index 3efd2ee..107033f 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -14,9 +14,9 @@
     </parent>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/validator/branches/1_2_4_rc/assembly</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/branches/1_2_4_rc/assembly</developerConnection>
-        <url>http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/1_2_4_rc/assembly</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/validator/trunk/assembly</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/trunk/assembly</developerConnection>
+        <url>http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/assembly</url>
     </scm>
     
     <build>
diff --git a/component-support/generic-support/pom.xml b/component-support/generic-support/pom.xml
index 4d9e15e..83163ee 100644
--- a/component-support/generic-support/pom.xml
+++ b/component-support/generic-support/pom.xml
@@ -52,29 +52,6 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/config</directory>
-                <includes>
-                    <include>**/*xml</include>
-                </includes>
-                <targetPath>/META-INF</targetPath>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>LICENSE.txt</include>
-                    <include>NOTICE.txt</include>
-                </includes>
-                <targetPath>/META-INF</targetPath>
-            </resource>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*properties</include>
-                </includes>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <inherited>true</inherited>
diff --git a/component-support/generic-support/src/main/config/faces-config.xml b/component-support/generic-support/src/main/resources/META-INF/faces-config.xml
similarity index 100%
rename from component-support/generic-support/src/main/config/faces-config.xml
rename to component-support/generic-support/src/main/resources/META-INF/faces-config.xml
diff --git a/component-support/pom.xml b/component-support/pom.xml
index 87a6b9f..03e642e 100644
--- a/component-support/pom.xml
+++ b/component-support/pom.xml
@@ -37,9 +37,9 @@
     </parent>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/validator/branches/1_2_4_rc/component-support</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/branches/1_2_4_rc/component-support</developerConnection>
-        <url>http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/1_2_4_rc/component-support</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/validator/trunk/component-support</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/trunk/component-support</developerConnection>
+        <url>http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/component-support</url>
     </scm>
 
     <modules>
diff --git a/component-support/trinidad-support/pom.xml b/component-support/trinidad-support/pom.xml
index e913ee1..b4d2559 100644
--- a/component-support/trinidad-support/pom.xml
+++ b/component-support/trinidad-support/pom.xml
@@ -60,29 +60,6 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/config</directory>
-                <includes>
-                    <include>**/*xml</include>
-                </includes>
-                <targetPath>/META-INF</targetPath>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>LICENSE.txt</include>
-                    <include>NOTICE.txt</include>
-                </includes>
-                <targetPath>/META-INF</targetPath>
-            </resource>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*properties</include>
-                </includes>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <inherited>true</inherited>
diff --git a/component-support/trinidad-support/src/main/config/faces-config.xml b/component-support/trinidad-support/src/main/resources/META-INF/faces-config.xml
similarity index 100%
rename from component-support/trinidad-support/src/main/config/faces-config.xml
rename to component-support/trinidad-support/src/main/resources/META-INF/faces-config.xml
diff --git a/core/pom.xml b/core/pom.xml
index 791cf63..5b0ee75 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -35,9 +35,9 @@
     <packaging>jar</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/validator/branches/1_2_4_rc/core</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/branches/1_2_4_rc/core</developerConnection>
-        <url>http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/1_2_4_rc/core</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/validator/trunk/core</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/trunk/core</developerConnection>
+        <url>http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core</url>
     </scm>
     
     <dependencies>
diff --git a/examples/pom.xml b/examples/pom.xml
index 737830b..4becb53 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -37,9 +37,9 @@
     </parent>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/validator/branches/1_2_4_rc/examples</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/branches/1_2_4_rc/examples</developerConnection>
-        <url>http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/1_2_4_rc/examples</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/validator/trunk/examples</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/trunk/examples</developerConnection>
+        <url>http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/examples</url>
     </scm>
 
     <repositories>
diff --git a/parent/pom.xml b/parent/pom.xml
index 8a7ce5b..1758621 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.myfaces</groupId>
         <artifactId>myfaces</artifactId>
-        <version>6</version>
+        <version>9</version>
     </parent>
 
     <groupId>org.apache.myfaces.extensions.validator</groupId>
@@ -228,18 +228,12 @@
     </reporting>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/validator/branches/1_2_4_rc/parent</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/branches/1_2_4_rc/parent</developerConnection>
-        <url>http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/1_2_4_rc/parent</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/validator/trunk/parent</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/trunk/parent</developerConnection>
+        <url>http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/parent</url>
     </scm>
 
     <distributionManagement>
-        <snapshotRepository>
-            <uniqueVersion>false</uniqueVersion>
-            <id>apache.snapshots</id>
-            <name>Apache Maven Snapshot Repository</name>
-            <url>scpexe://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
-        </snapshotRepository>
         <site>
             <id>apache-site</id>
             <url>scpexe://people.apache.org/www/myfaces.apache.org/extensions/validator12</url>
diff --git a/pom.xml b/pom.xml
index ee98da7..168af41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.myfaces</groupId>
         <artifactId>myfaces</artifactId>
-        <version>6</version>
+        <version>9</version>
     </parent>
 
     <groupId>org.apache.myfaces.extensions.validator</groupId>
@@ -42,12 +42,6 @@
     </scm>
 
     <distributionManagement>
-        <snapshotRepository>
-            <uniqueVersion>false</uniqueVersion>
-            <id>apache.snapshots</id>
-            <name>Apache Maven Snapshot Repository</name>
-            <url>scpexe://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
-        </snapshotRepository>
         <site>
             <id>apache-site</id>
             <url>scpexe://people.apache.org/www/myfaces.apache.org/extensions/validator12</url>
diff --git a/test-modules/pom.xml b/test-modules/pom.xml
index f80b662..f5de4d3 100644
--- a/test-modules/pom.xml
+++ b/test-modules/pom.xml
@@ -37,13 +37,9 @@
     </parent>
 
     <scm>
-        <connection>
-            scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/validator/branches/1_2_4_rc/validation-modules
-        </connection>
-        <developerConnection>
-            scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/branches/1_2_4_rc/validation-modules
-        </developerConnection>
-        <url>http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/1_2_4_rc/validation-modules</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/validator/trunk/test-modules</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/trunk/test-modules</developerConnection>
+        <url>http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/test-modules</url>
     </scm>
 
     <modules>
@@ -176,7 +172,9 @@
                     </excludes>
 					<useSystemClassLoader>true</useSystemClassLoader>
 					<forkMode>once</forkMode>
+                              <!-- These lines makes jvm could not be started
 					<argLine>-Xmx1024m -XX:MaxPermSize=512m</argLine>					
+                              -->
                 </configuration>
             </plugin>
         </plugins>
diff --git a/validation-modules/bean-validation/pom.xml b/validation-modules/bean-validation/pom.xml
index 239985c..e6282b2 100644
--- a/validation-modules/bean-validation/pom.xml
+++ b/validation-modules/bean-validation/pom.xml
@@ -125,29 +125,6 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/config</directory>
-                <includes>
-                    <include>**/*xml</include>
-                </includes>
-                <targetPath>/META-INF</targetPath>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>LICENSE.txt</include>
-                    <include>NOTICE.txt</include>
-                </includes>
-                <targetPath>/META-INF</targetPath>
-            </resource>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*properties</include>
-                </includes>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <inherited>true</inherited>
diff --git a/validation-modules/bean-validation/src/main/config/faces-config.xml b/validation-modules/bean-validation/src/main/resources/META-INF/faces-config.xml
similarity index 100%
rename from validation-modules/bean-validation/src/main/config/faces-config.xml
rename to validation-modules/bean-validation/src/main/resources/META-INF/faces-config.xml
diff --git a/validation-modules/pom.xml b/validation-modules/pom.xml
index eed47ea..d01e64b 100644
--- a/validation-modules/pom.xml
+++ b/validation-modules/pom.xml
@@ -37,9 +37,9 @@
     </parent>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/validator/branches/1_2_4_rc/validation-modules</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/branches/1_2_4_rc/validation-modules</developerConnection>
-        <url>http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/1_2_4_rc/validation-modules</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/validator/test/validation-modules</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/test/validation-modules</developerConnection>
+        <url>http://svn.apache.org/viewvc/myfaces/extensions/validator/test/validation-modules</url>
     </scm>
 
     <modules>
diff --git a/validation-modules/property-validation/pom.xml b/validation-modules/property-validation/pom.xml
index 74f279d..6620444 100644
--- a/validation-modules/property-validation/pom.xml
+++ b/validation-modules/property-validation/pom.xml
@@ -102,29 +102,6 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/config</directory>
-                <includes>
-                    <include>**/*xml</include>
-                </includes>
-                <targetPath>/META-INF</targetPath>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>LICENSE.txt</include>
-                    <include>NOTICE.txt</include>
-                </includes>
-                <targetPath>/META-INF</targetPath>
-            </resource>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*properties</include>
-                </includes>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <inherited>true</inherited>
diff --git a/validation-modules/property-validation/src/main/config/faces-config.xml b/validation-modules/property-validation/src/main/resources/META-INF/faces-config.xml
similarity index 100%
rename from validation-modules/property-validation/src/main/config/faces-config.xml
rename to validation-modules/property-validation/src/main/resources/META-INF/faces-config.xml
diff --git a/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages.properties b/validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages.properties
similarity index 100%
rename from validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages.properties
rename to validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages.properties
diff --git a/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_ar.properties b/validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_ar.properties
similarity index 100%
rename from validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_ar.properties
rename to validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_ar.properties
diff --git a/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_ca.properties b/validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_ca.properties
similarity index 100%
rename from validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_ca.properties
rename to validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_ca.properties
diff --git a/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_de.properties b/validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_de.properties
similarity index 100%
rename from validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_de.properties
rename to validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_de.properties
diff --git a/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_en.properties b/validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_en.properties
similarity index 100%
rename from validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_en.properties
rename to validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_en.properties
diff --git a/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_es.properties b/validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_es.properties
similarity index 99%
rename from validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_es.properties
rename to validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_es.properties
index 5bb1077..93bb98c 100644
--- a/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_es.properties
+++ b/validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_es.properties
@@ -1,19 +1,19 @@
-# 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.
-
-no_match=Formato inv\u00e1lido 
+# 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.
+
+no_match=Formato inv\u00e1lido 
 no_match_detail=El formato requerido es: {0}
\ No newline at end of file
diff --git a/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_fr.properties b/validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_fr.properties
similarity index 100%
rename from validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_fr.properties
rename to validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_fr.properties
diff --git a/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_it.properties b/validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_it.properties
similarity index 100%
rename from validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_it.properties
rename to validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_it.properties
diff --git a/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_tr.properties b/validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_tr.properties
similarity index 100%
rename from validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_tr.properties
rename to validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/baseval/message/bundle/validation_messages_tr.properties
diff --git a/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages.properties b/validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages.properties
similarity index 100%
rename from validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages.properties
rename to validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages.properties
diff --git a/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_ar.properties b/validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_ar.properties
similarity index 100%
rename from validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_ar.properties
rename to validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_ar.properties
diff --git a/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_ca.properties b/validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_ca.properties
similarity index 100%
rename from validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_ca.properties
rename to validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_ca.properties
diff --git a/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_de.properties b/validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_de.properties
similarity index 100%
rename from validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_de.properties
rename to validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_de.properties
diff --git a/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_en.properties b/validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_en.properties
similarity index 100%
rename from validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_en.properties
rename to validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_en.properties
diff --git a/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_es.properties b/validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_es.properties
similarity index 99%
rename from validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_es.properties
rename to validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_es.properties
index 4338524..00a9170 100644
--- a/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_es.properties
+++ b/validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_es.properties
@@ -1,34 +1,34 @@
-# 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=la entrada es diferente
-duplicated_content_required_detail=la entrada es diferente
-
-duplicated_content_denied=no se permiten entradas iguales
-duplicated_content_denied_detail=no se permiten entradas iguales
-
-wrong_date=fecha equivocada
-wrong_date_detail=fecha equivocada
-
-wrong_date_not_before=la fecha tiene que ser luego de {0}
-wrong_date_not_before_detail=la fecha tiene que ser luego de {0}
-
-wrong_date_not_after=la fecha tiene que ser antes de {0}
-wrong_date_not_after_detail=la fecha tiene que ser antes de {0}
-
-wrong_date_not_equal=la fecha no es igual a {0}
+# 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=la entrada es diferente
+duplicated_content_required_detail=la entrada es diferente
+
+duplicated_content_denied=no se permiten entradas iguales
+duplicated_content_denied_detail=no se permiten entradas iguales
+
+wrong_date=fecha equivocada
+wrong_date_detail=fecha equivocada
+
+wrong_date_not_before=la fecha tiene que ser luego de {0}
+wrong_date_not_before_detail=la fecha tiene que ser luego de {0}
+
+wrong_date_not_after=la fecha tiene que ser antes de {0}
+wrong_date_not_after_detail=la fecha tiene que ser antes de {0}
+
+wrong_date_not_equal=la fecha no es igual a {0}
 wrong_date_not_equal_detail=la fecha no es igual a {0}
\ No newline at end of file
diff --git a/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_fr.properties b/validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_fr.properties
similarity index 100%
rename from validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_fr.properties
rename to validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_fr.properties
diff --git a/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_it.properties b/validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_it.properties
similarity index 100%
rename from validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_it.properties
rename to validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_it.properties
diff --git a/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_tr.properties b/validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_tr.properties
similarity index 100%
rename from validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_tr.properties
rename to validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages_tr.properties
diff --git a/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/jpa_strategy_mappings.properties b/validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/jpa_strategy_mappings.properties
similarity index 100%
rename from validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/jpa_strategy_mappings.properties
rename to validation-modules/property-validation/src/main/resources/org/apache/myfaces/extensions/validator/jpa_strategy_mappings.properties