[seam-commits] Seam SVN: r14820 - in branches/community/Seam_2_3/examples-ee6: blog/blog-web and 1 other directory.

seam-commits at lists.jboss.org seam-commits at lists.jboss.org
Sat Jun 2 00:55:47 EDT 2012


Author: dhinojosa
Date: 2012-06-02 00:55:46 -0400 (Sat, 02 Jun 2012)
New Revision: 14820

Modified:
   branches/community/Seam_2_3/examples-ee6/blog/blog-web/pom.xml
   branches/community/Seam_2_3/examples-ee6/pom.xml
Log:
Included guava dependency in ee6 and blog.

Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-web/pom.xml	2012-06-02 04:31:48 UTC (rev 14819)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-web/pom.xml	2012-06-02 04:55:46 UTC (rev 14820)
@@ -1,96 +1,100 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
+    <modelVersion>4.0.0</modelVersion>
 
-   <parent>
-      <artifactId>blog</artifactId>
-      <groupId>org.jboss.seam.examples-ee6</groupId>
-      <version>2.3.0.CR1-SNAPSHOT</version>
-      <relativePath>../pom.xml</relativePath>
-   </parent>
+    <parent>
+        <artifactId>blog</artifactId>
+        <groupId>org.jboss.seam.examples-ee6</groupId>
+        <version>2.3.0.CR1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
 
-   <groupId>org.jboss.seam.examples-ee6.blog</groupId>
-   <artifactId>blog-web</artifactId>
-   <packaging>war</packaging>
-   <name>Blog Web Module (EE6)</name>
+    <groupId>org.jboss.seam.examples-ee6.blog</groupId>
+    <artifactId>blog-web</artifactId>
+    <packaging>war</packaging>
+    <name>Blog Web Module (EE6)</name>
 
-   <properties>
-      <!-- filtering property for components.xml -->
-      <jndiPattern>java:app/blog-ejb/#{ejbName}</jndiPattern>
-      <distributable>false</distributable>
-   </properties>
+    <properties>
+        <!-- filtering property for components.xml -->
+        <jndiPattern>java:app/blog-ejb/#{ejbName}</jndiPattern>
+        <distributable>false</distributable>
+    </properties>
 
-   <dependencies>
-      <dependency>
-         <groupId>org.jboss.seam.examples-ee6.blog</groupId>
-         <artifactId>blog-ejb</artifactId>
-         <type>ejb</type>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.seam</groupId>
-         <artifactId>jboss-seam</artifactId>
-         <type>ejb</type>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.seam</groupId>
-         <artifactId>jboss-seam-ui</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>org.jboss.seam</groupId>
-               <artifactId>jboss-seam-jul</artifactId>
-            </exclusion>
-         </exclusions>
-      </dependency>
-      <dependency>
-         <groupId>commons-logging</groupId>
-         <artifactId>commons-logging</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.el</groupId>
-         <artifactId>jboss-el</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.hibernate</groupId>
-         <artifactId>hibernate-validator</artifactId>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.richfaces.ui</groupId>
-         <artifactId>richfaces-components-ui</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.richfaces.core</groupId>
-         <artifactId>richfaces-core-impl</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.richfaces.core</groupId>
-         <artifactId>richfaces-core-api</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.spec.javax.faces</groupId>
-         <artifactId>jboss-jsf-api_2.0_spec</artifactId>
-         <scope>provided</scope>
-      </dependency>
-   </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.seam.examples-ee6.blog</groupId>
+            <artifactId>blog-ejb</artifactId>
+            <type>ejb</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.seam</groupId>
+            <artifactId>jboss-seam</artifactId>
+            <type>ejb</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.seam</groupId>
+            <artifactId>jboss-seam-ui</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jboss.seam</groupId>
+                    <artifactId>jboss-seam-jul</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.el</groupId>
+            <artifactId>jboss-el</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.richfaces.ui</groupId>
+            <artifactId>richfaces-components-ui</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.richfaces.core</groupId>
+            <artifactId>richfaces-core-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.richfaces.core</groupId>
+            <artifactId>richfaces-core-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.faces</groupId>
+            <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 
-   <build>
-      <finalName>blog-web</finalName>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-war-plugin</artifactId>
-            <configuration>
-               <webResources>
-                  <resource>
-                     <directory>src/main/webapp</directory>
-                     <filtering>true</filtering>
-                  </resource>
-               </webResources>
-            </configuration>
-         </plugin>
-      </plugins>
-   </build>
+    <build>
+        <finalName>blog-web</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <webResources>
+                        <resource>
+                            <directory>src/main/webapp</directory>
+                            <filtering>true</filtering>
+                        </resource>
+                    </webResources>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: branches/community/Seam_2_3/examples-ee6/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/pom.xml	2012-06-02 04:31:48 UTC (rev 14819)
+++ branches/community/Seam_2_3/examples-ee6/pom.xml	2012-06-02 04:55:46 UTC (rev 14820)
@@ -1,4 +1,5 @@
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -53,6 +54,12 @@
         <module>wicket</module>
     </modules>
 
+
+    <properties>
+       <guava.version>12.0</guava.version>
+       <richfaces.version>4.2.2.Final</richfaces.version>
+    </properties>
+
     <build>
         <pluginManagement>
             <plugins>
@@ -63,70 +70,72 @@
                     </configuration>
                 </plugin>
                 <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-		        <plugin>
-		            <groupId>org.eclipse.m2e</groupId>
-		            <artifactId>lifecycle-mapping</artifactId>
-		            <version>1.0.0</version>
-		            <configuration>
-		                <lifecycleMappingMetadata>
-		                    <pluginExecutions>
-		                        <pluginExecution>
-		                            <pluginExecutionFilter>
-		                                <groupId>org.apache.maven.plugins</groupId>
-		                                <artifactId>maven-dependency-plugin</artifactId>
-		                                <versionRange>[1.0,)</versionRange>
-		                                <goals>
-		                                    <goal>unpack</goal>
-		                                </goals>
-		                            </pluginExecutionFilter>
-		                            <action>
-		                                <execute><runOnIncremental>false</runOnIncremental></execute>
-		                            </action>
-		                        </pluginExecution>
-		                    </pluginExecutions>
-		                </lifecycleMappingMetadata>
-		            </configuration>
-		        </plugin>
-		         <plugin>
-                <groupId>org.jboss.as.plugins</groupId>
-                <artifactId>jboss-as-maven-plugin</artifactId>
-                <version>7.1.1.Final</version>
-                <executions>
-                    <execution>
-                        <phase></phase>
-                        <goals>
-                            <goal>deploy</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.apache.maven.plugins</groupId>
+                                        <artifactId>maven-dependency-plugin</artifactId>
+                                        <versionRange>[1.0,)</versionRange>
+                                        <goals>
+                                            <goal>unpack</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <execute>
+                                            <runOnIncremental>false</runOnIncremental>
+                                        </execute>
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.jboss.as.plugins</groupId>
+                    <artifactId>jboss-as-maven-plugin</artifactId>
+                    <version>7.1.1.Final</version>
+                    <executions>
+                        <execution>
+                            <phase></phase>
+                            <goals>
+                                <goal>deploy</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>
 
     <dependencyManagement>
         <dependencies>
-	        <dependency>
-	            <groupId>org.jboss.seam</groupId>
-	            <artifactId>jboss-seam</artifactId>
+            <dependency>
+                <groupId>org.jboss.seam</groupId>
+                <artifactId>jboss-seam</artifactId>
                 <version>${project.version}</version>
-	            <type>ejb</type>
-	            <exclusions>
-	               <exclusion>
-	                   <groupId>org.testng</groupId>
-	                   <artifactId>testng</artifactId>
-	               </exclusion>
-                   <exclusion>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                   </exclusion>
+                <type>ejb</type>
+                <exclusions>
                     <exclusion>
+                        <groupId>org.testng</groupId>
+                        <artifactId>testng</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>junit</groupId>
+                        <artifactId>junit</artifactId>
+                    </exclusion>
+                    <exclusion>
                         <artifactId>el-api</artifactId>
                         <groupId>javax.el</groupId>
-                    </exclusion>                   
-	            </exclusions>
-	        </dependency>
-                
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
             <dependency>
                 <groupId>org.richfaces</groupId>
                 <artifactId>richfaces-bom</artifactId>
@@ -134,7 +143,7 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            
+
             <!-- common provided scope dependencies -->
             <dependency>
                 <groupId>commons-logging</groupId>
@@ -148,26 +157,36 @@
                 <version>3.2</version>
                 <scope>provided</scope>
             </dependency>
-            
-			<dependency>
-			   <groupId>org.richfaces.ui</groupId>
-			   <artifactId>richfaces-components-ui</artifactId>
-			   <version>${richfaces.version}</version>
-			</dependency>
-			<dependency>
-			   <groupId>org.richfaces.core</groupId>
-			   <artifactId>richfaces-core-impl</artifactId>
-			   <version>${richfaces.version}</version>
-			</dependency>            
 
-            <!--  common test scope dependencies --> 
             <dependency>
+                <groupId>org.richfaces.ui</groupId>
+                <artifactId>richfaces-components-ui</artifactId>
+                <version>${richfaces.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.richfaces.core</groupId>
+                <artifactId>richfaces-core-impl</artifactId>
+                <version>${richfaces.version}</version>
+            </dependency>
+
+            <!-- guava is required by richfaces -->
+
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava.version}</version>
+            </dependency>
+
+
+            <!--  common test scope dependencies -->
+            <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-log4j12</artifactId>
                 <version>${slf4j.version}</version>
             </dependency>
 
-           <!-- <dependency>
+
+            <!-- <dependency>
                 <groupId>org.metawidget</groupId>
                 <artifactId>metawidget-backend</artifactId>
                 <version>0.95</version>
@@ -184,8 +203,8 @@
                 <artifactId>metawidget</artifactId>
                 <version>0.95</version>
             </dependency>-->
-            
-           <dependency>
+
+            <dependency>
                 <groupId>org.apache.myfaces.trinidad</groupId>
                 <artifactId>trinidad-api</artifactId>
                 <version>2.0.1</version>
@@ -195,7 +214,7 @@
                 <groupId>org.apache.myfaces.trinidad</groupId>
                 <artifactId>trinidad-impl</artifactId>
                 <version>2.0.1</version>
-            </dependency>            
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -220,8 +239,8 @@
                                 </configuration>
                             </execution>
                         </executions>
-                    </plugin>               
-                </plugins>               
+                    </plugin>
+                </plugins>
             </build>
         </profile>
 
@@ -263,7 +282,7 @@
                                             <version.jbossas7>${version.jbossas7}</version.jbossas7>
                                         </systemProperties>
                                     </configuration>
-                                </execution> 
+                                </execution>
                             </executions>
                         </plugin>
                     </plugins>
@@ -303,36 +322,36 @@
             </dependencies>
             <build>
                 <pluginManagement>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>unpack-as7</id>
-                                <phase>process-test-classes</phase>
-                                <goals>
-                                    <goal>unpack</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>org.jboss.as</groupId>
-                                            <artifactId>jboss-as-dist</artifactId>
-                                            <version>${version.jbossas7}</version>
-                                            <type>zip</type>
-                                            <overWrite>false</overWrite>
-                                            <outputDirectory>${project.build.directory}</outputDirectory>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-dependency-plugin</artifactId>
+                            <executions>
+                                <execution>
+                                    <id>unpack-as7</id>
+                                    <phase>process-test-classes</phase>
+                                    <goals>
+                                        <goal>unpack</goal>
+                                    </goals>
+                                    <configuration>
+                                        <artifactItems>
+                                            <artifactItem>
+                                                <groupId>org.jboss.as</groupId>
+                                                <artifactId>jboss-as-dist</artifactId>
+                                                <version>${version.jbossas7}</version>
+                                                <type>zip</type>
+                                                <overWrite>false</overWrite>
+                                                <outputDirectory>${project.build.directory}</outputDirectory>
+                                            </artifactItem>
+                                        </artifactItems>
+                                    </configuration>
+                                </execution>
+                            </executions>
+                        </plugin>
+                    </plugins>
                 </pluginManagement>
             </build>
-       </profile>
+        </profile>
 
         <profile>
             <id>arq-jbossas-7-remote</id>
@@ -407,7 +426,7 @@
                             <artifactId>failsafe-maven-plugin</artifactId>
                             <version>2.4.3-alpha-1</version>
                             <configuration>
-                                <junitArtifactName>none:node</junitArtifactName> 
+                                <junitArtifactName>none:node</junitArtifactName>
                                 <suiteXmlFiles>
                                     <suiteXmlFile>${ftest.resources.dir}/${testng.suite}</suiteXmlFile>
                                 </suiteXmlFiles>
@@ -416,7 +435,9 @@
                                 <properties>
                                     <property>
                                         <name>listener</name>
-                                        <value>org.jboss.seam.example.common.test.selenium.SeleniumFunctionalTestListener</value>
+                                        <value>
+                                            org.jboss.seam.example.common.test.selenium.SeleniumFunctionalTestListener
+                                        </value>
                                     </property>
                                 </properties>
                                 <systemProperties>
@@ -514,9 +535,10 @@
                                     <phase>pre-integration-test</phase>
                                     <configuration>
                                         <tasks>
-                                            <echo message="Waiting for ${selenium.browser.url}/${example.context.path}" />
+                                            <echo message="Waiting for ${selenium.browser.url}/${example.context.path}"/>
                                             <waitfor maxwait="1" maxwaitunit="minute" checkevery="5000">
-                                                <http url="${selenium.browser.url}/${example.context.path}" errorsBeginAt="404" />
+                                                <http url="${selenium.browser.url}/${example.context.path}"
+                                                      errorsBeginAt="404"/>
                                             </waitfor>
                                         </tasks>
                                     </configuration>
@@ -530,8 +552,11 @@
                                     <phase>post-integration-test</phase>
                                     <configuration>
                                         <tasks>
-                                            <echo taskname="selenium-shutdown" message="DGF Errors during shutdown are expected" />
-                                            <get taskname="selenium-shutdown" src="http://${selenium.server.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDownSeleniumServer" ignoreerrors="true" dest="${selenium.log.dir}/selenium.stop.msg" />
+                                            <echo taskname="selenium-shutdown"
+                                                  message="DGF Errors during shutdown are expected"/>
+                                            <get taskname="selenium-shutdown"
+                                                 src="http://${selenium.server.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDownSeleniumServer"
+                                                 ignoreerrors="true" dest="${selenium.log.dir}/selenium.stop.msg"/>
                                         </tasks>
                                     </configuration>
                                     <goals>
@@ -544,7 +569,8 @@
                                     <phase>post-integration-test</phase>
                                     <configuration>
                                         <tasks>
-                                            <delete dir="${jboss.home}/server/${jboss.domain}/deploy/${example.context.path}.war" failonerror="false" />
+                                            <delete dir="${jboss.home}/server/${jboss.domain}/deploy/${example.context.path}.war"
+                                                    failonerror="false"/>
                                         </tasks>
                                     </configuration>
                                     <goals>
@@ -620,7 +646,9 @@
                                 <properties>
                                     <property>
                                         <name>listener</name>
-                                        <value>org.jboss.seam.example.common.test.selenium.SeleniumFunctionalTestListener</value>
+                                        <value>
+                                            org.jboss.seam.example.common.test.selenium.SeleniumFunctionalTestListener
+                                        </value>
                                     </property>
                                 </properties>
                                 <systemProperties>
@@ -713,8 +741,10 @@
                                     <phase>pre-integration-test</phase>
                                     <configuration>
                                         <tasks>
-                                            <fail unless="catalina.home" message="CATALINA_HOME environment property was not set" />
-                                            <copy file="${basedir}/../${example.name}-web/target/${example.context.path}.war" todir="${catalina.home}/webapps" overwrite="true" />
+                                            <fail unless="catalina.home"
+                                                  message="CATALINA_HOME environment property was not set"/>
+                                            <copy file="${basedir}/../${example.name}-web/target/${example.context.path}.war"
+                                                  todir="${catalina.home}/webapps" overwrite="true"/>
                                         </tasks>
                                     </configuration>
                                     <goals>
@@ -726,9 +756,10 @@
                                     <phase>pre-integration-test</phase>
                                     <configuration>
                                         <tasks>
-                                            <echo message="Waiting for ${selenium.browser.url}/${example.context.path}" />
+                                            <echo message="Waiting for ${selenium.browser.url}/${example.context.path}"/>
                                             <waitfor maxwait="1" maxwaitunit="minute" checkevery="5000">
-                                                <http url="${selenium.browser.url}/${example.context.path}" errorsBeginAt="404" />
+                                                <http url="${selenium.browser.url}/${example.context.path}"
+                                                      errorsBeginAt="404"/>
                                             </waitfor>
                                         </tasks>
                                     </configuration>
@@ -741,8 +772,11 @@
                                     <phase>post-integration-test</phase>
                                     <configuration>
                                         <tasks>
-                                            <echo taskname="selenium-shutdown" message="DGF Errors during shutdown are expected" />
-                                            <get taskname="selenium-shutdown" src="http://${selenium.server.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDownSeleniumServer" ignoreerrors="true" dest="${selenium.log.dir}/selenium.stop.msg" />
+                                            <echo taskname="selenium-shutdown"
+                                                  message="DGF Errors during shutdown are expected"/>
+                                            <get taskname="selenium-shutdown"
+                                                 src="http://${selenium.server.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDownSeleniumServer"
+                                                 ignoreerrors="true" dest="${selenium.log.dir}/selenium.stop.msg"/>
                                         </tasks>
                                     </configuration>
                                     <goals>
@@ -754,8 +788,10 @@
                                     <phase>post-integration-test</phase>
                                     <configuration>
                                         <tasks>
-                                            <delete file="${catalina.home}/webapps/${example.context.path}.war" failonerror="false" />
-                                            <delete dir="${catalina.home}/webapps/${example.context.path}" failonerror="false" />
+                                            <delete file="${catalina.home}/webapps/${example.context.path}.war"
+                                                    failonerror="false"/>
+                                            <delete dir="${catalina.home}/webapps/${example.context.path}"
+                                                    failonerror="false"/>
                                         </tasks>
                                     </configuration>
                                     <goals>
@@ -833,7 +869,9 @@
                                 <properties>
                                     <property>
                                         <name>listener</name>
-                                        <value>org.jboss.seam.example.common.test.selenium.SeleniumFunctionalTestListener</value>
+                                        <value>
+                                            org.jboss.seam.example.common.test.selenium.SeleniumFunctionalTestListener
+                                        </value>
                                     </property>
                                 </properties>
                                 <systemProperties>
@@ -930,10 +968,12 @@
                                     <phase>pre-integration-test</phase>
                                     <configuration>
                                         <tasks>
-                                            <copy todir="${jboss.master.configuration}/farm" overwrite="true" flatten="true">
+                                            <copy todir="${jboss.master.configuration}/farm" overwrite="true"
+                                                  flatten="true">
                                                 <fileset dir="${basedir}/../${example.name}-ear/">
-                                                    <include name="src/main/resources/jboss-seam-${example.name}-ds.xml" />
-                                                    <include name="target/${example.context.path}.ear" />
+                                                    <include
+                                                            name="src/main/resources/jboss-seam-${example.name}-ds.xml"/>
+                                                    <include name="target/${example.context.path}.ear"/>
                                                 </fileset>
                                             </copy>
                                         </tasks>
@@ -948,9 +988,10 @@
                                     <phase>pre-integration-test</phase>
                                     <configuration>
                                         <tasks>
-                                            <echo message="Waiting for ${selenium.browser.cluster.url}/${example.context.path}" />
+                                            <echo message="Waiting for ${selenium.browser.cluster.url}/${example.context.path}"/>
                                             <waitfor maxwait="1" maxwaitunit="minute" checkevery="5000">
-                                                <http url="${selenium.browser.cluster.url}/${example.context.path}" errorsBeginAt="404" />
+                                                <http url="${selenium.browser.cluster.url}/${example.context.path}"
+                                                      errorsBeginAt="404"/>
                                             </waitfor>
                                         </tasks>
                                     </configuration>
@@ -964,8 +1005,11 @@
                                     <phase>post-integration-test</phase>
                                     <configuration>
                                         <tasks>
-                                            <echo taskname="selenium-shutdown" message="DGF Errors during shutdown are expected" />
-                                            <get taskname="selenium-shutdown" src="http://${selenium.server.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDownSeleniumServer" ignoreerrors="true" dest="${selenium.log.dir}/selenium.stop.msg" />
+                                            <echo taskname="selenium-shutdown"
+                                                  message="DGF Errors during shutdown are expected"/>
+                                            <get taskname="selenium-shutdown"
+                                                 src="http://${selenium.server.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDownSeleniumServer"
+                                                 ignoreerrors="true" dest="${selenium.log.dir}/selenium.stop.msg"/>
                                         </tasks>
                                     </configuration>
                                     <goals>
@@ -979,8 +1023,8 @@
                                         <tasks>
                                             <delete failonerror="false">
                                                 <fileset dir="${jboss.master.configuration}/farm">
-                                                    <include name="jboss-seam-${example.name}-ds.xml" />
-                                                    <include name="${example.context.path}.ear" />
+                                                    <include name="jboss-seam-${example.name}-ds.xml"/>
+                                                    <include name="${example.context.path}.ear"/>
                                                 </fileset>
                                             </delete>
                                         </tasks>
@@ -1000,13 +1044,13 @@
     <properties>
         <!-- Excluded TestNG groups (ex: slow annotated tests won't run during 
             the test phase) -->
-        <tests.excludedGroups>slow</tests.excludedGroups>        
+        <tests.excludedGroups>slow</tests.excludedGroups>
         <richfaces.version>4.2.2.Final</richfaces.version>
         <slf4j.version>1.6.1</slf4j.version>
-        
+
         <!-- dependencies for functional tests -->
         <ant.junit.version>1.6.2</ant.junit.version>
-        <ftest.version.discriminator />
+        <ftest.version.discriminator/>
         <selenium.browser>*firefoxproxy</selenium.browser>
         <selenium.browser.url>http://localhost:8080</selenium.browser.url>
         <selenium.browser.cluster.url>http://localhost:8180</selenium.browser.cluster.url>



More information about the seam-commits mailing list