Author: alexsmirnov Date: 2010-11-15 19:20:58 -0500 (Mon, 15 Nov 2010) New Revision: 20055 Removed: branches/RF-8742-1/ui/validator/impl/ Modified: branches/RF-8742-1/bom/pom.xml branches/RF-8742-1/ui/parent/pom.xml branches/RF-8742-1/ui/validator/api/pom.xml branches/RF-8742-1/ui/validator/pom.xml branches/RF-8742-1/ui/validator/ui/pom.xml branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/validator/BeanValidatorServiceConstrainsTest.java branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/validator/ClientScriptServiceTest.java branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/validator/FacesConverterServiceTest.java branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/validator/FacesValidatorServiceTest.java Log: CODING IN PROGRESS - issue RF-9799: CSV code review https://jira.jboss.org/browse/RF-9799 validator-impl project removed Modified: branches/RF-8742-1/bom/pom.xml =================================================================== --- branches/RF-8742-1/bom/pom.xml 2010-11-15 19:38:06 UTC (rev 20054) +++ branches/RF-8742-1/bom/pom.xml 2010-11-16 00:20:58 UTC (rev 20055) @@ -1,230 +1,226 @@ - <!-- - JBoss, Home of Professional Open Source Copyright 2010, Red Hat, - Inc. and individual contributors by the @authors tag. See the - copyright.txt in the distribution for a full listing of - individual contributors. This is free software; you can - redistribute it and/or modify it under the terms of the GNU - Lesser General Public License as published by the Free Software - Foundation; either version 2.1 of the License, or (at your - option) any later version. This software is distributed in the - hope that it will be useful, but WITHOUT ANY WARRANTY; without - even the implied warranty of MERCHANTABILITY or FITNESS FOR A - PARTICULAR PURPOSE. See the GNU Lesser General Public License - for more details. You should have received a copy of the GNU - Lesser General Public License along with this software; if not, - write to the Free Software Foundation, Inc., 51 Franklin St, - Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: - http://www.fsf.org. - --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> +<!-- JBoss, Home of Professional Open Source Copyright 2010, Red Hat, Inc. + and individual contributors by the @authors tag. See the copyright.txt in + the distribution for a full listing of individual contributors. This is free + software; you can redistribute it and/or modify it under the terms of the + GNU Lesser General Public License as published by the Free Software Foundation; + either version 2.1 of the License, or (at your option) any later version. + This software is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + details. You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the + FSF site: http://www.fsf.org. --> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-bom</artifactId> - <packaging>pom</packaging> - <version>4.0.0-SNAPSHOT</version> - <name>RichFaces BOM</name> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-bom</artifactId> + <packaging>pom</packaging> + <version>4.0.0-SNAPSHOT</version> + <name>RichFaces BOM</name> - <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>10</version> - <relativePath>../build/parent/pom.xml</relativePath> - </parent> + <parent> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>10</version> + <relativePath>../build/parent/pom.xml</relativePath> + </parent> - <description> + <description> The RichFaces "Bill of Materials". This defines all runtime dependency versions for RichFaces. </description> - <properties> - </properties> + <properties> + </properties> - <!-- Runtime dependency management --> - <dependencyManagement> - <dependencies> - <!-- Project Versions --> - <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-impl</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui.common</groupId> - <artifactId>richfaces-ui-common-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui.common</groupId> - <artifactId>richfaces-ui-common-ui</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui.core</groupId> - <artifactId>richfaces-ui-core-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui.core</groupId> - <artifactId>richfaces-ui-core-ui</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui.iteration</groupId> - <artifactId>richfaces-ui-iteration-ui</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui.iteration</groupId> - <artifactId>richfaces-ui-iteration-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui.output</groupId> - <artifactId>richfaces-ui-output-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui.output</groupId> - <artifactId>richfaces-ui-output-ui</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui.misc</groupId> - <artifactId>richfaces-ui-misc-ui</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui.input</groupId> - <artifactId>richfaces-ui-input-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui.input</groupId> - <artifactId>richfaces-ui-input-ui</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui.validator</groupId> - <artifactId>richfaces-ui-validator-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui.validator</groupId> - <artifactId>richfaces-ui-validator-impl</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui.validator</groupId> - <artifactId>richfaces-ui-validator-ui</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-components-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-components-ui</artifactId> - <version>${project.version}</version> - </dependency> - <!-- JSF 2 --> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>2.0.3-b03</version> - </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>2.0.3-b03</version> - </dependency> - <dependency> - <groupId>org.apache.myfaces.core</groupId> - <artifactId>myfaces-api</artifactId> - <version>2.0.2</version> - </dependency> - <dependency> - <groupId>org.apache.myfaces.core</groupId> - <artifactId>myfaces-impl</artifactId> - <version>2.0.2</version> - </dependency> + <!-- Runtime dependency management --> + <dependencyManagement> + <dependencies> + <!-- Project Versions --> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-impl</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.common</groupId> + <artifactId>richfaces-ui-common-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.common</groupId> + <artifactId>richfaces-ui-common-ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.core</groupId> + <artifactId>richfaces-ui-core-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.core</groupId> + <artifactId>richfaces-ui-core-ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>richfaces-ui-iteration-ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>richfaces-ui-iteration-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.output</groupId> + <artifactId>richfaces-ui-output-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.output</groupId> + <artifactId>richfaces-ui-output-ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.misc</groupId> + <artifactId>richfaces-ui-misc-ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.input</groupId> + <artifactId>richfaces-ui-input-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.input</groupId> + <artifactId>richfaces-ui-input-ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.validator</groupId> + <artifactId>richfaces-ui-validator-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.validator</groupId> + <artifactId>richfaces-ui-validator-ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-ui</artifactId> + <version>${project.version}</version> + </dependency> + <!-- JSF 2 --> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.0.3-b03</version> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>2.0.3-b03</version> + </dependency> + <dependency> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-api</artifactId> + <version>2.0.2</version> + </dependency> + <dependency> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-impl</artifactId> + <version>2.0.2</version> + </dependency> - <!-- Misc --> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>r05</version> - </dependency> - <!-- Required for EL-CSS func --> - <dependency> - <groupId>net.sourceforge.cssparser</groupId> - <artifactId>cssparser</artifactId> - <version>0.9.5</version> - </dependency> + <!-- Misc --> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>r05</version> + </dependency> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <version>1.0.0.GA</version> + </dependency> + <!-- Required for EL-CSS func --> + <dependency> + <groupId>net.sourceforge.cssparser</groupId> + <artifactId>cssparser</artifactId> + <version>0.9.5</version> + </dependency> - <!-- Optional cache dependencies --> - <dependency> - <groupId>opensymphony</groupId> - <artifactId>oscache</artifactId> - <version>2.3</version> - </dependency> - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <version>3.2.5.GA</version> - </dependency> - <dependency> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache</artifactId> - <version>1.6.0</version> - </dependency> + <!-- Optional cache dependencies --> + <dependency> + <groupId>opensymphony</groupId> + <artifactId>oscache</artifactId> + <version>2.3</version> + </dependency> + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <version>3.2.5.GA</version> + </dependency> + <dependency> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache</artifactId> + <version>1.6.0</version> + </dependency> - <!-- Push dependencies --> - <dependency> - <groupId>org.atmosphere</groupId> - <artifactId>atmosphere-runtime</artifactId> - <version>0.6.3</version> - </dependency> - <dependency> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - <version>1.1</version> - </dependency> - </dependencies> - </dependencyManagement> + <!-- Push dependencies --> + <dependency> + <groupId>org.atmosphere</groupId> + <artifactId>atmosphere-runtime</artifactId> + <version>0.6.3</version> + </dependency> + <dependency> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + <version>1.1</version> + </dependency> + </dependencies> + </dependencyManagement> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/buil... - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... - <url>http://fisheye.jboss.org/browse/richfaces/trunk/build/bom</url> - </scm> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/buil... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... + <url>http://fisheye.jboss.org/browse/richfaces/trunk/build/bom</url> + </scm> </project> Modified: branches/RF-8742-1/ui/parent/pom.xml =================================================================== --- branches/RF-8742-1/ui/parent/pom.xml 2010-11-15 19:38:06 UTC (rev 20054) +++ branches/RF-8742-1/ui/parent/pom.xml 2010-11-16 00:20:58 UTC (rev 20055) @@ -124,6 +124,7 @@ <artifactId>jstl</artifactId> <scope>provided</scope> </dependency> + <!-- validation --> <!-- tests --> <dependency> Modified: branches/RF-8742-1/ui/validator/api/pom.xml =================================================================== --- branches/RF-8742-1/ui/validator/api/pom.xml 2010-11-15 19:38:06 UTC (rev 20054) +++ branches/RF-8742-1/ui/validator/api/pom.xml 2010-11-16 00:20:58 UTC (rev 20055) @@ -54,8 +54,8 @@ <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> - <version>1.0.0.GA</version> <scope>provided</scope> + <optional>true</optional> </dependency> </dependencies> Modified: branches/RF-8742-1/ui/validator/pom.xml =================================================================== --- branches/RF-8742-1/ui/validator/pom.xml 2010-11-15 19:38:06 UTC (rev 20054) +++ branches/RF-8742-1/ui/validator/pom.xml 2010-11-16 00:20:58 UTC (rev 20055) @@ -34,7 +34,6 @@ <modules> <module>api</module> - <module>impl</module> <module>ui</module> </modules> Modified: branches/RF-8742-1/ui/validator/ui/pom.xml =================================================================== --- branches/RF-8742-1/ui/validator/ui/pom.xml 2010-11-15 19:38:06 UTC (rev 20054) +++ branches/RF-8742-1/ui/validator/ui/pom.xml 2010-11-16 00:20:58 UTC (rev 20055) @@ -61,21 +61,26 @@ </build> <dependencies> + <dependency> + <groupId>org.richfaces.ui.validator</groupId> + <artifactId>richfaces-ui-validator-api</artifactId> + </dependency> <!-- runtime --> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-impl</artifactId> + </dependency> <dependency> - <groupId>org.richfaces.ui.validator</groupId> - <artifactId>richfaces-ui-validator-impl</artifactId> - </dependency> - <dependency> <groupId>org.richfaces.ui.common</groupId> <artifactId>richfaces-ui-common-ui</artifactId> </dependency> <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> - <version>1.0.0.GA</version> <scope>provided</scope> + <optional>true</optional> </dependency> + <!-- tests --> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> Modified: branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/validator/BeanValidatorServiceConstrainsTest.java =================================================================== --- branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/validator/BeanValidatorServiceConstrainsTest.java 2010-11-15 19:38:06 UTC (rev 20054) +++ branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/validator/BeanValidatorServiceConstrainsTest.java 2010-11-16 00:20:58 UTC (rev 20055) @@ -63,6 +63,7 @@ @After public void tearDown() throws Exception { validatorService = null; + controller.release(); } @Test Modified: branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/validator/ClientScriptServiceTest.java =================================================================== --- branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/validator/ClientScriptServiceTest.java 2010-11-15 19:38:06 UTC (rev 20054) +++ branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/validator/ClientScriptServiceTest.java 2010-11-16 00:20:58 UTC (rev 20055) @@ -73,6 +73,7 @@ @After public void tearDown() throws Exception { controller.verify(); + controller.release(); } /** Modified: branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/validator/FacesConverterServiceTest.java =================================================================== --- branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/validator/FacesConverterServiceTest.java 2010-11-15 19:38:06 UTC (rev 20054) +++ branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/validator/FacesConverterServiceTest.java 2010-11-16 00:20:58 UTC (rev 20055) @@ -63,6 +63,7 @@ public void tearDown() { controller.verify(); serviceImpl = null; + controller.release(); } @Test Modified: branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/validator/FacesValidatorServiceTest.java =================================================================== --- branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/validator/FacesValidatorServiceTest.java 2010-11-15 19:38:06 UTC (rev 20054) +++ branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/validator/FacesValidatorServiceTest.java 2010-11-16 00:20:58 UTC (rev 20055) @@ -58,6 +58,7 @@ public void tearDown() { controller.verify(); serviceImpl = null; + controller.release(); } @Test