8:54 p.m.
Author: alexsmirnov
Date: 2008-05-01 14:54:45 -0400 (Thu, 01 May 2008)
New Revision: 8394
Modified:
trunk/samples/pom.xml
trunk/samples/seamEAR/pom.xml
trunk/test-applications/seleniumTest/pom.xml
trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/Templates.java
Log:
Fix selenium integration test for an unix environment.
Remove optional samples from default build profile.
Modified: trunk/samples/pom.xml
===================================================================
--- trunk/samples/pom.xml 2008-05-01 01:11:18 UTC (rev 8393)
+++ trunk/samples/pom.xml 2008-05-01 18:54:45 UTC (rev 8394)
@@ -1,5 +1,7 @@
<?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">
+<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">
<parent>
<artifactId>root</artifactId>
<groupId>org.richfaces</groupId>
@@ -27,7 +29,8 @@
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<connectors>
- <connector
implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <connector
+ implementation="org.mortbay.jetty.nio.SelectChannelConnector">
<port>8080</port>
<maxIdleTime>60000</maxIdleTime>
</connector>
@@ -91,10 +94,10 @@
<version>0.9.5</version>
<scope>runtime</scope>
<exclusions>
- <exclusion>
- <artifactId>xerces</artifactId>
- <groupId>xerces</groupId>
- </exclusion>
+ <exclusion>
+ <artifactId>xerces</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
@@ -361,7 +364,7 @@
<tomahawk>1.1.6</tomahawk>
</properties>
<build>
- <plugins/>
+ <plugins />
</build>
<dependencies>
<dependency>
@@ -409,11 +412,6 @@
</profile>
<profile>
<id>seam</id>
- <activation>
- <property>
- <name>seamHome</name>
- </property>
- </activation>
<modules>
<module>seamEAR</module>
<module>seamIntegration</module>
@@ -434,9 +432,9 @@
false
</includesTestSourceRoots>
<jdk>1.5</jdk>
- <excludes>
+ <excludes>
<exclude>**/*.java</exclude>
- </excludes>
+ </excludes>
</configuration>
</plugin>
<plugin>
@@ -451,54 +449,56 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>allSamples</id>
+ <modules>
+ <module>separator-sample</module>
+ <module>panel-sample</module>
+ <module>gmap-sample</module>
+ <module>togglePanel-sample</module>
+ <module>tabPanelDemo</module>
+ <module>simpleTogglePanel-sample</module>
+ <module>inputNumberSpinnerDemo</module>
+ <module>inputNumberSliderDemo</module>
+ <module>panelbar-sample</module>
+ <module>toolBarDemo</module>
+ <module>tree-demo</module>
+ <module>dataFilterSliderDemo</module>
+ <module>suggestionbox-sample</module>
+ <module>dragDropDemo</module>
+ <module>dataTableDemo</module>
+ <module>modalpanel-sample</module>
+ <module>datascroller-sample</module>
+ <module>effect-sample</module>
+ <module>dropdownmenu-sample</module>
+ <module>tooltip-sample</module>
+ <module>calendar-sample</module>
+ <module>treeModelDemo</module>
+ <module>local-value-demo</module>
+ <module>panelmenu-sample</module>
+ <module>rich-message-demo</module>
+ <module>scrollableDataTableDemo</module>
+ <module>richfaces-ear-demo</module>
+ <module>contextMenuDemo</module>
+ <module>orderingListDemo</module>
+ <module>listShuttleDemo</module>
+ <module>columnsDemo</module>
+ <module>combobox-sample</module>
+ <module>pickList-sample</module>
+ <module>progressBarDemo</module>
+ <module>jira-data</module>
+ <module>stdcomponents-sample</module>
+ <module>fileUploadDemo</module>
+ <module>sortingFilteringDemo</module>
+ <module>inplaceInput-sample</module>
+ <module>inplaceSelect-sample</module>
+ <module>functions-demo</module>
+ </modules>
+ </profile>
</profiles>
<modules>
<module>skins</module>
- <module>separator-sample</module>
- <module>panel-sample</module>
- <module>gmap-sample</module>
- <module>togglePanel-sample</module>
- <module>tabPanelDemo</module>
- <module>simpleTogglePanel-sample</module>
- <module>inputNumberSpinnerDemo</module>
- <module>inputNumberSliderDemo</module>
- <module>panelbar-sample</module>
- <module>toolBarDemo</module>
- <module>tree-demo</module>
- <module>dataFilterSliderDemo</module>
- <module>suggestionbox-sample</module>
- <module>dragDropDemo</module>
- <module>dataTableDemo</module>
- <module>modalpanel-sample</module>
- <module>datascroller-sample</module>
- <module>effect-sample</module>
+ <module>laguna</module>
<module>richfaces-demo</module>
- <module>dropdownmenu-sample</module>
- <module>tooltip-sample</module>
- <module>calendar-sample</module>
- <module>treeModelDemo</module>
- <module>local-value-demo</module>
- <module>panelmenu-sample</module>
- <module>rich-message-demo</module>
- <module>scrollableDataTableDemo</module>
- <module>richfaces-ear-demo</module>
- <module>seamEAR</module>
-
- <module>contextMenuDemo</module>
- <module>orderingListDemo</module>
- <module>listShuttleDemo</module>
- <module>columnsDemo</module>
-
- <module>combobox-sample</module>
- <module>pickList-sample</module>
- <module>progressBarDemo</module>
- <module>jira-data</module>
- <module>stdcomponents-sample</module>
- <module>fileUploadDemo</module>
- <module>sortingFilteringDemo</module>
- <module>inplaceInput-sample</module>
- <module>inplaceSelect-sample</module>
- <module>functions-demo</module>
- <module>laguna</module>
- </modules>
+ </modules>
</project>
Modified: trunk/samples/seamEAR/pom.xml
===================================================================
--- trunk/samples/seamEAR/pom.xml 2008-05-01 01:11:18 UTC (rev 8393)
+++ trunk/samples/seamEAR/pom.xml 2008-05-01 18:54:45 UTC (rev 8394)
@@ -1,11 +1,9 @@
<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">
- <!--
<parent>
- <artifactId>samples</artifactId>
+ <artifactId>root</artifactId>
<groupId>org.richfaces</groupId>
<version>3.2.1-SNAPSHOT</version>
</parent>
- -->
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<version>3.2.1-SNAPSHOT</version>
Modified: trunk/test-applications/seleniumTest/pom.xml
===================================================================
--- trunk/test-applications/seleniumTest/pom.xml 2008-05-01 01:11:18 UTC (rev 8393)
+++ trunk/test-applications/seleniumTest/pom.xml 2008-05-01 18:54:45 UTC (rev 8394)
@@ -32,22 +32,6 @@
<finalName>seleniumTest</finalName>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start-server</goal>
- </goals>
- <configuration>
- <background>true</background>
- <debug>false</debug>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<version>0.3.1</version>
@@ -129,6 +113,32 @@
</os>
</activation>
<build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ <version>1.0-beta-2</version>
+ <executions>
+ <execution>
+ <id>xvfb</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>xvfb</goal>
+ </goals>
+ </execution>
+ <execution>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start-server</goal>
+ </goals>
+ <configuration>
+ <background>true</background>
+ <debug>false</debug>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
<testResources>
<testResource>
<directory>src/test/testng/unix</directory>
@@ -146,6 +156,25 @@
</os>
</activation>
<build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ <version>1.0-beta-2</version>
+ <executions>
+ <execution>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start-server</goal>
+ </goals>
+ <configuration>
+ <background>true</background>
+ <debug>false</debug>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
<testResources>
<testResource>
<directory>src/test/testng/win</directory>
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/Templates.java
===================================================================
---
trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/Templates.java 2008-05-01
01:11:18 UTC (rev 8393)
+++
trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/Templates.java 2008-05-01
18:54:45 UTC (rev 8394)
@@ -14,16 +14,16 @@
template = name;
}
- public static Templates SIMPLE = new Templates("Simple");
+ public static Templates SIMPLE = new Templates("simple");
- public static Templates DATATABLE = new Templates("DataTable");
+ public static Templates DATATABLE = new Templates("dataTable");
- public static Templates MODALPANEL = new Templates("ModalPanel");
+ public static Templates MODALPANEL = new Templates("dodalPanel");
private void setParentId(SeleniumTestBase test) {
- if ("Simple".equals(template)) {
+ if ("simple".equals(template)) {
test.setParentId(COMPONENT_PREFIX_SIMPLE);
- } else if ("DataTable".equals(template)) {
+ } else if ("dataTable".equals(template)) {
test.setParentId(COMPONENT_PREFIX_INSIDE_TABLE);
}
}