[richfaces-svn-commits] JBoss Rich Faces SVN: r10904 - in trunk/test-applications/regressionArea: regressionArea-ear and 2 other directories.

Author: andrei_exadel Date: 2008-10-25 03:52:44 -0400 (Sat, 25 Oct 2008) New Revision: 10904 Added: trunk/test-applications/regressionArea/regressionArea-ear/ trunk/test-applications/regressionArea/regressionArea-ejb/ trunk/test-applications/regressionArea/regressionArea-web/ Removed: trunk/test-applications/regressionArea/Seam-ear/ trunk/test-applications/regressionArea/Seam-ejb/ trunk/test-applications/regressionArea/Seam-web/ Modified: trunk/test-applications/regressionArea/Test.bat trunk/test-applications/regressionArea/pom.xml trunk/test-applications/regressionArea/regressionArea-ear/pom.xml trunk/test-applications/regressionArea/regressionArea-ejb/pom.xml trunk/test-applications/regressionArea/regressionArea-web/pom.xml Log: Rename modules names, put facelets dependency to web module. Modified: trunk/test-applications/regressionArea/Test.bat =================================================================== --- trunk/test-applications/regressionArea/Test.bat 2008-10-24 17:59:09 UTC (rev 10903) +++ trunk/test-applications/regressionArea/Test.bat 2008-10-25 07:52:44 UTC (rev 10904) @@ -1,2 +1,2 @@ -cd /Seam-web +cd /regressionArea-web mvn integration-test -P Test \ No newline at end of file Modified: trunk/test-applications/regressionArea/pom.xml =================================================================== --- trunk/test-applications/regressionArea/pom.xml 2008-10-24 17:59:09 UTC (rev 10903) +++ trunk/test-applications/regressionArea/pom.xml 2008-10-25 07:52:44 UTC (rev 10904) @@ -60,8 +60,8 @@ </repositories> <properties> - <contextroot>Seam</contextroot> - <earname>Seam-ear-${version}</earname> + <contextroot>regressionArea</contextroot> + <earname>regressionArea-ear</earname> <richversion>3.3.0-SNAPSHOT</richversion> <seamversion>2.0.2.SP1</seamversion> <jsfversion>1.2_09</jsfversion> @@ -72,9 +72,9 @@ <modules> - <module>Seam-ejb</module> - <module>Seam-web</module> - <module>Seam-ear</module> + <module>regressionArea-ejb</module> + <module>regressionArea-web</module> + <module>regressionArea-ear</module> </modules> <build> <plugins> Copied: trunk/test-applications/regressionArea/regressionArea-ear (from rev 10903, trunk/test-applications/regressionArea/Seam-ear) Modified: trunk/test-applications/regressionArea/regressionArea-ear/pom.xml =================================================================== --- trunk/test-applications/regressionArea/Seam-ear/pom.xml 2008-10-24 17:59:09 UTC (rev 10903) +++ trunk/test-applications/regressionArea/regressionArea-ear/pom.xml 2008-10-25 07:52:44 UTC (rev 10904) @@ -10,16 +10,22 @@ </parent> <version>3.3.0-SNAPSHOT</version> <groupId>org.richfaces.test-applications.regressionArea</groupId> - <artifactId>Seam-ear</artifactId> - <name>Seam App Ear Module</name> + <artifactId>regressionArea-ear</artifactId> + <name>Regression Area Ear Module</name> <packaging>ear</packaging> <dependencies> <dependency> <groupId>org.richfaces.test-applications.regressionArea</groupId> - <artifactId>Seam-web</artifactId> + <artifactId>regressionArea-web</artifactId> <version>${project.version}</version> <type>war</type> + <exclusions> + <exclusion> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.seam</groupId> @@ -55,7 +61,7 @@ </dependency> <dependency> <groupId>org.richfaces.test-applications.regressionArea</groupId> - <artifactId>Seam-ejb</artifactId> + <artifactId>regressionArea-ejb</artifactId> <version>${project.version}</version> <type>ejb</type> <exclusions> @@ -99,6 +105,10 @@ <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> </exclusion> + <exclusion> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + </exclusion> </exclusions> </dependency> </dependencies> @@ -119,12 +129,12 @@ seam.jboss.org:loader=${earname}.ear </loader-repository> </jboss> - <displayName>Regression Test Seam App</displayName> + <displayName>Regression Area Seam App</displayName> <defaultLibBundleDir>lib</defaultLibBundleDir> <modules> <webModule> <groupId>org.richfaces.test-applications.regressionArea</groupId> - <artifactId>Seam-web</artifactId> + <artifactId>regressionArea-web</artifactId> <contextRoot>/${contextroot}</contextRoot> </webModule> </modules> Copied: trunk/test-applications/regressionArea/regressionArea-ejb (from rev 10903, trunk/test-applications/regressionArea/Seam-ejb) Modified: trunk/test-applications/regressionArea/regressionArea-ejb/pom.xml =================================================================== --- trunk/test-applications/regressionArea/Seam-ejb/pom.xml 2008-10-24 17:59:09 UTC (rev 10903) +++ trunk/test-applications/regressionArea/regressionArea-ejb/pom.xml 2008-10-25 07:52:44 UTC (rev 10904) @@ -7,8 +7,8 @@ <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.richfaces.test-applications.regressionArea</groupId> - <artifactId>Seam-ejb</artifactId> - <name>Seam App EJB Module</name> + <artifactId>regressionArea-ejb</artifactId> + <name>Regression Area EJB Module</name> <packaging>ejb</packaging> <dependencies> <dependency> @@ -57,13 +57,8 @@ <artifactId>jboss-seam-debug</artifactId> <version>${seamversion}</version> </dependency> + <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <version>1.1.14</version> - </dependency> - - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.14</version> @@ -153,7 +148,7 @@ </dependencies> <build> - <finalName>Seam-ejb</finalName> + <finalName>regressionArea-ejb</finalName> <plugins> <plugin> <artifactId>maven-ejb-plugin</artifactId> Copied: trunk/test-applications/regressionArea/regressionArea-web (from rev 10903, trunk/test-applications/regressionArea/Seam-web) Modified: trunk/test-applications/regressionArea/regressionArea-web/pom.xml =================================================================== --- trunk/test-applications/regressionArea/Seam-web/pom.xml 2008-10-24 17:59:09 UTC (rev 10903) +++ trunk/test-applications/regressionArea/regressionArea-web/pom.xml 2008-10-25 07:52:44 UTC (rev 10904) @@ -7,8 +7,8 @@ <version>3.3.0-SNAPSHOT</version> </parent> <groupId>org.richfaces.test-applications.regressionArea</groupId> - <artifactId>Seam-web</artifactId> - <name>Seam App Web Module</name> + <artifactId>regressionArea-web</artifactId> + <name>Regression Area Web Module</name> <packaging>war</packaging> <dependencies> @@ -41,7 +41,7 @@ </dependency> <dependency> <groupId>org.richfaces.test-applications.regressionArea</groupId> - <artifactId>Seam-ejb</artifactId> + <artifactId>regressionArea-ejb</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -77,11 +77,16 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>1.1.14</version> + </dependency> </dependencies> <build> - <finalName>Seam-web</finalName> + <finalName>regressionArea-web</finalName> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -138,7 +143,7 @@ </goals> <configuration> <tasks> - <copy file="../Seam-ear/resources/seam-ds.xml" toDir="${jbosshome}/server/${jbosscontext}/deploy"/> + <copy file="../regressionArea-ear/resources/seam-ds.xml" toDir="${jbosshome}/server/${jbosscontext}/deploy"/> </tasks> </configuration> </execution> @@ -185,7 +190,7 @@ <type>installed</type> <deployables> <deployable> - <location>${settings.localRepository}/org/richfaces/test-applications/regressionArea/Seam-ear/${version}/Seam-ear-${version}.ear</location> + <location>${settings.localRepository}/org/richfaces/test-applications/regressionArea/regressionArea-ear/${version}/regressionArea-ear-${version}.ear</location> <type>ear</type> </deployable> </deployables>