Author: andrei_exadel Date: 2008-09-19 05:58:47 -0400 (Fri, 19 Sep 2008) New Revision: 10501 Removed: trunk/test-applications/regressionArea/Seam-ear/resources/testng.xml trunk/test-applications/regressionArea/Seam-web/src/main/copy-web-pages.bat trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/lib/commons-beanutils.jar trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/lib/commons-digester.jar trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/lib/jboss-seam-debug.jar trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/lib/jboss-seam-ioc.jar trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/lib/jboss-seam-mail.jar trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/lib/jboss-seam-pdf.jar trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/lib/jboss-seam-remoting.jar trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/lib/jboss-seam-ui.jar trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/lib/jsf-facelets.jar trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/lib/postgresql-8.3-603.jdbc3.jar Modified: trunk/test-applications/regressionArea/Seam-ear/pom.xml trunk/test-applications/regressionArea/Seam-ejb/pom.xml trunk/test-applications/regressionArea/Seam-web/pom.xml trunk/test-applications/regressionArea/pom.xml Log: Add RF And Seam versions properties Modified: trunk/test-applications/regressionArea/Seam-ear/pom.xml =================================================================== --- trunk/test-applications/regressionArea/Seam-ear/pom.xml 2008-09-18 17:15:51 UTC (rev 10500) +++ trunk/test-applications/regressionArea/Seam-ear/pom.xml 2008-09-19 09:58:47 UTC (rev 10501) @@ -13,20 +13,11 @@ <name>Seam App Ear Module</name> <packaging>ear</packaging> -<!-- - <distributionManagement> - <repository> - <id>repo</id> - <name>Repository Name</name> - <url>scp://repository-int.exadel.com</url> - </repository> - </distributionManagement> ---> <dependencies> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.1.4.GA</version> + <version>${richversion}</version> </dependency> <dependency> <groupId>org.richfaces.test-applications.regressionArea</groupId> @@ -38,7 +29,7 @@ <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam</artifactId> - <version>2.0.1.GA</version> + <version>${seamversion}</version> <type>ejb</type> <exclusions> <exclusion> @@ -83,42 +74,10 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.8</version> - <scope>test</scope> - <type>pom</type> - </dependency> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.8</version> - <scope>test</scope> - <classifier>jdk15</classifier> - </dependency> - <dependency> - <groupId>org.openqa.selenium.client-drivers</groupId> - <artifactId>selenium-java-client-driver</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.openqa.selenium.server</groupId> - <artifactId>selenium-server-coreless</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>jetty</groupId> - <artifactId>org.mortbay.jetty</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> <build> - <finalName>Seam</finalName> + <finalName>${appname}</finalName> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -127,111 +86,20 @@ <jboss> <version>4</version> <loader-repository> - seam.jboss.org:loader=Seam.ear + seam.jboss.org:loader=${appname}.ear </loader-repository> </jboss> - <displayName>Seam-ear</displayName> + <displayName>${appname}-ear</displayName> <defaultLibBundleDir>lib</defaultLibBundleDir> <modules> <webModule> <groupId>org.richfaces.test-applications.regressionArea</groupId> <artifactId>Seam-web</artifactId> - <contextRoot>/Seam</contextRoot> + <contextRoot>/${appname}</contextRoot> </webModule> </modules> </configuration> </plugin> - - </plugins> - <testResources> - <testResource> - <directory>resources</directory> - <targetPath>testng</targetPath> - <filtering>true</filtering> - </testResource> - </testResources> - </build> - <profiles> - <profile> - <id>Test</id> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-maven2-plugin</artifactId> - <version>0.3.1</version> - <executions> - <execution> - <id>start-container</id> - <phase>pre-integration-test</phase> - <goals> - <goal>start</goal> - </goals> - </execution> - <!--execution> - <phase>pre-integration-test</phase> - <goals> - <goal>deploy</goal> - </goals> - </execution--> - <execution> - <id>stop-container</id> - <phase>post-integration-test</phase> - <goals> - <goal>stop</goal> - </goals> - </execution> - </executions> - <configuration> - <wait>false</wait> - <container> - <containerId>jboss4x</containerId> - <home>D:/Install/Java/jboss-4.2.3.GA</home> - <append>false</append> - </container> - <configuration> - <home>D:/Install/Java/jboss-4.2.3.GA/server/default</home> - <type>existing</type> - <properties> - <cargo.hostname>localhost</cargo.hostname> - <cargo.jboss.configuration>default</cargo.jboss.configuration> - <cargo.rmi.port>1099</cargo.rmi.port> - </properties> - </configuration> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3</version> - <configuration> - <!-- <classesDirectory>../Seam-web/src/test/java</classesDirectory> --> - <!-- Skip the normal tests, we'll run them in the integration-test phase --> - - - <!-- suiteXmlFiles> - <suiteXmlFile> - resources/testng.xml - </suiteXmlFile> - </suiteXmlFiles--> - </configuration> - <executions> - <execution> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <includes> - <include>D:/Work/Projects/RichFaces/SVN/trunk/test-applications/regressionArea/Seam-web/src/test/java/org/richfaces/testng/SimpleTest.java</include> - </includes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - + </plugins> + </build> </project> Deleted: trunk/test-applications/regressionArea/Seam-ear/resources/testng.xml =================================================================== --- trunk/test-applications/regressionArea/Seam-ear/resources/testng.xml 2008-09-18 17:15:51 UTC (rev 10500) +++ trunk/test-applications/regressionArea/Seam-ear/resources/testng.xml 2008-09-19 09:58:47 UTC (rev 10501) @@ -1,21 +0,0 @@ -<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> -<suite name="seleniumTestDANe"> - <test name="IEFunctionalTests"> - <parameter name="browser" value="*iexplore"/> - <parameter name="loadStyleStrategy" value="DEFAULT"/> - <parameter name="loadScriptStrategy" value="ALL"/> - <parameter name="filterPrefix" value="/faces/NEKO/"/> - <packages> - <package name="org.richfaces.testng" /> - </packages> - </test> - <test name="FireFoxFunctionalTestsDANe"> - <parameter name="loadStyleStrategy" value="DEFAULT"/> - <parameter name="loadScriptStrategy" value="ALL"/> - <parameter name="filterPrefix" value="/faces/NEKO/"/> - <parameter name="browser" value="*firefox"/> - <packages> - <package name="org.richfaces.testng" /> - </packages> - </test> -</suite> Modified: trunk/test-applications/regressionArea/Seam-ejb/pom.xml =================================================================== --- trunk/test-applications/regressionArea/Seam-ejb/pom.xml 2008-09-18 17:15:51 UTC (rev 10500) +++ trunk/test-applications/regressionArea/Seam-ejb/pom.xml 2008-09-19 09:58:47 UTC (rev 10501) @@ -11,20 +11,30 @@ <name>Seam App EJB Module</name> <packaging>ejb</packaging> <dependencies> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>${jsfversion}</version> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>${jsfversion}</version> + </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.1.4.GA</version> + <version>${richversion}</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.1.4.GA</version> + <version>${richversion}</version> </dependency> <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-remoting</artifactId> - <version>2.0.1.GA</version> + <version>${seamversion}</version> <exclusions> <exclusion> <artifactId>javassist</artifactId> @@ -35,12 +45,12 @@ <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-ui</artifactId> - <version>2.0.1.GA</version> + <version>${seamversion}</version> </dependency> <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-debug</artifactId> - <version>2.0.1.GA</version> + <version>${seamversion}</version> </dependency> <dependency> <groupId>com.sun.facelets</groupId> Modified: trunk/test-applications/regressionArea/Seam-web/pom.xml =================================================================== --- trunk/test-applications/regressionArea/Seam-web/pom.xml 2008-09-18 17:15:51 UTC (rev 10500) +++ trunk/test-applications/regressionArea/Seam-web/pom.xml 2008-09-19 09:58:47 UTC (rev 10501) @@ -60,6 +60,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> + <!--skip>true</skip--> <source>1.5</source> <target>1.5</target> </configuration> @@ -103,12 +104,6 @@ <goal>start</goal> </goals> </execution> - <!--execution> - <phase>pre-integration-test</phase> - <goals> - <goal>deploy</goal> - </goals> - </execution--> <execution> <id>stop-container</id> <phase>post-integration-test</phase> @@ -121,15 +116,15 @@ <wait>false</wait> <container> <containerId>jboss4x</containerId> - <home>D:/Install/Java/jboss-4.2.3.GA</home> + <home>${jbosshome}</home> <append>false</append> </container> <configuration> - <home>D:/Install/Java/jboss-4.2.3.GA/server/default</home> + <home>${jbosshome}/server/${jbosscontext}</home> <type>existing</type> <properties> <cargo.hostname>localhost</cargo.hostname> - <cargo.jboss.configuration>default</cargo.jboss.configuration> + <cargo.jboss.configuration>${jbosscontext}</cargo.jboss.configuration> <cargo.rmi.port>1099</cargo.rmi.port> </properties> </configuration> @@ -140,7 +135,7 @@ <groupId>org.richfaces.test-applications.regressionArea</groupId> <artifactId>Seam-ear</artifactId> <type>ear</type> - <pingURL>http://localhost:8080/Seam/</pingURL> + <pingURL>http://localhost:${jbossport}/${Seam}/</pingURL> </deployable> </deployables> </deployer> Deleted: trunk/test-applications/regressionArea/Seam-web/src/main/copy-web-pages.bat =================================================================== --- trunk/test-applications/regressionArea/Seam-web/src/main/copy-web-pages.bat 2008-09-18 17:15:51 UTC (rev 10500) +++ trunk/test-applications/regressionArea/Seam-web/src/main/copy-web-pages.bat 2008-09-19 09:58:47 UTC (rev 10501) @@ -1,2 +0,0 @@ -xcopy "webapp" "H:\\jbdevstudio\\jboss-eap\\jboss-as\\server\\default\\deploy\\APMS-ear-1.0-SNAPSHOT.ear\\APMS-1.0-SNAPSHOT.war" /D /S /E /Y - \ No newline at end of file Deleted: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/lib/commons-beanutils.jar =================================================================== (Binary files differ) Deleted: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/lib/commons-digester.jar =================================================================== (Binary files differ) Deleted: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/lib/jboss-seam-debug.jar =================================================================== (Binary files differ) Deleted: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/lib/jboss-seam-ioc.jar =================================================================== (Binary files differ) Deleted: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/lib/jboss-seam-mail.jar =================================================================== (Binary files differ) Deleted: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/lib/jboss-seam-pdf.jar =================================================================== (Binary files differ) Deleted: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/lib/jboss-seam-remoting.jar =================================================================== (Binary files differ) Deleted: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/lib/jboss-seam-ui.jar =================================================================== (Binary files differ) Deleted: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/lib/jsf-facelets.jar =================================================================== (Binary files differ) Deleted: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/lib/postgresql-8.3-603.jdbc3.jar =================================================================== (Binary files differ) Modified: trunk/test-applications/regressionArea/pom.xml =================================================================== --- trunk/test-applications/regressionArea/pom.xml 2008-09-18 17:15:51 UTC (rev 10500) +++ trunk/test-applications/regressionArea/pom.xml 2008-09-19 09:58:47 UTC (rev 10501) @@ -5,9 +5,7 @@ <artifactId>regressionArea</artifactId> <packaging>pom</packaging> <version>1.0-SNAPSHOT</version> - <name>Regresion Area:Seam Applicationt</name> - <properties> - </properties> + <name>Regresion Area:Seam Application</name> <repositories> <repository> @@ -23,6 +21,16 @@ </repository> </repositories> + <properties> + <appname>Seam</appname> + <richversion>3.2.2.GA</richversion> + <seamversion>2.0.1.GA</seamversion> + <jsfversion>1.2_09</jsfversion> + <jbosshome>D:/Install/Java/jboss-4.2.3.GA</jbosshome> + <jbosscontext>default</jbosscontext> + <jbossport>8080</jbossport> + </properties> + <modules> <module>Seam-ejb</module>