[jboss-cvs] JBossAS SVN: r111791 - trunk/resteasy-int/test/cdi-test-2.

[jboss-cvs-commits at lists.jboss.org]

Author: jharting
Date: 2011-07-20 08:16:20 -0400 (Wed, 20 Jul 2011)
New Revision: 111791

Modified:
   trunk/resteasy-int/test/cdi-test-2/pom.xml
Log:
Added AS7 profile.

Modified: trunk/resteasy-int/test/cdi-test-2/pom.xml
===================================================================
--- trunk/resteasy-int/test/cdi-test-2/pom.xml	2011-07-20 08:38:46 UTC (rev 111790)
+++ trunk/resteasy-int/test/cdi-test-2/pom.xml	2011-07-20 12:16:20 UTC (rev 111791)
@@ -35,12 +35,12 @@
 			<artifactId>resteasy-jaxrs</artifactId>
 			<version>${version.org.jboss.resteasy}</version>
 			<scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>jboss.web</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-            </exclusions>
+			<exclusions>
+				<exclusion>
+					<groupId>jboss.web</groupId>
+					<artifactId>servlet-api</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>
@@ -94,43 +94,8 @@
 	</repositories>
 
 	<build>
-		<finalName>resteasy-cdi</finalName>
 		<plugins>
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>jboss-maven-plugin</artifactId>
-				<version>1.3.1</version>
-				<configuration>
-					<jbossHome>${jboss.home}</jbossHome>
-				</configuration>
-				<executions>
-					<execution>
-						<id>jboss-deploy</id>
-						<phase>pre-integration-test</phase>
-						<goals>
-							<goal>deploy</goal>
-						</goals>
-						<configuration>
-							<fileNames>
-								<fileName>${basedir}/target/${build.finalName}.war</fileName>
-							</fileNames>
-						</configuration>
-					</execution>
-					<execution>
-						<id>jboss-undeploy</id>
-						<phase>post-integration-test</phase>
-						<goals>
-							<goal>undeploy</goal>
-						</goals>
-						<configuration>
-							<fileNames>
-								<fileName>${basedir}/target/${build.finalName}.war</fileName>
-							</fileNames>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
@@ -162,6 +127,95 @@
 
 	<profiles>
 		<profile>
+			<id>jbossas7</id>
+			<build>
+				<finalName>resteasy-cdi</finalName>
+				<plugins>
+					<plugin>
+						<groupId>org.jboss.as.plugins</groupId>
+						<artifactId>jboss-as-maven-plugin</artifactId>
+						<version>7.0.0.Final</version>
+
+						<configuration>
+							<jbossHome>${jboss.home}</jbossHome>
+						</configuration>
+						<executions>
+							<execution>
+								<id>jboss-deploy</id>
+								<phase>pre-integration-test</phase>
+								<goals>
+									<goal>deploy</goal>
+								</goals>
+								<configuration>
+									<fileNames>
+										<fileName>${basedir}/target/${build.finalName}.war</fileName>
+									</fileNames>
+								</configuration>
+							</execution>
+							<execution>
+								<id>jboss-undeploy</id>
+								<phase>post-integration-test</phase>
+								<goals>
+									<goal>undeploy</goal>
+								</goals>
+								<configuration>
+									<fileNames>
+										<fileName>${basedir}/target/${build.finalName}.war</fileName>
+									</fileNames>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>jbossas6</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<build>
+				<finalName>resteasy-cdi</finalName>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>jboss-maven-plugin</artifactId>
+						<version>1.3.1</version>
+						<configuration>
+							<jbossHome>${jboss.home}</jbossHome>
+						</configuration>
+						<executions>
+							<execution>
+								<id>jboss-deploy</id>
+								<phase>pre-integration-test</phase>
+								<goals>
+									<goal>deploy</goal>
+								</goals>
+								<configuration>
+									<fileNames>
+										<fileName>${basedir}/target/${build.finalName}.war</fileName>
+									</fileNames>
+								</configuration>
+							</execution>
+							<execution>
+								<id>jboss-undeploy</id>
+								<phase>post-integration-test</phase>
+								<goals>
+									<goal>undeploy</goal>
+								</goals>
+								<configuration>
+									<fileNames>
+										<fileName>${basedir}/target/${build.finalName}.war</fileName>
+									</fileNames>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+
+		</profile>
+		<profile>
 			<id>resin</id>
 			<dependencies>
 				<dependency>