[weld-commits] Weld SVN: r7089 - archetypes/javaee6-webapp/trunk.

[weld-commits at lists.jboss.org]

Author: dan.j.allen
Date: 2010-11-24 14:11:02 -0500 (Wed, 24 Nov 2010)
New Revision: 7089

Modified:
   archetypes/javaee6-webapp/trunk/pom.xml
Log:
change order of deployment to jboss as
change arquillian profile names


Modified: archetypes/javaee6-webapp/trunk/pom.xml
===================================================================
--- archetypes/javaee6-webapp/trunk/pom.xml	2010-11-24 19:10:22 UTC (rev 7088)
+++ archetypes/javaee6-webapp/trunk/pom.xml	2010-11-24 19:11:02 UTC (rev 7089)
@@ -8,7 +8,7 @@
    <packaging>war</packaging>
 
    <name>jboss-javaee6-webapp-src</name>
-   <description>A starter Java EE 6 webapp project generated from the jboss-javaee6-webapp archetype</description>
+   <description>A starter Java EE 6 webapp project that targets Java EE 6-compliant application servers, generated from the jboss-javaee6-webapp archetype</description>
 
    <properties>
       <!-- Explicitly declaring the source encoding eliminates the following message: -->
@@ -232,9 +232,10 @@
                      <jbossHome>${jboss.home}</jbossHome>
                      <serverName>${jboss.domain}</serverName>
                      <fileNames>
+                        <!-- JNDI DataSource that connects to in-memory HSQLDB to demonstrate JPA -->
+                        <fileName>src/main/resources-jbossas/default-ds.xml</fileName>
+                        <!-- DataSource needs to go before the application -->
                         <fileName>${project.build.directory}/${project.build.finalName}.war</fileName>
-                        <!-- JNDI Datasource that connects to in-memory HSQLDB to demonstrate JPA -->
-                        <fileName>src/main/resources-jbossas/default-ds.xml</fileName>
                      </fileNames>
                   </configuration>
                </plugin>
@@ -244,8 +245,8 @@
 
       <profile>
          <!-- An optional Arquillian testing profile that executes tests in GlassFish Embedded -->
-         <!-- Run with 'mvn clean test -Pglassfish-embedded-3' -->
-         <id>glassfish-embedded-3</id>
+         <!-- Run with 'mvn clean test -Parq-glassfish-embedded' -->
+         <id>arq-glassfish-embedded</id>
          <dependencies>
             <dependency>
                <groupId>org.jboss.arquillian.container</groupId>
@@ -257,7 +258,7 @@
             <dependency>
                <groupId>org.glassfish.extras</groupId>
                <artifactId>glassfish-embedded-all</artifactId>
-               <version>3.0.1-b20</version>
+               <version>3.0.1</version>
                <scope>provided</scope>
             </dependency>
          </dependencies>
@@ -293,8 +294,8 @@
       </profile>
       <profile>
          <!-- An optional Arquillian testing profile that executes tests in a remote JBoss AS instance -->
-         <!-- Run with 'mvn clean test -Pjbossas-remote-6' -->
-         <id>jbossas-remote-6</id>
+         <!-- Run with 'mvn clean test -Parq-jbossas-remote' -->
+         <id>arq-jbossas-remote</id>
          <dependencies>
             <dependency>
                <groupId>org.jboss.arquillian.container</groupId>