|
1 | 1 | <?xml version="1.0" encoding="UTF-8"?>
|
2 |
| -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
3 |
| - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
| 2 | +<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"> |
4 | 3 | <modelVersion>4.0.0</modelVersion>
|
5 | 4 | <parent>
|
6 | 5 | <groupId>org.jboss.weld</groupId>
|
7 | 6 | <artifactId>weld-core-parent</artifactId>
|
8 |
| - <version>1.1.0-SNAPSHOT</version> |
| 7 | + <version>1.1.0.Beta1</version> |
9 | 8 | <relativePath>../parent/pom.xml</relativePath>
|
10 | 9 | </parent>
|
11 | 10 | <groupId>org.jboss.weld.examples</groupId>
|
|
418 | 417 | <phase>post-integration-test</phase>
|
419 | 418 | <configuration>
|
420 | 419 | <tasks>
|
421 |
| - <echo taskname="selenium-shutdown" |
422 |
| - message="DGF Errors during shutdown are expected" /> |
423 |
| - <get taskname="selenium-shutdown" |
424 |
| - src="http://${selenium.server.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDownSeleniumServer" |
425 |
| - ignoreerrors="true" |
426 |
| - dest="${selenium.log.dir}/selenium.stop.msg" /> |
| 420 | + <echo taskname="selenium-shutdown" message="DGF Errors during shutdown are expected" /> |
| 421 | + <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" /> |
427 | 422 | </tasks>
|
428 | 423 | </configuration>
|
429 | 424 | <goals>
|
|
631 | 626 | <phase>pre-integration-test</phase>
|
632 | 627 | <configuration>
|
633 | 628 | <tasks>
|
634 |
| - <property name="url.to.wait" |
635 |
| - value="http://localhost:8180/${project.build.finalName}" /> |
636 |
| - <copy |
637 |
| - file="${project.build.directory}/${project.build.finalName}.${project.packaging}" |
638 |
| - toDir="${jboss.master.configuration}/farm" /> |
639 |
| - <echo |
640 |
| - message="Waiting for application at ${url.to.wait}" /> |
641 |
| - <waitfor |
642 |
| - maxwait="${application.deploy.timeout}" |
643 |
| - maxwaitunit="second"> |
644 |
| - <http url="${url.to.wait}" |
645 |
| - errorsBeginAt="404" /> |
| 629 | + <property name="url.to.wait" value="http://localhost:8180/${project.build.finalName}" /> |
| 630 | + <copy file="${project.build.directory}/${project.build.finalName}.${project.packaging}" toDir="${jboss.master.configuration}/farm" /> |
| 631 | + <echo message="Waiting for application at ${url.to.wait}" /> |
| 632 | + <waitfor maxwait="${application.deploy.timeout}" maxwaitunit="second"> |
| 633 | + <http url="${url.to.wait}" errorsBeginAt="404" /> |
646 | 634 | </waitfor>
|
647 | 635 | </tasks>
|
648 | 636 | </configuration>
|
|
658 | 646 | <configuration>
|
659 | 647 | <tasks>
|
660 | 648 | <echo message="Undeploying application." />
|
661 |
| - <delete |
662 |
| - file="${jboss.master.configuration}/farm/${project.build.finalName}.${project.packaging}" /> |
663 |
| - <get taskname="selenium-shutdown" |
664 |
| - src="http://${selenium.host}:${selenium.port}/selenium-server/driver/?cmd=shutDownSeleniumServer" |
665 |
| - ignoreerrors="true" |
666 |
| - dest="${selenium.log.dir}/selenium.stop.msg" /> |
667 |
| - <echo taskname="selenium-shutdown" |
668 |
| - message="DGF Errors during shutdown are expected." /> |
| 649 | + <delete file="${jboss.master.configuration}/farm/${project.build.finalName}.${project.packaging}" /> |
| 650 | + <get taskname="selenium-shutdown" src="http://${selenium.host}:${selenium.port}/selenium-server/driver/?cmd=shutDownSeleniumServer" ignoreerrors="true" dest="${selenium.log.dir}/selenium.stop.msg" /> |
| 651 | + <echo taskname="selenium-shutdown" message="DGF Errors during shutdown are expected." /> |
669 | 652 | </tasks>
|
670 | 653 | </configuration>
|
671 | 654 | <goals>
|
|
686 | 669 | <ftest.suite.xml>tomcat6x.xml</ftest.suite.xml>
|
687 | 670 | <!-- Before starting Tomcat, add the following line to conf/tomcat-users.xml to allow
|
688 | 671 | the Cargo plugin to access the manager application, then start Tomcat:
|
689 |
| - <user username="admin" password="" roles="manager"/> |
| 672 | + <user username="admin" password="" roles="manager" /> |
690 | 673 | -->
|
691 | 674 | <tomcat.username>admin</tomcat.username>
|
692 |
| - <tomcat.password></tomcat.password> |
| 675 | + <tomcat.password /> |
693 | 676 | </properties>
|
694 | 677 |
|
695 | 678 | <dependencies>
|
|
921 | 904 | <phase>post-integration-test</phase>
|
922 | 905 | <configuration>
|
923 | 906 | <tasks>
|
924 |
| - <echo taskname="selenium-shutdown" |
925 |
| - message="DGF Errors during shutdown are expected" /> |
926 |
| - <get taskname="selenium-shutdown" |
927 |
| - src="http://${selenium.server.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDownSeleniumServer" |
928 |
| - ignoreerrors="true" |
929 |
| - dest="${selenium.log.dir}/selenium.stop.msg" /> |
| 907 | + <echo taskname="selenium-shutdown" message="DGF Errors during shutdown are expected" /> |
| 908 | + <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" /> |
930 | 909 | </tasks>
|
931 | 910 | </configuration>
|
932 | 911 | <goals>
|
|
1166 | 1145 | <phase>post-integration-test</phase>
|
1167 | 1146 | <configuration>
|
1168 | 1147 | <tasks>
|
1169 |
| - <echo taskname="selenium-shutdown" |
1170 |
| - message="DGF Errors during shutdown are expected" /> |
1171 |
| - <get taskname="selenium-shutdown" |
1172 |
| - src="http://${selenium.server.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDownSeleniumServer" |
1173 |
| - ignoreerrors="true" |
1174 |
| - dest="${selenium.log.dir}/selenium.stop.msg" /> |
| 1148 | + <echo taskname="selenium-shutdown" message="DGF Errors during shutdown are expected" /> |
| 1149 | + <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" /> |
1175 | 1150 | </tasks>
|
1176 | 1151 | </configuration>
|
1177 | 1152 | <goals>
|
|
0 commit comments