Updated Branches: refs/heads/master 8c540614e -> 8078097eb
DELTASPIKE-497 Added build-managed profile for Glassfish 3.1 Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/24982569 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/24982569 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/24982569 Branch: refs/heads/master Commit: 2498256926474e3aeed8088cb655dfc95088bbe7 Parents: 8c54061 Author: Christian Kaltepoth <[email protected]> Authored: Mon Jan 13 17:06:47 2014 +0100 Committer: Christian Kaltepoth <[email protected]> Committed: Mon Jan 13 17:06:47 2014 +0100 ---------------------------------------------------------------------- deltaspike/parent/code/pom.xml | 123 +++++++++++++++++++ .../src/main/resources/arquillian.xml | 8 ++ 2 files changed, 131 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/24982569/deltaspike/parent/code/pom.xml ---------------------------------------------------------------------- diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml index 9c59154..b3c6259 100644 --- a/deltaspike/parent/code/pom.xml +++ b/deltaspike/parent/code/pom.xml @@ -38,6 +38,7 @@ <container.unpack.directory>${java.io.tmpdir}/deltaspike-arquillian-containers</container.unpack.directory> <jboss.as.version>7.1.1.Final</jboss.as.version> <wildfly.version>8.0.0.CR1</wildfly.version> + <glassfish3.version>3.1.2.2</glassfish3.version> </properties> @@ -994,7 +995,129 @@ </profile> + <profile> + <!-- + * Glassfish will be downloaded as maven dependency + * + * Start the build with: + * $> mvn clean install -Pglassfish-build-managed-3 + * + --> + <id>glassfish-build-managed-3</id> + <properties> + <cdicontainer.version>weld-1.1.8</cdicontainer.version> + </properties> + + <dependencies> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <version>1.0-SP4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-glassfish-managed-3.1</artifactId> + <version>1.0.0.CR4</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <arquillian.launch>glassfish-build-managed-3</arquillian.launch> + <arquillian.glassfish3_home>${container.unpack.directory}/glassfish3</arquillian.glassfish3_home> + <org.apache.deltaspike.ProjectStage>UnitTest</org.apache.deltaspike.ProjectStage> + <cdicontainer.version>${cdicontainer.version}</cdicontainer.version> + </systemProperties> + <!-- we just use groups to mark that a test should be executed only + with specific environments. even though a java-ee6 application server has to be able to run + all tests in theory, we have to exclude some tests because there are e.g. packaging issues or + there are currently issues with arquillian. if a test isn't restricted to an environment, + no category is used for the test-class. --> + <excludedGroups> + org.apache.deltaspike.test.category.SeCategory + </excludedGroups> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack-glassfish3</id> + <phase>generate-test-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.glassfish.main.distributions</groupId> + <artifactId>glassfish</artifactId> + <version>${glassfish3.version}</version> + <outputDirectory>${container.unpack.directory}</outputDirectory> + <type>zip</type> + <overWrite>false</overWrite> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>prepare-glassfish3</id> + <phase>process-test-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <!-- Change all TCP ports from "xxxx" to "3xxxx" --> + <replace + file="${container.unpack.directory}/glassfish3/glassfish/domains/domain1/config/domain.xml" + token="port="8080"" value="port="38080"" /> + <replace + file="${container.unpack.directory}/glassfish3/glassfish/domains/domain1/config/domain.xml" + token="port="8181"" value="port="38181"" /> + <replace + file="${container.unpack.directory}/glassfish3/glassfish/domains/domain1/config/domain.xml" + token="port="4848"" value="port="34848"" /> + <replace + file="${container.unpack.directory}/glassfish3/glassfish/domains/domain1/config/domain.xml" + token="port="3700"" value="port="33700"" /> + <replace + file="${container.unpack.directory}/glassfish3/glassfish/domains/domain1/config/domain.xml" + token="port="8686"" value="port="38686"" /> + <replace + file="${container.unpack.directory}/glassfish3/glassfish/domains/domain1/config/domain.xml" + token="port="7676"" value="port="37676"" /> + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/24982569/deltaspike/test-utils/src/main/resources/arquillian.xml ---------------------------------------------------------------------- diff --git a/deltaspike/test-utils/src/main/resources/arquillian.xml b/deltaspike/test-utils/src/main/resources/arquillian.xml index bad06cb..aca4120 100644 --- a/deltaspike/test-utils/src/main/resources/arquillian.xml +++ b/deltaspike/test-utils/src/main/resources/arquillian.xml @@ -95,4 +95,12 @@ </configuration> </container> + + <container qualifier="glassfish-build-managed-3"> + <configuration> + <property name="glassFishHome">${arquillian.glassfish3_home}</property> + <property name="adminPort">34848</property> + </configuration> + </container> + </arquillian>
