Author: jasha
Date: Tue May 29 18:21:12 2012
New Revision: 1343894

URL: http://svn.apache.org/viewvc?rev=1343894&view=rev
Log:
RAVE-610 add integration test modules to default profile, but only execute the 
tests in specific profile

Modified:
    rave/trunk/pom.xml
    rave/trunk/rave-integration-tests/pom.xml
    rave/trunk/rave-integration-tests/rave-admin-tests/pom.xml
    
rave/trunk/rave-integration-tests/rave-core-tests/src/main/resources/applicationContext-tests.xml
    rave/trunk/rave-integration-tests/rave-default-account-tests/pom.xml
    rave/trunk/rave-integration-tests/rave-newuser-tests/pom.xml

Modified: rave/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/pom.xml?rev=1343894&r1=1343893&r2=1343894&view=diff
==============================================================================
--- rave/trunk/pom.xml (original)
+++ rave/trunk/pom.xml Tue May 29 18:21:12 2012
@@ -8,7 +8,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
@@ -16,9 +16,7 @@
   KIND, either express or implied.  See the License for the
   specific language governing permissions and limitations
   under the License.
-
-  $Id$
--->
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
 
     <modelVersion>4.0.0</modelVersion>
@@ -664,6 +662,7 @@
         <module>rave-portal-dependencies</module>
         <module>rave-demo-gadgets</module>
         <module>rave-portal</module>
+        <module>rave-integration-tests</module>
     </modules>
     <profiles>
         <profile>
@@ -716,15 +715,6 @@
                     </plugin>
                 </plugins>
             </build>
-            <modules>
-                <module>rave-components</module>
-                <module>rave-providers</module>
-                <module>rave-portal-resources</module>
-                <module>rave-portal-dependencies</module>
-                <module>rave-demo-gadgets</module>
-                <module>rave-portal</module>
-                <module>rave-integration-tests</module>
-            </modules>
         </profile>
     </profiles>
 </project>

Modified: rave/trunk/rave-integration-tests/pom.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-integration-tests/pom.xml?rev=1343894&r1=1343893&r2=1343894&view=diff
==============================================================================
--- rave/trunk/rave-integration-tests/pom.xml (original)
+++ rave/trunk/rave-integration-tests/pom.xml Tue May 29 18:21:12 2012
@@ -34,15 +34,16 @@
 
     <packaging>pom</packaging>
     <name>Apache Rave :: rave-integration-tests</name>
-    <description>JBehave stories verifying functionality of Apache Rave using 
Java and Spring</description>
+    <description>Test stories verifying functionality of Apache Rave using 
Java and Spring</description>
 
     <properties>
         <jbehave.core.version>3.6.1</jbehave.core.version>
         <jbehave.web.version>3.5.1</jbehave.web.version>
         <jbehave.site.version>3.1.1</jbehave.site.version>
         <org.hamcrest.version>1.2.1</org.hamcrest.version>
+        <commons-logging.version>1.1.1</commons-logging.version>
         <!-- New Selenium versions are often needed after an upgrade of 
Mozilla Firefox -->
-        <selenium.version>[2.20.0, 2.99)</selenium.version>
+        <selenium.version>[2.20.0, 2.22)</selenium.version>
         <meta.filter/>
 
         <!-- Cargo configuration properties -->
@@ -73,7 +74,12 @@
                 <artifactId>hamcrest-integration</artifactId>
                 <version>${org.hamcrest.version}</version>
             </dependency>
-
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>${commons-logging.version}</version>
+                <scope>compile</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -164,7 +170,6 @@
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.1.1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
@@ -181,125 +186,147 @@
                         <target>1.6</target>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.jbehave</groupId>
+                    <artifactId>jbehave-maven-plugin</artifactId>
+                    <version>${jbehave.core.version}</version>
+                    <executions>
+                        <execution>
+                            <id>unpack-view-resources</id>
+                            <phase>process-resources</phase>
+                            <goals>
+                                <goal>unpack-view-resources</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>embeddable-stories</id>
+                            <phase>integration-test</phase>
+                            <configuration>
+                                <includes>
+                                    <include>**/*Stories.java</include>
+                                </includes>
+                                <excludes/>
+                                
<generateViewAfterStories>true</generateViewAfterStories>
+                                
<ignoreFailureInStories>true</ignoreFailureInStories>
+                                <ignoreFailureInView>true</ignoreFailureInView>
+                                <metaFilters>
+                                    <metaFilter>${meta.filter}</metaFilter>
+                                </metaFilters>
+                            </configuration>
+                            <goals>
+                                <goal>run-stories-as-embeddables</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
             </plugins>
         </pluginManagement>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.7</version>
-                <executions>
-                    <execution>
-                        <phase>initialize</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
+    </build>
+    <profiles>
+        <profile>
+            <id>integration-tests</id>
+            <build>
+                <defaultGoal>integration-test</defaultGoal>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.cargo</groupId>
+                        <artifactId>cargo-maven2-plugin</artifactId>
+                        <version>${cargo.version}</version>
+                        <executions>
+                            <execution>
+                                <id>start-container</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start</goal>
+                                </goals>
+                                <inherited>false</inherited>
+                            </execution>
+                        </executions>
                         <configuration>
-                            <target>
-                                <delete>
-                                    <fileset dir="/tmp" includes="rave_db*"/>
-                                </delete>
-                            </target>
-                        </configuration>
-                        <inherited>false</inherited>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.cargo</groupId>
-                <artifactId>cargo-maven2-plugin</artifactId>
-                <version>${cargo.version}</version>
-                <executions>
-                    <execution>
-                        <id>start-container</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start</goal>
-                        </goals>
-                        <inherited>false</inherited>
-                    </execution>
-                </executions>
-                <configuration>
-                    <configuration>
-                        <properties>
-                            <cargo.jvmargs>
-                                <![CDATA[-Dh2.bindAddress="localhost" -Xdebug 
-XX:MaxPermSize=256m 
-Xrunjdwp:transport=dt_socket,address=${cargo.debug.address},server=y,suspend=${cargo.debug.suspend}
 -noverify ${javaagent} ${cargo.args}]]>
-                            </cargo.jvmargs>
-                            
<cargo.tomcat.context.reloadable>true</cargo.tomcat.context.reloadable>
-                        </properties>
-                        <home>${project.build.directory}/tomcat6x</home>
-                        <deployables>
-                            <deployable>
-                                <groupId>org.apache.wookie</groupId>
-                                <artifactId>wookie</artifactId>
-                                <type>war</type>
+                            <configuration>
                                 <properties>
-                                    <context>/wookie</context>
+                                    <cargo.jvmargs>
+                                        <![CDATA[-Dh2.bindAddress="localhost" 
-Xdebug -XX:MaxPermSize=256m 
-Xrunjdwp:transport=dt_socket,address=${cargo.debug.address},server=y,suspend=${cargo.debug.suspend}
 -noverify ${javaagent} ${cargo.args}]]>
+                                    </cargo.jvmargs>
+                                    
<cargo.tomcat.context.reloadable>true</cargo.tomcat.context.reloadable>
                                 </properties>
-                            </deployable>
-                            <deployable>
-                                <groupId>org.apache.rave</groupId>
-                                <artifactId>rave-shindig</artifactId>
-                                <type>war</type>
-                                <properties>
-                                    <context>/ROOT</context>
-                                </properties>
-                            </deployable>
-                            <deployable>
-                                <groupId>org.apache.rave</groupId>
-                                <artifactId>rave-demo-gadgets</artifactId>
-                                <type>war</type>
-                                <properties>
-                                    <context>/demogadgets</context>
-                                </properties>
-                            </deployable>
-                            <deployable>
-                                <groupId>org.apache.rave</groupId>
-                                <artifactId>rave-portal</artifactId>
-                                <type>war</type>
-                                <properties>
-                                    <context>/portal</context>
-                                </properties>
-                            </deployable>
-                        </deployables>
-                        <configfiles>
-                            <configfile>
-                                
<file>${project.basedir}/../rave-portal-resources/src/main/dist/conf/tomcat-users.xml
-                                </file>
-                                <todir>conf/</todir>
-                                <tofile>tomcat-users.xml</tofile>
-                            </configfile>
-                        </configfiles>
-                    </configuration>
-                    <container>
-                        <containerId>tomcat6x</containerId>
-                        <timeout>180000</timeout>
-                        <zipUrlInstaller>
-                            
<downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives
-                            </downloadDir>
-                            <url>
-                                
http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz
-                            </url>
-                        </zipUrlInstaller>
-                        <systemProperties>
-                            
<net.sf.ehcache.skipUpdateCheck>true</net.sf.ehcache.skipUpdateCheck>
-                        </systemProperties>
-                        <dependencies>
-                            <dependency>
-                                <groupId>javax.mail</groupId>
-                                <artifactId>mail</artifactId>
-                                <classpath>shared</classpath>
-                            </dependency>
-                            <dependency>
-                                <groupId>javax.activation</groupId>
-                                <artifactId>activation</artifactId>
-                                <classpath>shared</classpath>
-                            </dependency>
-                        </dependencies>
-                    </container>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+                                
<home>${project.build.directory}/tomcat6x</home>
+                                <deployables>
+                                    <deployable>
+                                        <groupId>org.apache.wookie</groupId>
+                                        <artifactId>wookie</artifactId>
+                                        <type>war</type>
+                                        <properties>
+                                            <context>/wookie</context>
+                                        </properties>
+                                    </deployable>
+                                    <deployable>
+                                        <groupId>org.apache.rave</groupId>
+                                        <artifactId>rave-shindig</artifactId>
+                                        <type>war</type>
+                                        <properties>
+                                            <context>/ROOT</context>
+                                        </properties>
+                                    </deployable>
+                                    <deployable>
+                                        <groupId>org.apache.rave</groupId>
+                                        
<artifactId>rave-demo-gadgets</artifactId>
+                                        <type>war</type>
+                                        <properties>
+                                            <context>/demogadgets</context>
+                                        </properties>
+                                    </deployable>
+                                    <deployable>
+                                        <groupId>org.apache.rave</groupId>
+                                        <artifactId>rave-portal</artifactId>
+                                        <type>war</type>
+                                        <properties>
+                                            <context>/portal</context>
+                                        </properties>
+                                    </deployable>
+                                </deployables>
+                                <configfiles>
+                                    <configfile>
+                                        <file>
+                                            
${project.basedir}/../rave-portal-resources/src/main/dist/conf/tomcat-users.xml
+                                        </file>
+                                        <todir>conf/</todir>
+                                        <tofile>tomcat-users.xml</tofile>
+                                    </configfile>
+                                </configfiles>
+                            </configuration>
+                            <container>
+                                <containerId>tomcat6x</containerId>
+                                <timeout>180000</timeout>
+                                <zipUrlInstaller>
+                                    
<downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives
+                                    </downloadDir>
+                                    <url>
+                                        
http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz
+                                    </url>
+                                </zipUrlInstaller>
+                                <systemProperties>
+                                    
<net.sf.ehcache.skipUpdateCheck>true</net.sf.ehcache.skipUpdateCheck>
+                                </systemProperties>
+                                <dependencies>
+                                    <dependency>
+                                        <groupId>javax.mail</groupId>
+                                        <artifactId>mail</artifactId>
+                                        <classpath>shared</classpath>
+                                    </dependency>
+                                    <dependency>
+                                        <groupId>javax.activation</groupId>
+                                        <artifactId>activation</artifactId>
+                                        <classpath>shared</classpath>
+                                    </dependency>
+                                </dependencies>
+                            </container>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
     <modules>
         <module>rave-core-tests</module>
         <module>rave-newuser-tests</module>

Modified: rave/trunk/rave-integration-tests/rave-admin-tests/pom.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-integration-tests/rave-admin-tests/pom.xml?rev=1343894&r1=1343893&r2=1343894&view=diff
==============================================================================
--- rave/trunk/rave-integration-tests/rave-admin-tests/pom.xml (original)
+++ rave/trunk/rave-integration-tests/rave-admin-tests/pom.xml Tue May 29 
18:21:12 2012
@@ -20,71 +20,51 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.rave.integration-tests</groupId>
-  <artifactId>rave-admin-tests</artifactId>
-  <name>Apache Rave :: rave-admin-tests</name>
-  <description>Integration tests for administrative functions</description>
-
-  <parent>
+    <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.rave.integration-tests</groupId>
-    <artifactId>rave-integration-tests</artifactId>
-    <version>0.12-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
+    <artifactId>rave-admin-tests</artifactId>
+    <name>Apache Rave :: rave-admin-tests</name>
+    <description>Integration tests for administrative functions</description>
+
+    <parent>
+        <groupId>org.apache.rave.integration-tests</groupId>
+        <artifactId>rave-integration-tests</artifactId>
+        <version>0.12-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
 
-  <dependencies>
-    <!-- This is the core tests jar that we just made in a previous module -->
-    <dependency>
-      <groupId>org.apache.rave.integration-tests</groupId>
-      <artifactId>rave-core-tests</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
+    <dependencies>
+        <!-- This is the core tests jar that we just made in a previous module 
-->
+        <dependency>
+            <groupId>org.apache.rave.integration-tests</groupId>
+            <artifactId>rave-core-tests</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
 
-  <build>
-    <resources>
-      <resource>
-        <directory>${basedir}/src/main/resources</directory>
-      </resource>
-      <resource>
-        <directory>${basedir}/src/main/stories</directory>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.jbehave</groupId>
-        <artifactId>jbehave-maven-plugin</artifactId>
-        <version>${jbehave.core.version}</version>
-        <executions>
-          <execution>
-            <id>unpack-view-resources</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>unpack-view-resources</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>embeddable-stories</id>
-            <phase>integration-test</phase>
-            <configuration>
-              <includes>
-                <include>**/*Stories.java</include>
-              </includes>
-              <excludes/>
-              <generateViewAfterStories>true</generateViewAfterStories>
-              <ignoreFailureInStories>true</ignoreFailureInStories>
-              <ignoreFailureInView>true</ignoreFailureInView>
-              <metaFilters>
-                <metaFilter>${meta.filter}</metaFilter>
-              </metaFilters>
-            </configuration>
-            <goals>
-              <goal>run-stories-as-embeddables</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+    <build>
+        <resources>
+            <resource>
+                <directory>${basedir}/src/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>${basedir}/src/main/stories</directory>
+            </resource>
+        </resources>
+    </build>
+    <profiles>
+        <profile>
+            <id>integration-tests</id>
+            <build>
+                <defaultGoal>integration-test</defaultGoal>
+                <plugins>
+                    <plugin>
+                        <groupId>org.jbehave</groupId>
+                        <artifactId>jbehave-maven-plugin</artifactId>
+                        <version>${jbehave.core.version}</version>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

Modified: 
rave/trunk/rave-integration-tests/rave-core-tests/src/main/resources/applicationContext-tests.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-integration-tests/rave-core-tests/src/main/resources/applicationContext-tests.xml?rev=1343894&r1=1343893&r2=1343894&view=diff
==============================================================================
--- 
rave/trunk/rave-integration-tests/rave-core-tests/src/main/resources/applicationContext-tests.xml
 (original)
+++ 
rave/trunk/rave-integration-tests/rave-core-tests/src/main/resources/applicationContext-tests.xml
 Tue May 29 18:21:12 2012
@@ -22,16 +22,16 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
        xmlns:context="http://www.springframework.org/schema/context";
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-  http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+  http://www.springframework.org/schema/beans/spring-beans.xsd
   http://www.springframework.org/schema/context
-  http://www.springframework.org/schema/context/spring-context-3.1.xsd";>
+  http://www.springframework.org/schema/context/spring-context.xsd";>
 
 
   <context:annotation-config/>
 
   <context:component-scan base-package="org.apache.rave.integrationtests"/>
 
-  <bean id="driverProvider" 
class="org.jbehave.web.selenium.FirefoxWebDriverProvider"/>
+  <bean id="driverProvider" 
class="org.jbehave.web.selenium.DefaultWebDriverProvider"/>
 
   <bean id="lifecycleSteps" 
class="org.apache.rave.integrationtests.steps.LifecycleSteps">
     <constructor-arg ref="driverProvider"/>

Modified: rave/trunk/rave-integration-tests/rave-default-account-tests/pom.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-integration-tests/rave-default-account-tests/pom.xml?rev=1343894&r1=1343893&r2=1343894&view=diff
==============================================================================
--- rave/trunk/rave-integration-tests/rave-default-account-tests/pom.xml 
(original)
+++ rave/trunk/rave-integration-tests/rave-default-account-tests/pom.xml Tue 
May 29 18:21:12 2012
@@ -20,71 +20,51 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.rave.integration-tests</groupId>
-  <artifactId>rave-default-account-tests</artifactId>
-  <name>Apache Rave :: rave-default-account-tests</name>
-  <description>Default account portal stories for canonical, john.doe, 
johnldap and openid</description>
-
-  <parent>
+    <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.rave.integration-tests</groupId>
-    <artifactId>rave-integration-tests</artifactId>
-    <version>0.12-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
+    <artifactId>rave-default-account-tests</artifactId>
+    <name>Apache Rave :: rave-default-account-tests</name>
+    <description>Default account portal stories for canonical, john.doe, 
johnldap and openid</description>
+
+    <parent>
+        <groupId>org.apache.rave.integration-tests</groupId>
+        <artifactId>rave-integration-tests</artifactId>
+        <version>0.12-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
 
-  <dependencies>
-    <!-- This is the core tests jar that we just made in a previous module -->
-    <dependency>
-      <groupId>org.apache.rave.integration-tests</groupId>
-      <artifactId>rave-core-tests</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
+    <dependencies>
+        <!-- This is the core tests jar that we just made in a previous module 
-->
+        <dependency>
+            <groupId>org.apache.rave.integration-tests</groupId>
+            <artifactId>rave-core-tests</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
 
-  <build>
-    <resources>
-      <resource>
-        <directory>${basedir}/src/main/resources</directory>
-      </resource>
-      <resource>
-        <directory>${basedir}/src/main/stories</directory>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.jbehave</groupId>
-        <artifactId>jbehave-maven-plugin</artifactId>
-        <version>${jbehave.core.version}</version>
-        <executions>
-          <execution>
-            <id>unpack-view-resources</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>unpack-view-resources</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>embeddable-stories</id>
-            <phase>integration-test</phase>
-            <configuration>
-              <includes>
-                <include>**/*Stories.java</include>
-              </includes>
-              <excludes/>
-              <generateViewAfterStories>true</generateViewAfterStories>
-              <ignoreFailureInStories>true</ignoreFailureInStories>
-              <ignoreFailureInView>true</ignoreFailureInView>
-              <metaFilters>
-                <metaFilter>${meta.filter}</metaFilter>
-              </metaFilters>
-            </configuration>
-            <goals>
-              <goal>run-stories-as-embeddables</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+    <build>
+        <resources>
+            <resource>
+                <directory>${basedir}/src/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>${basedir}/src/main/stories</directory>
+            </resource>
+        </resources>
+    </build>
+    <profiles>
+        <profile>
+            <id>integration-tests</id>
+            <build>
+                <defaultGoal>integration-test</defaultGoal>
+                <plugins>
+                    <plugin>
+                        <groupId>org.jbehave</groupId>
+                        <artifactId>jbehave-maven-plugin</artifactId>
+                        <version>${jbehave.core.version}</version>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

Modified: rave/trunk/rave-integration-tests/rave-newuser-tests/pom.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-integration-tests/rave-newuser-tests/pom.xml?rev=1343894&r1=1343893&r2=1343894&view=diff
==============================================================================
--- rave/trunk/rave-integration-tests/rave-newuser-tests/pom.xml (original)
+++ rave/trunk/rave-integration-tests/rave-newuser-tests/pom.xml Tue May 29 
18:21:12 2012
@@ -20,71 +20,51 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.rave.integration-tests</groupId>
-  <artifactId>rave-newuser-tests</artifactId>
-  <name>Apache Rave :: rave-newuser-tests</name>
-  <description>Integration tests verifying new user functionality</description>
-
-  <parent>
+    <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.rave.integration-tests</groupId>
-    <artifactId>rave-integration-tests</artifactId>
-    <version>0.12-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
+    <artifactId>rave-newuser-tests</artifactId>
+    <name>Apache Rave :: rave-newuser-tests</name>
+    <description>Integration tests verifying new user 
functionality</description>
+
+    <parent>
+        <groupId>org.apache.rave.integration-tests</groupId>
+        <artifactId>rave-integration-tests</artifactId>
+        <version>0.12-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
 
-  <dependencies>
-    <!-- This is the core-tests jar that we make in a previous module -->
-    <dependency>
-      <groupId>org.apache.rave.integration-tests</groupId>
-      <artifactId>rave-core-tests</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
+    <dependencies>
+        <!-- This is the core-tests jar that we make in a previous module -->
+        <dependency>
+            <groupId>org.apache.rave.integration-tests</groupId>
+            <artifactId>rave-core-tests</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
 
-  <build>
-    <resources>
-      <resource>
-        <directory>${basedir}/src/main/resources</directory>
-      </resource>
-      <resource>
-        <directory>${basedir}/src/main/stories</directory>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.jbehave</groupId>
-        <artifactId>jbehave-maven-plugin</artifactId>
-        <version>${jbehave.core.version}</version>
-        <executions>
-          <execution>
-            <id>unpack-view-resources</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>unpack-view-resources</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>embeddable-stories</id>
-            <phase>integration-test</phase>
-            <configuration>
-              <includes>
-                <include>**/*Stories.java</include>
-              </includes>
-              <excludes/>
-              <generateViewAfterStories>true</generateViewAfterStories>
-              <ignoreFailureInStories>true</ignoreFailureInStories>
-              <ignoreFailureInView>true</ignoreFailureInView>
-              <metaFilters>
-                <metaFilter>${meta.filter}</metaFilter>
-              </metaFilters>
-            </configuration>
-            <goals>
-              <goal>run-stories-as-embeddables</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+    <build>
+        <resources>
+            <resource>
+                <directory>${basedir}/src/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>${basedir}/src/main/stories</directory>
+            </resource>
+        </resources>
+    </build>
+    <profiles>
+        <profile>
+            <id>integration-tests</id>
+            <build>
+                <defaultGoal>integration-test</defaultGoal>
+                <plugins>
+                    <plugin>
+                        <groupId>org.jbehave</groupId>
+                        <artifactId>jbehave-maven-plugin</artifactId>
+                        <version>${jbehave.core.version}</version>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>


Reply via email to