[jboss-cvs] JBossAS SVN: r105732 - trunk/embedded.

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

Author: ALRubinger
Date: 2010-06-04 14:58:07 -0400 (Fri, 04 Jun 2010)
New Revision: 105732

Modified:
   trunk/embedded/pom.xml
Log:
[JBAS-8065] Remove Embedded integration tests from a profile; just use traditional Surefire config

Modified: trunk/embedded/pom.xml
===================================================================
--- trunk/embedded/pom.xml	2010-06-04 18:57:10 UTC (rev 105731)
+++ trunk/embedded/pom.xml	2010-06-04 18:58:07 UTC (rev 105732)
@@ -54,18 +54,32 @@
           <executable>${JAVA_HOME}/bin/javac</executable>
         </configuration>
       </plugin>
-
-      <!-- Surefire -->
+      
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
+          <additionalClasspathElements>
+            <additionalClasspathElement>${JBOSS_HOME}/client/jbossws-native-client.jar</additionalClasspathElement>
+            <!--
+              Because jbossweb.sar contains shared web.xml,
+              which must be visible from same CL as
+              TomcatDeployer.class.getClassLoader
+            -->
+            <additionalClasspathElement>${JBOSS_HOME}/server/default/deploy/jbossweb.sar</additionalClasspathElement>
+          </additionalClasspathElements>
           <redirectTestOutputToFile>true</redirectTestOutputToFile>
           <trimStackTrace>false</trimStackTrace>
           <printSummary>true</printSummary>
           <includes>
-            <include>**/*UnitTest.java</include>
+            <include>**/*IntegrationTest.java</include>
           </includes>
           <forkMode>always</forkMode>
+          <!--
+            MaxPermSize Required to bump the space for relective
+            data like classes, methods, etc. EMB-41. Endorsed
+            required for things like WS support (EMB-61)
+          -->
+          <argLine>-Xmx512m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Djava.endorsed.dirs=${JBOSS_HOME}/lib/endorsed -Djboss.home=${JBOSS_HOME} -Djboss.boot.server.log.dir=${JBOSS_HOME} -Dorg.jboss.reflect.spi.TypeInfoFactory=org.jboss.reflect.plugins.introspection.IntrospectionTypeInfoFactory</argLine>
         </configuration>
       </plugin>
 
@@ -128,57 +142,4 @@
     </dependencies>
   </dependencyManagement> -->
 
-  <profiles>
-    <profile>
-      <id>embedded</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>integration-test</id>
-                <phase>integration-test</phase>
-                <goals>
-                  <goal>test</goal>
-                </goals>
-
-                <configuration>
-                  <additionalClasspathElements>
-                    <additionalClasspathElement>${JBOSS_HOME}/client/jbossws-native-client.jar</additionalClasspathElement>
-                    <!--
-                      Because jbossweb.sar contains shared web.xml,
-                      which must be visible from same CL as
-                      TomcatDeployer.class.getClassLoader
-                    -->
-                    <additionalClasspathElement>${JBOSS_HOME}/server/default/deploy/jbossweb.sar</additionalClasspathElement>
-                  </additionalClasspathElements>
-
-                  <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                  <trimStackTrace>false</trimStackTrace>
-                  <printSummary>true</printSummary>
-                  <includes>
-                    <include>**/*IntegrationTest.java</include>
-                  </includes>
-                  <forkMode>always</forkMode>
-
-                  <!--
-                    MaxPermSize Required to bump the space for relective
-                    data like classes, methods, etc. EMB-41. Endorsed
-                    required for things like WS support (EMB-61)
-                  -->
-                  <argLine>-Xmx512m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Djava.endorsed.dirs=${JBOSS_HOME}/lib/endorsed -Djboss.home=${JBOSS_HOME} -Djboss.boot.server.log.dir=${JBOSS_HOME} -Dorg.jboss.reflect.spi.TypeInfoFactory=org.jboss.reflect.plugins.introspection.IntrospectionTypeInfoFactory</argLine>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
 </project>