Author: chris.laprun(a)jboss.com Date: 2010-10-22 13:07:13 -0400 (Fri, 22 Oct 2010) New Revision: 4777 Modified: components/wsrp/trunk/admin-gui/pom.xml components/wsrp/trunk/api/pom.xml components/wsrp/trunk/common/pom.xml components/wsrp/trunk/consumer/pom.xml components/wsrp/trunk/hibernate-impl/pom.xml components/wsrp/trunk/pom.xml components/wsrp/trunk/producer/pom.xml components/wsrp/trunk/test/pom.xml components/wsrp/trunk/wsrp-producer-war/pom.xml components/wsrp/trunk/wsrp1-ws/pom.xml components/wsrp/trunk/wsrp2-ws/pom.xml Log: - Moved version to 2.0.0-Beta04 instead of CR01 since some issues still remain with PBR and RF over WSRP. :( - Upgraded to use PC 2.2.0-CR01. - Minor clean-ups and notes to investigate parallel "computer" to run tests in parallel. See: http://github.com/krosenvold/configurable-parallel-computer Modified: components/wsrp/trunk/admin-gui/pom.xml =================================================================== --- components/wsrp/trunk/admin-gui/pom.xml 2010-10-22 16:32:16 UTC (rev 4776) +++ components/wsrp/trunk/admin-gui/pom.xml 2010-10-22 17:07:13 UTC (rev 4777) @@ -21,11 +21,12 @@ ~ 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"> +<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"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR01-SNAPSHOT</version> + <version>2.0.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-admin-gui</artifactId> Modified: components/wsrp/trunk/api/pom.xml =================================================================== --- components/wsrp/trunk/api/pom.xml 2010-10-22 16:32:16 UTC (rev 4776) +++ components/wsrp/trunk/api/pom.xml 2010-10-22 17:07:13 UTC (rev 4777) @@ -21,11 +21,12 @@ ~ 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"> +<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"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR01-SNAPSHOT</version> + <version>2.0.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-integration-api</artifactId> Modified: components/wsrp/trunk/common/pom.xml =================================================================== --- components/wsrp/trunk/common/pom.xml 2010-10-22 16:32:16 UTC (rev 4776) +++ components/wsrp/trunk/common/pom.xml 2010-10-22 17:07:13 UTC (rev 4777) @@ -20,11 +20,12 @@ ~ 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"> +<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"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR01-SNAPSHOT</version> + <version>2.0.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-common</artifactId> @@ -101,6 +102,14 @@ <useDefaultDelimiters>false</useDefaultDelimiters> </configuration> </plugin> + <!--<plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <parallel>classes</parallel> + <threadCount>2</threadCount> + </configuration> + </plugin>--> </plugins> </build> </project> Modified: components/wsrp/trunk/consumer/pom.xml =================================================================== --- components/wsrp/trunk/consumer/pom.xml 2010-10-22 16:32:16 UTC (rev 4776) +++ components/wsrp/trunk/consumer/pom.xml 2010-10-22 17:07:13 UTC (rev 4777) @@ -21,11 +21,12 @@ ~ 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"> +<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"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR01-SNAPSHOT</version> + <version>2.0.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-consumer</artifactId> @@ -102,7 +103,7 @@ </dependency> </dependencies> - <!-- Ignore all classes in the org.gatein.wsrp.test packages are they are not tests --> + <!-- Ignore all classes in the org.gatein.wsrp.test packages as they are not tests --> <build> <plugins> <plugin> @@ -112,6 +113,8 @@ <excludes> <exclude>org/gatein/wsrp/test/**</exclude> </excludes> + <!--<parallel>classes</parallel> + <threadCount>2</threadCount>--> </configuration> </plugin> <plugin> Modified: components/wsrp/trunk/hibernate-impl/pom.xml =================================================================== --- components/wsrp/trunk/hibernate-impl/pom.xml 2010-10-22 16:32:16 UTC (rev 4776) +++ components/wsrp/trunk/hibernate-impl/pom.xml 2010-10-22 17:07:13 UTC (rev 4777) @@ -22,13 +22,14 @@ ~ 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/xsd/maven-4.0.0.xsd"> +<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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR01-SNAPSHOT</version> + <version>2.0.0-Beta04-SNAPSHOT</version> </parent> <groupId>org.gatein.wsrp</groupId> Modified: components/wsrp/trunk/pom.xml =================================================================== --- components/wsrp/trunk/pom.xml 2010-10-22 16:32:16 UTC (rev 4776) +++ components/wsrp/trunk/pom.xml 2010-10-22 17:07:13 UTC (rev 4777) @@ -21,7 +21,8 @@ ~ 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"> +<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> @@ -29,7 +30,7 @@ <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR01-SNAPSHOT</version> + <version>2.0.0-Beta04-SNAPSHOT</version> <packaging>pom</packaging> @@ -46,7 +47,7 @@ </scm> <properties> - <version.gatein.pc>2.2.0-Beta06</version.gatein.pc> + <version.gatein.pc>2.2.0-CR01</version.gatein.pc> <version.gatein.common>2.0.3-GA</version.gatein.common> <version.gatein.wci>2.0.2-GA</version.gatein.wci> @@ -159,6 +160,15 @@ <artifactId>google-collections</artifactId> <version>${version.google-collections}</version> </dependency> + + <!-- + TODO: Need to investigate this plugin to speed up tests + <dependency> + <groupId>org.jdogma.junit</groupId> + <artifactId>configurable-parallel-computer</artifactId> + <version>1.5</version> + <scope>test</scope> + </dependency>--> </dependencies> </dependencyManagement> Modified: components/wsrp/trunk/producer/pom.xml =================================================================== --- components/wsrp/trunk/producer/pom.xml 2010-10-22 16:32:16 UTC (rev 4776) +++ components/wsrp/trunk/producer/pom.xml 2010-10-22 17:07:13 UTC (rev 4777) @@ -21,11 +21,12 @@ ~ 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"> +<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"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR01-SNAPSHOT</version> + <version>2.0.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-producer-lib</artifactId> @@ -94,16 +95,14 @@ </dependency> </dependencies> - <!-- Disable some tests for now until we can find some time to work on migrating them --> <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <excludes> - <exclude>org/gatein/wsrp/protocol/v1/*</exclude> - </excludes> + <!--<parallel>classes</parallel> + <threadCount>2</threadCount>--> </configuration> </plugin> </plugins> Modified: components/wsrp/trunk/test/pom.xml =================================================================== --- components/wsrp/trunk/test/pom.xml 2010-10-22 16:32:16 UTC (rev 4776) +++ components/wsrp/trunk/test/pom.xml 2010-10-22 17:07:13 UTC (rev 4777) @@ -22,11 +22,12 @@ ~ 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/xsd/maven-4.0.0.xsd"> +<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/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR01-SNAPSHOT</version> + <version>2.0.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-10-22 16:32:16 UTC (rev 4776) +++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-10-22 17:07:13 UTC (rev 4777) @@ -22,11 +22,12 @@ ~ 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/xsd/maven-4.0.0.xsd"> +<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/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR01-SNAPSHOT</version> + <version>2.0.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -412,6 +413,8 @@ <excludes> <exclude>org/gatein/wsrp/protocol/v1/*</exclude> </excludes> + <!--<parallel>classes</parallel> + <threadCount>2</threadCount>--> </configuration> <executions> <execution> Modified: components/wsrp/trunk/wsrp1-ws/pom.xml =================================================================== --- components/wsrp/trunk/wsrp1-ws/pom.xml 2010-10-22 16:32:16 UTC (rev 4776) +++ components/wsrp/trunk/wsrp1-ws/pom.xml 2010-10-22 17:07:13 UTC (rev 4777) @@ -21,11 +21,12 @@ ~ 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"> +<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"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.0.0-CR01-SNAPSHOT</version> + <version>2.0.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-wsrp1-ws</artifactId> Modified: components/wsrp/trunk/wsrp2-ws/pom.xml =================================================================== --- components/wsrp/trunk/wsrp2-ws/pom.xml 2010-10-22 16:32:16 UTC (rev 4776) +++ components/wsrp/trunk/wsrp2-ws/pom.xml 2010-10-22 17:07:13 UTC (rev 4777) @@ -22,11 +22,12 @@ ~ 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/xsd/maven-4.0.0.xsd"> +<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/xsd/maven-4.0.0.xsd"> <parent> <artifactId>wsrp-parent</artifactId> <groupId>org.gatein.wsrp</groupId> - <version>2.0.0-CR01-SNAPSHOT</version> + <version>2.0.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-wsrp2-ws</artifactId>