From: <ble...@us...> - 2010-09-08 20:10:41
|
Revision: 3522 http://bigdata.svn.sourceforge.net/bigdata/?rev=3522&view=rev Author: blevine218 Date: 2010-09-08 20:10:34 +0000 (Wed, 08 Sep 2010) Log Message: ----------- Added dependency on distribution tarball Added support for starting/stopping services needed for integration tests Modified Paths: -------------- branches/maven_scaleout/bigdata-integ/pom.xml Modified: branches/maven_scaleout/bigdata-integ/pom.xml =================================================================== --- branches/maven_scaleout/bigdata-integ/pom.xml 2010-09-08 20:09:11 UTC (rev 3521) +++ branches/maven_scaleout/bigdata-integ/pom.xml 2010-09-08 20:10:34 UTC (rev 3522) @@ -13,15 +13,63 @@ <artifactId>bigdata-integration-test</artifactId> <name>bigdata Integration Tests</name> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.build.deployDirectory>${project.build.directory}/deploy</project.build.deployDirectory> + </properties> + + <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack</id> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>com.nokia.dataos.rds.bigdata</groupId> + <artifactId>bigdata-dist</artifactId> + <version>0.83.2-SNAPSHOT</version> + <type>tgz</type> + <outputDirectory>${project.build.deployDirectory}</outputDirectory> + </artifactItem> + </artifactItems> + <overWriteSnapshots>true</overWriteSnapshots> + <overWriteReleases>true</overWriteReleases> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + + <!-- + Make sure no tests are run as unit tests by + surefire. We want everything to run via failsafe + --> + + <excludes> + <exclude>**/**</exclude> + </excludes> + </configuration> + </plugin> + + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>failsafe-maven-plugin</artifactId> <version>2.4.3-alpha-1</version> <configuration> <includes> - <include>**/*Test.java</include> + <include>**/*.java</include> </includes> </configuration> <executions> @@ -33,6 +81,44 @@ </execution> </executions> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>start-test-services</id> + <phase>pre-integration-test</phase> + <configuration> + <tasks> + <ant + antfile="${project.build.testOutputDirectory}/test.xml" + target="hello" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + <execution> + <id>stop-test-services</id> + <phase>post-integration-test</phase> + <configuration> + <tasks> + <ant + antfile="${project.build.testOutputDirectory}/test.xml" + target="hello" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + + </plugin> + </plugins> </build> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ble...@us...> - 2010-09-13 19:57:14
|
Revision: 3538 http://bigdata.svn.sourceforge.net/bigdata/?rev=3538&view=rev Author: blevine218 Date: 2010-09-13 19:57:08 +0000 (Mon, 13 Sep 2010) Log Message: ----------- Really enable TestBigdataClientRemote this time! Modified Paths: -------------- branches/maven_scaleout/bigdata-integ/pom.xml Modified: branches/maven_scaleout/bigdata-integ/pom.xml =================================================================== --- branches/maven_scaleout/bigdata-integ/pom.xml 2010-09-13 19:56:24 UTC (rev 3537) +++ branches/maven_scaleout/bigdata-integ/pom.xml 2010-09-13 19:57:08 UTC (rev 3538) @@ -105,9 +105,7 @@ <include>**/Test*.java</include> <include>**/*Test.java</include> </includes> - <excludes> - <exclude>**/TestBigdataClientremove.java</exclude> - </excludes> + <systemPropertyVariables> <java.security.policy>${java.security.policy}</java.security.policy> <java.net.preferIPv4Stack>{java.net.preferIPv4Stack}"</java.net.preferIPv4Stack> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ble...@us...> - 2010-09-16 13:37:20
|
Revision: 3565 http://bigdata.svn.sourceforge.net/bigdata/?rev=3565&view=rev Author: blevine218 Date: 2010-09-16 13:37:11 +0000 (Thu, 16 Sep 2010) Log Message: ----------- In support of the integration test framework: - It is no longer required to set the federation.name system property when running the tests. - When the federation.name system property is not set and that property is not set in the deployment properties, a fallback value is set of the form bigdata.test.group-<ipaddress>. This is done in ConfigDeployUtil.getFederationName(). - default-deploy.properties was changed to set federation.name.default to the empty string rather then the @FED@ token. - A number of places that needed to retrieve the federation name, now call ConfigDeployUtil.getFederationName() for this purpose. Modified Paths: -------------- branches/maven_scaleout/bigdata-integ/pom.xml Modified: branches/maven_scaleout/bigdata-integ/pom.xml =================================================================== --- branches/maven_scaleout/bigdata-integ/pom.xml 2010-09-16 10:55:26 UTC (rev 3564) +++ branches/maven_scaleout/bigdata-integ/pom.xml 2010-09-16 13:37:11 UTC (rev 3565) @@ -117,8 +117,8 @@ <log4j.path>${log4j.configuration}</log4j.path> <default.nic>${default.nic}</default.nic> - <!-- Jini group name --> - <federation.name>${federation.name}</federation.name> + <!-- Jini group name + <federation.name>${federation.name}</federation.name> --> <!-- TODO !!!!!! <property key="java.class.path" value="${junit.classpath.text}" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ble...@us...> - 2010-09-20 19:40:58
|
Revision: 3597 http://bigdata.svn.sourceforge.net/bigdata/?rev=3597&view=rev Author: blevine218 Date: 2010-09-20 19:40:52 +0000 (Mon, 20 Sep 2010) Log Message: ----------- add *Remote tests to include pattern Modified Paths: -------------- branches/maven_scaleout/bigdata-integ/pom.xml Modified: branches/maven_scaleout/bigdata-integ/pom.xml =================================================================== --- branches/maven_scaleout/bigdata-integ/pom.xml 2010-09-20 18:00:40 UTC (rev 3596) +++ branches/maven_scaleout/bigdata-integ/pom.xml 2010-09-20 19:40:52 UTC (rev 3597) @@ -104,7 +104,12 @@ <includes> <include>**/Test*.java</include> <include>**/*Test.java</include> + <include>**/*TestRemote.java</include> + <include>**/Test*Remote.java</include> </includes> + <excludes> + <exclude>**/*Suite.java</exclude> + </excludes> <systemPropertyVariables> <java.security.policy>${java.security.policy}</java.security.policy> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ble...@us...> - 2010-09-21 15:00:46
|
Revision: 3604 http://bigdata.svn.sourceforge.net/bigdata/?rev=3604&view=rev Author: blevine218 Date: 2010-09-21 15:00:39 +0000 (Tue, 21 Sep 2010) Log Message: ----------- added surefire reporting Modified Paths: -------------- branches/maven_scaleout/bigdata-integ/pom.xml Modified: branches/maven_scaleout/bigdata-integ/pom.xml =================================================================== --- branches/maven_scaleout/bigdata-integ/pom.xml 2010-09-21 14:28:02 UTC (rev 3603) +++ branches/maven_scaleout/bigdata-integ/pom.xml 2010-09-21 15:00:39 UTC (rev 3604) @@ -220,4 +220,29 @@ </dependency> </dependencies> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>2.6</version> + <reportSets> + <reportSet> + <id>integration-tests</id> + <reports> + <report>report-only</report> + </reports> + <configuration> + <outputName>failsafe-report</outputName> + <reportsDirectories> + <reportsDirectory>${project.build.directory}/failsafe-reports</reportsDirectory> + </reportsDirectories> + </configuration> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> + + </project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sgo...@us...> - 2010-09-27 17:53:25
|
Revision: 3638 http://bigdata.svn.sourceforge.net/bigdata/?rev=3638&view=rev Author: sgossard Date: 2010-09-27 17:53:18 +0000 (Mon, 27 Sep 2010) Log Message: ----------- [maven_scaleout] : Minor tweak so maven will look for parent pom in the parent directory, which can reduce what needs to be previously installed via 'mvn install' when building a single sub-module. Modified Paths: -------------- branches/maven_scaleout/bigdata-integ/pom.xml Modified: branches/maven_scaleout/bigdata-integ/pom.xml =================================================================== --- branches/maven_scaleout/bigdata-integ/pom.xml 2010-09-27 16:28:41 UTC (rev 3637) +++ branches/maven_scaleout/bigdata-integ/pom.xml 2010-09-27 17:53:18 UTC (rev 3638) @@ -3,6 +3,7 @@ <groupId>com.bigdata</groupId> <artifactId>bigdata</artifactId> <version>0.83.2-SNAPSHOT</version> + <relativePath>../</relativePath> </parent> <modelVersion>4.0.0</modelVersion> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ble...@us...> - 2010-09-30 18:18:10
|
Revision: 3702 http://bigdata.svn.sourceforge.net/bigdata/?rev=3702&view=rev Author: blevine218 Date: 2010-09-30 18:18:03 +0000 (Thu, 30 Sep 2010) Log Message: ----------- added clover profile Modified Paths: -------------- branches/maven_scaleout/bigdata-integ/pom.xml Modified: branches/maven_scaleout/bigdata-integ/pom.xml =================================================================== --- branches/maven_scaleout/bigdata-integ/pom.xml 2010-09-30 17:00:47 UTC (rev 3701) +++ branches/maven_scaleout/bigdata-integ/pom.xml 2010-09-30 18:18:03 UTC (rev 3702) @@ -238,6 +238,23 @@ </plugin> </plugins> </reporting> + + <profiles> + <profile> + <id>bigdata-clover</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>com.atlassian.maven.plugins</groupId> + <artifactId>maven-clover2-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ble...@us...> - 2010-10-01 13:20:20
|
Revision: 3710 http://bigdata.svn.sourceforge.net/bigdata/?rev=3710&view=rev Author: blevine218 Date: 2010-10-01 13:20:12 +0000 (Fri, 01 Oct 2010) Log Message: ----------- Make the test output directory variable dependent on whether we are running code coverage (Clover) or not. Modified Paths: -------------- branches/maven_scaleout/bigdata-integ/pom.xml Modified: branches/maven_scaleout/bigdata-integ/pom.xml =================================================================== --- branches/maven_scaleout/bigdata-integ/pom.xml 2010-10-01 11:54:44 UTC (rev 3709) +++ branches/maven_scaleout/bigdata-integ/pom.xml 2010-10-01 13:20:12 UTC (rev 3710) @@ -28,7 +28,8 @@ <integ.deploy.dir>${integ.deploy.root.dir}/${integ.bigdata.dependency}-${project.version}</integ.deploy.dir> <integ.test.dir>${integ.deploy.dir}/testing</integ.test.dir> - <integ.testScript>${project.build.testOutputDirectory}/services.xml</integ.testScript> + <integ.testOutputDirectory>${project.build.testOutputDirectory}</integ.testOutputDirectory> + <integ.testScript>${integ.testOutputDirectory}/services.xml</integ.testScript> <integ.basedir>${integ.test.dir}</integ.basedir> <integ.app.home>${integ.deploy.dir}</integ.app.home> <integ.deploy.conf.dir>${integ.test.dir}/conf</integ.deploy.conf.dir> @@ -245,6 +246,9 @@ <activation> <activeByDefault>false</activeByDefault> </activation> + <properties> + <integ.testOutputDirectory>${project.build.directory}/clover/test-classes</integ.testOutputDirectory> + </properties> <build> <plugins> <plugin> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ble...@us...> - 2010-10-01 15:14:11
|
Revision: 3712 http://bigdata.svn.sourceforge.net/bigdata/?rev=3712&view=rev Author: blevine218 Date: 2010-10-01 15:14:05 +0000 (Fri, 01 Oct 2010) Log Message: ----------- append "-clover" to the deploy dir (the directory into which the deployment tarball is extracted) when the bigdata-clover profile is enabled for code coverage. Modified Paths: -------------- branches/maven_scaleout/bigdata-integ/pom.xml Modified: branches/maven_scaleout/bigdata-integ/pom.xml =================================================================== --- branches/maven_scaleout/bigdata-integ/pom.xml 2010-10-01 15:01:16 UTC (rev 3711) +++ branches/maven_scaleout/bigdata-integ/pom.xml 2010-10-01 15:14:05 UTC (rev 3712) @@ -248,6 +248,7 @@ </activation> <properties> <integ.testOutputDirectory>${project.build.directory}/clover/test-classes</integ.testOutputDirectory> + <integ.deploy.dir>${integ.deploy.root.dir}/${integ.bigdata.dependency}-${project.version}-clover</integ.deploy.dir> </properties> <build> <plugins> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |