[richfaces-svn-commits] JBoss Rich Faces SVN: r8743 - in trunk/test-applications/seleniumTest: src/test/java/org/ajax4jsf/test/base and 1 other directory.
Author: alexsmirnov
Date: 2008-05-23 21:05:32 -0400 (Fri, 23 May 2008)
New Revision: 8743
Modified:
trunk/test-applications/seleniumTest/pom.xml
trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/SeleniumTestBase.java
Log:
set default port to 8085
Modified: trunk/test-applications/seleniumTest/pom.xml
===================================================================
--- trunk/test-applications/seleniumTest/pom.xml 2008-05-24 00:37:12 UTC (rev 8742)
+++ trunk/test-applications/seleniumTest/pom.xml 2008-05-24 01:05:32 UTC (rev 8743)
@@ -14,6 +14,9 @@
<name>seleniumTest Maven Webapp</name>
<version>3.2.1-SNAPSHOT</version>
<url>http://maven.apache.org</url>
+ <properties>
+ <http.port>8085</http.port>
+ </properties>
<repositories>
<repository>
<id>openqa</id>
@@ -27,7 +30,6 @@
<enabled>true</enabled>
</releases>
</repository>
-
<repository>
<id>openqa-snapshots</id>
<name>OpenQA Snapshots Repository</name>
@@ -65,6 +67,13 @@
</dependencies>
<type>embedded</type>
</container>
+ <configuration>
+ <properties>
+ <cargo.servlet.port>
+ ${http.port}
+ </cargo.servlet.port>
+ </properties>
+ </configuration>
</configuration>
<executions>
<execution>
@@ -74,7 +83,6 @@
<goal>start</goal>
</goals>
</execution>
-
<execution>
<id>stop-container</id>
<phase>post-integration-test</phase>
@@ -87,7 +95,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
-
<configuration>
<!-- Skip the normal tests, we'll run them in the integration-test phase
-->
<skip>true</skip>
@@ -97,7 +104,6 @@
</suiteXmlFile>
</suiteXmlFiles>
</configuration>
-
<executions>
<execution>
<phase>integration-test</phase>
Modified:
trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/SeleniumTestBase.java
===================================================================
---
trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/SeleniumTestBase.java 2008-05-24
00:37:12 UTC (rev 8742)
+++
trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/SeleniumTestBase.java 2008-05-24
01:05:32 UTC (rev 8743)
@@ -40,7 +40,7 @@
/** Specifies the time to wait for ajax processing */
protected static final int ajaxCompletionTime = 3000;
- protected static final String serverPort = "8080";
+ protected static final String serverPort = "8085";
private static final String WINDOW_JS_RESOLVER =
"selenium.browserbot.getCurrentWindow().";