You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/11/23 21:24:08 UTC

svn commit: r1038324 - in /myfaces/extensions/validator/branches/branch_for_jsf_2_0: ./ assembly/ component-support/ core/ examples/ parent/ src/ src/site/ src/site/apt/ validation-modules/

Author: gpetracek
Date: Tue Nov 23 20:24:07 2010
New Revision: 1038324

URL: http://svn.apache.org/viewvc?rev=1038324&view=rev
Log:
sync with trunk

Added:
    myfaces/extensions/validator/branches/branch_for_jsf_2_0/src/
    myfaces/extensions/validator/branches/branch_for_jsf_2_0/src/site/
    myfaces/extensions/validator/branches/branch_for_jsf_2_0/src/site/apt/
    myfaces/extensions/validator/branches/branch_for_jsf_2_0/src/site/apt/index.apt
    myfaces/extensions/validator/branches/branch_for_jsf_2_0/src/site/apt/javadoc.apt
    myfaces/extensions/validator/branches/branch_for_jsf_2_0/src/site/site.xml
Removed:
    myfaces/extensions/validator/branches/branch_for_jsf_2_0/parent/
Modified:
    myfaces/extensions/validator/branches/branch_for_jsf_2_0/assembly/pom.xml
    myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/pom.xml
    myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/pom.xml
    myfaces/extensions/validator/branches/branch_for_jsf_2_0/examples/pom.xml
    myfaces/extensions/validator/branches/branch_for_jsf_2_0/pom.xml
    myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/pom.xml

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/assembly/pom.xml?rev=1038324&r1=1038323&r2=1038324&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/assembly/pom.xml (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/assembly/pom.xml Tue Nov 23 20:24:07 2010
@@ -9,106 +9,86 @@
 
     <parent>
         <groupId>org.apache.myfaces.extensions.validator</groupId>
-        <artifactId>myfaces-extval-parent</artifactId>
+        <artifactId>myfaces-extval-module</artifactId>
         <version>2.0.4-SNAPSHOT</version>
     </parent>
 
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/validator/branches/branch_for_jsf_2_0/assembly</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/branches/branch_for_jsf_2_0/assembly</developerConnection>
-        <url>http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/assembly</url>
-    </scm>
-    
-    <profiles>
-        <profile>
-            <id>apache-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <!-- EXECUTE mvn package to generate assembly files -->
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>make_assembly_bin</id>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>${basedir}/src/main/assembly/corebin.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                </configuration>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.validator</groupId>
-                    <artifactId>myfaces-extval-core</artifactId>
-                    <version>${core.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.validator.validation-modules</groupId>
-                    <artifactId>myfaces-extval-property-validation</artifactId>
-                    <version>${property-validation.version}</version>
-                    <scope>compile</scope>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>javax.persistence</groupId>
-                            <artifactId>persistence-api</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.validator.validation-modules</groupId>
-                    <artifactId>myfaces-extval-bean-validation</artifactId>
-                    <version>${bean-validation.version}</version>
-                    <scope>compile</scope>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>javax.validation</groupId>
-                            <artifactId>validation-api</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-
-                <!--dependency>
-                    <groupId>org.apache.myfaces.extensions.validator.component-support-modules</groupId>
-                    <artifactId>myfaces-extval-trinidad-support</artifactId>
-                    <version>${trinidad-support.version}</version>
-                    <scope>compile</scope>
-                </dependency-->
-
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.validator.component-support-modules</groupId>
-                    <artifactId>myfaces-extval-generic-support</artifactId>
-                    <version>${generic-support.version}</version>
-                    <scope>compile</scope>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>cglib</groupId>
-                            <artifactId>cglib</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
-    <!-- Since extval could be async released, an generated assembly could contain different
-         artifact versions -->
-    <properties>
-        <core.version>2.0.4-SNAPSHOT</core.version>
-        <trinidad-support.version>2.0.4-SNAPSHOT</trinidad-support.version>
-        <generic-support.version>2.0.4-SNAPSHOT</generic-support.version>
-        <property-validation.version>2.0.4-SNAPSHOT</property-validation.version>
-        <bean-validation.version>2.0.4-SNAPSHOT</bean-validation.version>
-    </properties>
+    <build>
+        <plugins>
+            <plugin>
+                <!-- EXECUTE mvn package to generate assembly files -->
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>make_assembly_bin</id>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>${basedir}/src/main/assembly/corebin.xml</descriptor>
+                            </descriptors>
+                            <tarLongFileMode>gnu</tarLongFileMode>
+                        </configuration>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.myfaces.extensions.validator</groupId>
+            <artifactId>myfaces-extval-core</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.myfaces.extensions.validator.validation-modules</groupId>
+            <artifactId>myfaces-extval-property-validation</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.persistence</groupId>
+                    <artifactId>persistence-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.myfaces.extensions.validator.validation-modules</groupId>
+            <artifactId>myfaces-extval-bean-validation</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.validation</groupId>
+                    <artifactId>validation-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.myfaces.extensions.validator.component-support-modules</groupId>
+            <artifactId>myfaces-extval-trinidad-support</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.myfaces.extensions.validator.component-support-modules</groupId>
+            <artifactId>myfaces-extval-generic-support</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>cglib</groupId>
+                    <artifactId>cglib</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
 </project>

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/pom.xml?rev=1038324&r1=1038323&r2=1038324&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/pom.xml (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/pom.xml Tue Nov 23 20:24:07 2010
@@ -32,16 +32,10 @@
 
     <parent>
         <groupId>org.apache.myfaces.extensions.validator</groupId>
-        <artifactId>myfaces-extval-parent</artifactId>
+        <artifactId>myfaces-extval-module</artifactId>
         <version>2.0.4-SNAPSHOT</version>
     </parent>
 
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support</developerConnection>
-        <url>http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support</url>
-    </scm>
-
     <modules>
         <!--module>trinidad-support</module-->
         <module>generic-support</module>

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/pom.xml?rev=1038324&r1=1038323&r2=1038324&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/pom.xml (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/pom.xml Tue Nov 23 20:24:07 2010
@@ -24,7 +24,7 @@
 
     <parent>
         <groupId>org.apache.myfaces.extensions.validator</groupId>
-        <artifactId>myfaces-extval-parent</artifactId>
+        <artifactId>myfaces-extval-module</artifactId>
         <version>2.0.4-SNAPSHOT</version>
     </parent>
 
@@ -34,12 +34,6 @@
     <version>2.0.4-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core</developerConnection>
-        <url>http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core</url>
-    </scm>
-    
     <dependencies>
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/examples/pom.xml?rev=1038324&r1=1038323&r2=1038324&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/examples/pom.xml (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/examples/pom.xml Tue Nov 23 20:24:07 2010
@@ -32,16 +32,10 @@
 
     <parent>
         <groupId>org.apache.myfaces.extensions.validator</groupId>
-        <artifactId>myfaces-extval-parent</artifactId>
+        <artifactId>myfaces-extval-module</artifactId>
         <version>2.0.4-SNAPSHOT</version>
     </parent>
 
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/validator/branches/branch_for_jsf_2_0/examples</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/branches/branch_for_jsf_2_0/examples</developerConnection>
-        <url>http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/examples</url>
-    </scm>
-
     <repositories>
         <repository>
             <id>jboss</id>

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/pom.xml?rev=1038324&r1=1038323&r2=1038324&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/pom.xml (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/pom.xml Tue Nov 23 20:24:07 2010
@@ -43,56 +43,228 @@
 
     <distributionManagement>
         <site>
-            <id>apache-site</id>
-            <url>scpexe://people.apache.org/www/myfaces.apache.org/extensions/validator20</url>
+            <id>apache.website</id>
+            <url>scpexe://people.apache.org/www/myfaces.apache.org/extensions/validator12</url>
         </site>
     </distributionManagement>
 
-    <!-- WARNING: DO NOT GENERATE SITE FROM HERE DIRECTLY
-    Since this project has an async release procedure (not
-    all modules should be released at once), the parent pom.xml 
-    is not this (there is a module for that). Use maven site 
-    plugin here cause problems when the site is generated.
-    The procedure must execute site commmand first on parent 
-    module and then on each module listed below. 
-     -->
+    <issueManagement>
+        <system>jira</system>
+        <url>http://issues.apache.org/jira/browse/EXTVAL</url>
+    </issueManagement>
+
+    <ciManagement>
+        <system>continuum</system>
+        <url>http://myfaces.zones.apache.org:8080/continuum</url>
+        <notifiers>
+            <notifier>
+                <type>mail</type>
+                <sendOnSuccess>true</sendOnSuccess>
+                <configuration>
+                    <address>commits@myfaces.apache.org</address>
+                </configuration>
+            </notifier>
+        </notifiers>
+    </ciManagement>
 
-    <modules>
-        <module>parent</module>
-        <module>assembly</module>
+    <inceptionYear>2008</inceptionYear>
 
+    <modules>
         <module>core</module>
         <module>validation-modules</module>
         <module>component-support</module>
 
-        <!--module>examples</module-->
+        <!--module>test-modules</module>
+        <module>examples</module-->
     </modules>
 
+    <build>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>NOTICE.txt</include>
+                    <include>LICENSE.txt</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>${basedir}/src/main/resources</directory>
+            </resource>
+        </resources>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>2.2</version>
+                    <configuration>
+                        <archive>
+                            <manifest>
+                                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            </manifest>
+                        </archive>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
+        <plugins>
+            <plugin>
+                <!--
+                    - Copy LICENSE.txt and NOTICE.txt so that they are included
+                    - in the -javadoc jar file for the component.
+                -->
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>javadoc.resources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <copy todir="${project.build.directory}/apidocs/META-INF">
+                                    <fileset dir="${basedir}">
+                                        <include name="LICENSE.txt" />
+                                        <include name="NOTICE.txt" />
+                                    </fileset>
+                                </copy>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>javadoc.site.copy</id>
+                        <phase>site</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <!-- Copy javadoc to another directory, to keep javadoc of previous versions on site -->
+                                <copy todir="${project.build.directory}/site/apidocs-${project.version}" failonerror="false">
+                                  <fileset dir="${project.build.directory}/site/apidocs"/>
+                                </copy>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!--
+                - Make a checkstyle violation a compile error. Note that if a compile error occurs,
+                - further information can be found in target/site/checkstyle.html (present even when
+                - just the compile goal and not the site goal has been run). Note also that child
+                - projects may redeclare this plugin and provide different configuration settings
+                - to use different checks (more or less strict than the default).
+            -->
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>2.2</version>
+                <executions>
+                    <execution>
+                        <id>verify-style</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <configLocation>default/myfaces-checks-standard.xml</configLocation>
+                    <headerLocation>default/myfaces-header.txt</headerLocation>
+                </configuration>
+            </plugin>
+
+
+            <plugin>
+                <!-- Set compile source at 1.5, since the target JSF impl is 1.2 -->
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                    <optimize>false</optimize>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <profiles>
-        <!-- This profile is invoked by -DprepareRelease=true.  This allows mvn release:prepare to
-            run successfully on the assembly projects. -->
+        <!-- Add the assembly module when performing an apache-release -->
         <profile>
-            <id>prepare-release</id>
-            <activation>
-                <property>
-                    <name>prepareRelease</name>
-                </property>
-            </activation>
+            <id>apache-release</id>
+
             <modules>
                 <module>assembly</module>
             </modules>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-release-plugin</artifactId>
-                        <configuration>
-                            <arguments>-DprepareRelease</arguments>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
     </profiles>
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jxr-plugin</artifactId>
+                <version>2.1</version>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+                <version>2.4.3</version>
+            </plugin>
+            <plugin>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.0.1</version>
+            </plugin>
+            <plugin>
+                <artifactId>maven-pmd-plugin</artifactId>
+                <version>2.3</version>
+                <configuration>
+                    <rulesets>
+                        <ruleset>/rulesets/basic.xml</ruleset>
+                        <ruleset>/rulesets/unusedcode.xml</ruleset>
+                    </rulesets>
+                    <linkXref>true</linkXref>
+                    <minimumTokens>100</minimumTokens>
+                    <targetJdk>1.5</targetJdk>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <configLocation>default/myfaces-checks-standard.xml</configLocation>
+                    <headerLocation>default/myfaces-header.txt</headerLocation>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-doap-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <category>web-framework, validation</category>
+                    <language>Java</language>
+                    <shortdesc>JSF centric validation framework for metadata based validation.</shortdesc>
+                    <pmc>http://myfaces.apache.org</pmc>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
+
+    <repositories>
+        <repository>
+            <id>maven2-repository.dev.java.net</id>
+            <name>Java.net Repository for Maven</name>
+            <url>http://download.java.net/maven/2/</url>
+            <layout>default</layout>
+        </repository>
+    </repositories>
     
     <properties>
         <jsf.version>2.0.1</jsf.version>

Added: myfaces/extensions/validator/branches/branch_for_jsf_2_0/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/src/site/apt/index.apt?rev=1038324&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/src/site/apt/index.apt (added)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/src/site/apt/index.apt Tue Nov 23 20:24:07 2010
@@ -0,0 +1,7 @@
+ ------
+Overview
+ ------
+
+Apache MyFaces Extensions Validator for JSF 2.0
+
+    MyFaces Extensions Validator is compatible with JSF 1.x and JSF 2.x. All versions require Java 1.5+

Added: myfaces/extensions/validator/branches/branch_for_jsf_2_0/src/site/apt/javadoc.apt
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/src/site/apt/javadoc.apt?rev=1038324&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/src/site/apt/javadoc.apt (added)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/src/site/apt/javadoc.apt Tue Nov 23 20:24:07 2010
@@ -0,0 +1,9 @@
+ ------
+Javadoc
+ ------
+
+Javadoc
+
+    Here you can find the javadoc of previous extval versions.
+
+    * {{{http://myfaces.apache.org/extensions/validator20/myfaces-extval-core/apidocs-2.0.3/index.html}Myfaces ExtVal Core Version 2.0.3}}

Added: myfaces/extensions/validator/branches/branch_for_jsf_2_0/src/site/site.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/src/site/site.xml?rev=1038324&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/src/site/site.xml (added)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/src/site/site.xml Tue Nov 23 20:24:07 2010
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ * 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.
+-->
+
+<project name="Apache MyFaces Extensions Validator">
+  <bannerLeft>
+    <name>Apache MyFaces ExtVal</name>
+    <src>images/extval_logo.png</src>
+    <href>http://myfaces.apache.org/extensions/validator/index.html</href>
+  </bannerLeft>
+
+  <bannerRight>
+    <name>Apache MyFaces</name>
+    <src>img/banners/MyFaces_logo.jpg</src>
+    <href>http://myfaces.apache.org/index.html</href>
+  </bannerRight>
+
+  <publishDate format="dd MMM yyyy"/>
+
+  <skin>
+    <groupId>org.apache.myfaces.maven</groupId>
+    <artifactId>myfaces-site-skin</artifactId>
+    <version>1-SNAPSHOT</version>
+  </skin>
+
+  <body>
+    <links>
+      <item name="Apache" href="http://www.apache.org"/>
+      <item name="MyFaces" href="http://myfaces.apache.org/index.html"/>
+      <item name="Download Myfaces ExtVal" href="http://myfaces.apache.org/extensions/validator/download.html"/>
+    </links>
+
+    <menu name="Apache MyFaces" inherit="top">
+      <item name="Overview"       href="http://myfaces.apache.org/index.html"/>
+      <item name="Download"       href="http://myfaces.apache.org/download.html"/>
+    </menu>
+
+    <menu name="Contents" inherit="top">
+        <item name="Main Site"         href="http://myfaces.apache.org/extensions/validator/index.html"/>
+        <item name="ExtVal for JSF 1.1"       href="http://myfaces.apache.org/extensions/validator11/index.html" collapse="true">
+            <item name="dummy"        href="dummy"/>
+        </item>
+        <item name="ExtVal for JSF 1.2"       href="http://myfaces.apache.org/extensions/validator12/index.html" collapse="true">
+            <item name="dummy"        href="dummy"/>
+        </item>
+        <item name="ExtVal for JSF 2.0"   href="http://myfaces.apache.org/extensions/validator20/index.html">
+              <item name="Core Module"           href="http://myfaces.apache.org/extensions/validator20/myfaces-extval-core/index.html"/>
+              <item name="Bean Validation"       href="http://myfaces.apache.org/extensions/validator20/validation-modules-project/myfaces-extval-bean-validation/index.html"/>
+              <item name="Property Validation"   href="http://myfaces.apache.org/extensions/validator20/validation-modules-project/myfaces-extval-property-validation/index.html"/>
+              <item name="Trinidad Support"      href="http://myfaces.apache.org/extensions/validator20/component-support-modules-project/myfaces-extval-trinidad-support/index.html"/>
+              <item name="Generic Support"       href="http://myfaces.apache.org/extensions/validator20/component-support-modules-project/myfaces-extval-generic-support/index.html"/>
+        </item>
+    </menu>
+	
+    <menu name="Documentation">
+      <item name="Wiki"         href="http://wiki.apache.org/myfaces/Extensions/Validator/"/>
+      <item name="Javadoc"      href="http://myfaces.apache.org/extensions/validator20/javadoc.html"/>
+    </menu>
+
+    <menu ref="reports"/>
+
+    <menu name="Foundation" inherit="bottom">
+      <item name="ASF"            href="http://www.apache.org/" />
+      <item name="Sponsorship"    href="http://www.apache.org/foundation/sponsorship.html" />
+      <item name="Thanks"         href="http://www.apache.org/foundation/thanks.html" />
+    </menu>
+  </body>
+</project>

Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/pom.xml?rev=1038324&r1=1038323&r2=1038324&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/pom.xml (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/pom.xml Tue Nov 23 20:24:07 2010
@@ -32,16 +32,10 @@
 
     <parent>
         <groupId>org.apache.myfaces.extensions.validator</groupId>
-        <artifactId>myfaces-extval-parent</artifactId>
+        <artifactId>myfaces-extval-module</artifactId>
         <version>2.0.4-SNAPSHOT</version>
     </parent>
 
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules</developerConnection>
-        <url>http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules</url>
-    </scm>
-
     <modules>
         <module>property-validation</module>
         <module>bean-validation</module>