[gatein-commits] gatein SVN: r6757 - in sandbox/as7_support/wci: exo and 21 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon Jun 27 10:12:42 EDT 2011
Author: mstruk
Date: 2011-06-27 10:12:40 -0400 (Mon, 27 Jun 2011)
New Revision: 6757
Modified:
sandbox/as7_support/wci/
sandbox/as7_support/wci/exo/pom.xml
sandbox/as7_support/wci/jboss/jboss6/pom.xml
sandbox/as7_support/wci/jboss/pom.xml
sandbox/as7_support/wci/jetty/pom.xml
sandbox/as7_support/wci/pom.xml
sandbox/as7_support/wci/test/core/pom.xml
sandbox/as7_support/wci/test/core/src/main/java/org/gatein/wci/ServletTestCase.java
sandbox/as7_support/wci/test/core/src/main/java/org/gatein/wci/TestServlet.java
sandbox/as7_support/wci/test/pom.xml
sandbox/as7_support/wci/test/portlets/exo-portlet/pom.xml
sandbox/as7_support/wci/test/portlets/gatein-portlet/pom.xml
sandbox/as7_support/wci/test/portlets/native-portlet/pom.xml
sandbox/as7_support/wci/test/portlets/pom.xml
sandbox/as7_support/wci/test/servers/jboss51/pom.xml
sandbox/as7_support/wci/test/servers/jboss6/pom.xml
sandbox/as7_support/wci/test/servers/jetty6/pom.xml
sandbox/as7_support/wci/test/servers/jetty6/src/integration-tests/build.xml
sandbox/as7_support/wci/test/servers/pom.xml
sandbox/as7_support/wci/test/servers/tomcat6/pom.xml
sandbox/as7_support/wci/test/servers/tomcat7/pom.xml
sandbox/as7_support/wci/tomcat/pom.xml
sandbox/as7_support/wci/tomcat/tomcat6/pom.xml
sandbox/as7_support/wci/tomcat/tomcat7/pom.xml
sandbox/as7_support/wci/wci/pom.xml
Log:
Merged from wci trunk up to r6756
Property changes on: sandbox/as7_support/wci
___________________________________________________________________
Modified: svn:mergeinfo
- /components/wci/branches/logout:5894-6009
+ /components/wci/branches/logout:5894-6009
/components/wci/trunk:6492-6756
Modified: sandbox/as7_support/wci/exo/pom.xml
===================================================================
--- sandbox/as7_support/wci/exo/pom.xml 2011-06-27 05:35:36 UTC (rev 6756)
+++ sandbox/as7_support/wci/exo/pom.xml 2011-06-27 14:12:40 UTC (rev 6757)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta03-SNAPSHOT</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-exo</artifactId>
Modified: sandbox/as7_support/wci/jboss/jboss6/pom.xml
===================================================================
--- sandbox/as7_support/wci/jboss/jboss6/pom.xml 2011-06-27 05:35:36 UTC (rev 6756)
+++ sandbox/as7_support/wci/jboss/jboss6/pom.xml 2011-06-27 14:12:40 UTC (rev 6757)
@@ -2,28 +2,28 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-jboss</artifactId>
- <version>2.1.0-Beta03-SNAPSHOT</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jboss6</artifactId>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
<packaging>jar</packaging>
<name>GateIn - WCI JBoss 6 compatibility component</name>
<dependencies>
- <dependency>
- <groupId>org.gatein.wci</groupId>
- <artifactId>wci-wci</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.web</groupId>
- <artifactId>jbossweb</artifactId>
- <version>3.0.0-CR1</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.servlet</groupId>
- <artifactId>jboss-servlet-api_3.0_spec</artifactId>
- <version>1.0.0.Final</version>
- </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-wci</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.web</groupId>
+ <artifactId>jbossweb</artifactId>
+ <version>3.0.0-CR1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <version>1.0.0.Final</version>
+ </dependency>
</dependencies>
-
</project>
Modified: sandbox/as7_support/wci/jboss/pom.xml
===================================================================
--- sandbox/as7_support/wci/jboss/pom.xml 2011-06-27 05:35:36 UTC (rev 6756)
+++ sandbox/as7_support/wci/jboss/pom.xml 2011-06-27 14:12:40 UTC (rev 6757)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta03-SNAPSHOT</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jboss</artifactId>
Modified: sandbox/as7_support/wci/jetty/pom.xml
===================================================================
--- sandbox/as7_support/wci/jetty/pom.xml 2011-06-27 05:35:36 UTC (rev 6756)
+++ sandbox/as7_support/wci/jetty/pom.xml 2011-06-27 14:12:40 UTC (rev 6757)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta03-SNAPSHOT</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jetty</artifactId>
Modified: sandbox/as7_support/wci/pom.xml
===================================================================
--- sandbox/as7_support/wci/pom.xml 2011-06-27 05:35:36 UTC (rev 6756)
+++ sandbox/as7_support/wci/pom.xml 2011-06-27 14:12:40 UTC (rev 6757)
@@ -6,13 +6,13 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta03-SNAPSHOT</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>org.gatein</groupId>
<artifactId>gatein-parent</artifactId>
- <version>1.1.0-Beta01</version>
+ <version>1.1.0-Beta02</version>
</parent>
<scm>
@@ -22,8 +22,8 @@
</scm>
<properties>
- <version.gatein.common>2.0.4-Beta01</version.gatein.common>
-
+ <version.gatein.common>2.0.4-Beta03</version.gatein.common>
+
<version.junit>3.8.2-brew</version.junit>
<version.jboss.unit>1.2.3</version.jboss.unit>
<version.jaxb>2.1</version.jaxb>
@@ -33,7 +33,7 @@
<version.discovery>0.4</version.discovery>
<!-- used in test module by maven-antrun-extended-plugin -->
<version.cargo>1.0.6</version.cargo>
- <version.cargo.jetty.deployer>1.0.1</version.cargo.jetty.deployer>
+ <version.cargo.jetty.deployer>1.1.0</version.cargo.jetty.deployer>
<version.oswego.concurrent>1.3.4</version.oswego.concurrent>
</properties>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.gatein</groupId>
<artifactId>gatein-dep</artifactId>
- <version>1.0.3-Beta01</version>
+ <version>1.1.0-Beta04</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Modified: sandbox/as7_support/wci/test/core/pom.xml
===================================================================
--- sandbox/as7_support/wci/test/core/pom.xml 2011-06-27 05:35:36 UTC (rev 6756)
+++ sandbox/as7_support/wci/test/core/pom.xml 2011-06-27 14:12:40 UTC (rev 6757)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta03-SNAPSHOT</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-core</artifactId>
@@ -29,10 +29,12 @@
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit</artifactId>
+ <version>${version.jboss.unit}</version>
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-remote</artifactId>
+ <version>${version.jboss.unit}</version>
<exclusions>
<exclusion>
<groupId>hibernate</groupId>
@@ -57,6 +59,14 @@
<artifactId>concurrent</artifactId>
<version>${version.oswego.concurrent}</version>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -64,12 +74,12 @@
<plugin>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-tooling-maven2</artifactId>
- <version>1.2.3</version>
+ <version>${version.jboss.unit}</version>
<dependencies>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit</artifactId>
- <version>1.2.3</version>
+ <version>${version.jboss.unit}</version>
</dependency>
</dependencies>
<configuration>
Modified: sandbox/as7_support/wci/test/core/src/main/java/org/gatein/wci/ServletTestCase.java
===================================================================
--- sandbox/as7_support/wci/test/core/src/main/java/org/gatein/wci/ServletTestCase.java 2011-06-27 05:35:36 UTC (rev 6756)
+++ sandbox/as7_support/wci/test/core/src/main/java/org/gatein/wci/ServletTestCase.java 2011-06-27 14:12:40 UTC (rev 6757)
@@ -25,9 +25,11 @@
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.DriverCommand;
import org.jboss.unit.driver.AbstractTestDriver;
+import org.jboss.unit.driver.response.FailureResponse;
import org.jboss.unit.info.TestCaseInfo;
import org.jboss.unit.info.ParameterInfo;
import org.jboss.unit.info.TestInfo;
+import org.jboss.unit.Failure;
import org.jboss.unit.TestId;
import org.jboss.unit.remote.ResponseContext;
import org.jboss.unit.remote.RequestContext;
@@ -37,6 +39,8 @@
import javax.servlet.ServletException;
import java.io.IOException;
+import java.io.Serializable;
+import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.Collections;
@@ -99,7 +103,7 @@
this.requestContext = requestContext;
}
- public ResponseContext popContext(TestId testId)
+ public synchronized ResponseContext popContext(TestId testId)
{
return responseContext;
}
@@ -114,6 +118,21 @@
this.responseContext = responseContext;
}
+ public synchronized void runTest(TestServlet testServlet, WebRequest req, WebResponse resp) throws ServletException, IOException
+ {
+ DriverResponse response;
+ try
+ {
+ response = service(testServlet, req, resp);
+ }
+ catch (AssertionError e)
+ {
+ response = new FailureResponse(Failure.createFailure(e));
+ }
+ setResponseContext(new ResponseContext(response, new HashMap<String, Serializable>()));
+ resp.setStatus(200);
+ }
+
public abstract DriverResponse service(TestServlet testServlet, WebRequest req, WebResponse resp) throws ServletException, IOException;
public abstract DriverResponse invoke(TestServlet testServlet, DriverCommand driverCommand);
Modified: sandbox/as7_support/wci/test/core/src/main/java/org/gatein/wci/TestServlet.java
===================================================================
--- sandbox/as7_support/wci/test/core/src/main/java/org/gatein/wci/TestServlet.java 2011-06-27 05:35:36 UTC (rev 6756)
+++ sandbox/as7_support/wci/test/core/src/main/java/org/gatein/wci/TestServlet.java 2011-06-27 14:12:40 UTC (rev 6757)
@@ -67,17 +67,7 @@
protected void service(WebRequest req, WebResponse resp) throws ServletException, IOException
{
- DriverResponse response;
- try
- {
- response = currentTestCase.service(this, req, resp);
- }
- catch (AssertionError e)
- {
- response = new FailureResponse(Failure.createFailure(e));
- }
- currentTestCase.setResponseContext(new ResponseContext(response, new HashMap<String, Serializable>()));
- resp.setStatus(200);
+ currentTestCase.runTest(this, req, resp);
}
public void destroy()
Modified: sandbox/as7_support/wci/test/pom.xml
===================================================================
--- sandbox/as7_support/wci/test/pom.xml 2011-06-27 05:35:36 UTC (rev 6756)
+++ sandbox/as7_support/wci/test/pom.xml 2011-06-27 14:12:40 UTC (rev 6757)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta03-SNAPSHOT</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-parent</artifactId>
@@ -41,9 +41,7 @@
<modules>
<module>core</module>
- <module>portlets/gatein-portlet</module>
- <module>portlets/exo-portlet</module>
- <module>portlets/native-portlet</module>
+ <module>portlets</module>
<module>servers</module>
</modules>
Modified: sandbox/as7_support/wci/test/portlets/exo-portlet/pom.xml
===================================================================
--- sandbox/as7_support/wci/test/portlets/exo-portlet/pom.xml 2011-06-27 05:35:36 UTC (rev 6756)
+++ sandbox/as7_support/wci/test/portlets/exo-portlet/pom.xml 2011-06-27 14:12:40 UTC (rev 6757)
@@ -2,10 +2,11 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-portlets</artifactId>
- <version>2.1.0-Beta03-SNAPSHOT</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-exo-portlet</artifactId>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
<packaging>war</packaging>
<name>GateIn - WCI eXo Backwards Compatibility Test Portlet</name>
</project>
Modified: sandbox/as7_support/wci/test/portlets/gatein-portlet/pom.xml
===================================================================
--- sandbox/as7_support/wci/test/portlets/gatein-portlet/pom.xml 2011-06-27 05:35:36 UTC (rev 6756)
+++ sandbox/as7_support/wci/test/portlets/gatein-portlet/pom.xml 2011-06-27 14:12:40 UTC (rev 6757)
@@ -2,12 +2,11 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-portlets</artifactId>
- <version>2.1.0-Beta03-SNAPSHOT</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-gatein-portlet</artifactId>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
<packaging>war</packaging>
<name>GateIn - WCI Gatein Test Portlet</name>
-
-
</project>
Modified: sandbox/as7_support/wci/test/portlets/native-portlet/pom.xml
===================================================================
--- sandbox/as7_support/wci/test/portlets/native-portlet/pom.xml 2011-06-27 05:35:36 UTC (rev 6756)
+++ sandbox/as7_support/wci/test/portlets/native-portlet/pom.xml 2011-06-27 14:12:40 UTC (rev 6757)
@@ -2,10 +2,11 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-portlets</artifactId>
- <version>2.1.0-Beta03-SNAPSHOT</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-native-portlet</artifactId>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
<packaging>war</packaging>
<name>GateIn - WCI Native Test Portlet</name>
</project>
Modified: sandbox/as7_support/wci/test/portlets/pom.xml
===================================================================
--- sandbox/as7_support/wci/test/portlets/pom.xml 2011-06-27 05:35:36 UTC (rev 6756)
+++ sandbox/as7_support/wci/test/portlets/pom.xml 2011-06-27 14:12:40 UTC (rev 6757)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta03-SNAPSHOT</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-portlets</artifactId>
Modified: sandbox/as7_support/wci/test/servers/jboss51/pom.xml
===================================================================
--- sandbox/as7_support/wci/test/servers/jboss51/pom.xml 2011-06-27 05:35:36 UTC (rev 6756)
+++ sandbox/as7_support/wci/test/servers/jboss51/pom.xml 2011-06-27 14:12:40 UTC (rev 6757)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta03-SNAPSHOT</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss51</artifactId>
Modified: sandbox/as7_support/wci/test/servers/jboss6/pom.xml
===================================================================
--- sandbox/as7_support/wci/test/servers/jboss6/pom.xml 2011-06-27 05:35:36 UTC (rev 6756)
+++ sandbox/as7_support/wci/test/servers/jboss6/pom.xml 2011-06-27 14:12:40 UTC (rev 6757)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta03-SNAPSHOT</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss6</artifactId>
Modified: sandbox/as7_support/wci/test/servers/jetty6/pom.xml
===================================================================
--- sandbox/as7_support/wci/test/servers/jetty6/pom.xml 2011-06-27 05:35:36 UTC (rev 6756)
+++ sandbox/as7_support/wci/test/servers/jetty6/pom.xml 2011-06-27 14:12:40 UTC (rev 6757)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta03-SNAPSHOT</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jetty6</artifactId>
@@ -29,7 +29,7 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-core</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-native-portlet</artifactId>
@@ -41,7 +41,7 @@
<artifactId>wci-test-gatein-portlet</artifactId>
<scope>test</scope>
<type>war</type>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-exo-portlet</artifactId>
@@ -89,11 +89,13 @@
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit</artifactId>
<scope>test</scope>
+ <version>${version.jboss.unit}</version>
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-remote</artifactId>
<scope>test</scope>
+ <version>${version.jboss.unit}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.cargo</groupId>
@@ -109,16 +111,19 @@
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-mc</artifactId>
<scope>test</scope>
+ <version>${version.jboss.unit}</version>
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-tooling-ant</artifactId>
<scope>test</scope>
+ <version>${version.jboss.unit}</version>
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test</artifactId>
<scope>test</scope>
+ <version>${version.jboss.unit}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.cargo</groupId>
@@ -146,6 +151,7 @@
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test-generic</artifactId>
<scope>test</scope>
+ <version>${version.jboss.unit}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.cargo</groupId>
@@ -218,7 +224,7 @@
<groupId>org.jboss.remoting</groupId>
<artifactId>jboss-remoting</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
@@ -229,7 +235,7 @@
<!-- Jetty Deployer -->
<dependency>
<groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-jetty-deployer</artifactId>
+ <artifactId>cargo-jetty-6-and-earlier-deployer</artifactId>
<type>war</type>
<version>${version.cargo.jetty.deployer}</version>
</dependency>
@@ -327,8 +333,8 @@
<phase>integration-test</phase>
<configuration>
<tasks>
-
- <!-- properties to pass to the build.xml -->
+
+ <!-- properties to pass to the build.xml -->
<property name="project.build.directory" value="${project.build.directory}" />
<property name="plugin_classpath" refid="maven.plugin.classpath" />
<property name="test_classpath" refid="maven.test.classpath" />
@@ -385,16 +391,16 @@
<property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" />
<property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" />
- <property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" />
+ <property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" />
<!-- location of common.xml shared between the different server's build.xml -->
<property name="common.xml.file" value="${test.common.xml}" />
<!-- -->
<!-- Cargo Jetty deployer -->
- <property name="dependency.cargo.jetty-deployer" value="${maven.dependency.org.codehaus.cargo.cargo-jetty-deployer.war.path}" />
+ <property name="dependency.cargo.jetty-deployer" value="${maven.dependency.org.codehaus.cargo.cargo-jetty-6-and-earlier-deployer.war.path}" />
-
+
<ant antfile="${basedir}/src/integration-tests/build.xml" inheritRefs="true">
<target name="tests" />
</ant>
Modified: sandbox/as7_support/wci/test/servers/jetty6/src/integration-tests/build.xml
===================================================================
--- sandbox/as7_support/wci/test/servers/jetty6/src/integration-tests/build.xml 2011-06-27 05:35:36 UTC (rev 6756)
+++ sandbox/as7_support/wci/test/servers/jetty6/src/integration-tests/build.xml 2011-06-27 14:12:40 UTC (rev 6757)
@@ -44,7 +44,7 @@
<extraClasspath>
<path refid="server.libs"/>
</extraClasspath>
- <configuration home="${test.cargo.dir}">
+ <configuration home="${test.cargo.dir}/${test.id}">
<property name="cargo.servlet.port" value="8080"/>
<property name="cargo.logging" value="high"/>
<property name="cargo.jvmargs" value="${cargo.debug}"/>
@@ -59,7 +59,11 @@
</deployable>
</configuration>
- </cargo>
+ </cargo>
+ <!-- A bit of a hack, we sleep for 5 seconds to make sure the deployments are completed
+ before continuing. If we were using maven, we could use the ping url feature to know
+ when the ${cargo.war} is deployed, but this feature is missing in the ant plugin -->
+ <sleep seconds="5"/>
</target>
<target name="cargo.stop" depends="cargo.setup">
@@ -68,9 +72,12 @@
home="${test.cargo.home}"
log="${cargo.log.dir}/cargo.${test.id}.shutdown.log"
action="stop">
- <configuration home="${test.cargo.dir}">
+ <configuration home="${test.cargo.dir}/${test.id}">
</configuration>
</cargo>
+ <!-- Another bit of hack, wait for a bit to make sure the server is really shutdown
+ before continuing with the other tests -->
+ <sleep seconds="5"/>
</target>
</project>
Modified: sandbox/as7_support/wci/test/servers/pom.xml
===================================================================
--- sandbox/as7_support/wci/test/servers/pom.xml 2011-06-27 05:35:36 UTC (rev 6756)
+++ sandbox/as7_support/wci/test/servers/pom.xml 2011-06-27 14:12:40 UTC (rev 6757)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta03-SNAPSHOT</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-server-parent</artifactId>
Modified: sandbox/as7_support/wci/test/servers/tomcat6/pom.xml
===================================================================
--- sandbox/as7_support/wci/test/servers/tomcat6/pom.xml 2011-06-27 05:35:36 UTC (rev 6756)
+++ sandbox/as7_support/wci/test/servers/tomcat6/pom.xml 2011-06-27 14:12:40 UTC (rev 6757)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta03-SNAPSHOT</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-tomcat6</artifactId>
@@ -89,11 +89,13 @@
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit</artifactId>
<scope>test</scope>
+ <version>${version.jboss.unit}</version>
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-remote</artifactId>
<scope>test</scope>
+ <version>${version.jboss.unit}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.cargo</groupId>
@@ -109,16 +111,19 @@
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-mc</artifactId>
<scope>test</scope>
+ <version>${version.jboss.unit}</version>
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-tooling-ant</artifactId>
<scope>test</scope>
+ <version>${version.jboss.unit}</version>
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test</artifactId>
<scope>test</scope>
+ <version>${version.jboss.unit}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.cargo</groupId>
@@ -146,6 +151,7 @@
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test-generic</artifactId>
<scope>test</scope>
+ <version>${version.jboss.unit}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.cargo</groupId>
Modified: sandbox/as7_support/wci/test/servers/tomcat7/pom.xml
===================================================================
--- sandbox/as7_support/wci/test/servers/tomcat7/pom.xml 2011-06-27 05:35:36 UTC (rev 6756)
+++ sandbox/as7_support/wci/test/servers/tomcat7/pom.xml 2011-06-27 14:12:40 UTC (rev 6757)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta03-SNAPSHOT</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-tomcat7</artifactId>
Modified: sandbox/as7_support/wci/tomcat/pom.xml
===================================================================
--- sandbox/as7_support/wci/tomcat/pom.xml 2011-06-27 05:35:36 UTC (rev 6756)
+++ sandbox/as7_support/wci/tomcat/pom.xml 2011-06-27 14:12:40 UTC (rev 6757)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta03-SNAPSHOT</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat</artifactId>
Modified: sandbox/as7_support/wci/tomcat/tomcat6/pom.xml
===================================================================
--- sandbox/as7_support/wci/tomcat/tomcat6/pom.xml 2011-06-27 05:35:36 UTC (rev 6756)
+++ sandbox/as7_support/wci/tomcat/tomcat6/pom.xml 2011-06-27 14:12:40 UTC (rev 6757)
@@ -2,22 +2,22 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-tomcat</artifactId>
- <version>2.1.0-Beta03-SNAPSHOT</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat6</artifactId>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
<packaging>jar</packaging>
<name>GateIn - WCI Tomcat 6 compatibility component</name>
<dependencies>
- <dependency>
- <groupId>org.gatein.wci</groupId>
- <artifactId>wci-wci</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>catalina</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-wci</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ </dependency>
</dependencies>
-
</project>
Modified: sandbox/as7_support/wci/tomcat/tomcat7/pom.xml
===================================================================
--- sandbox/as7_support/wci/tomcat/tomcat7/pom.xml 2011-06-27 05:35:36 UTC (rev 6756)
+++ sandbox/as7_support/wci/tomcat/tomcat7/pom.xml 2011-06-27 14:12:40 UTC (rev 6757)
@@ -2,23 +2,23 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-tomcat</artifactId>
- <version>2.1.0-Beta03-SNAPSHOT</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat7</artifactId>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
<packaging>jar</packaging>
<name>GateIn - WCI Tomcat 7 compatibility component</name>
<dependencies>
- <dependency>
- <groupId>org.gatein.wci</groupId>
- <artifactId>wci-wci</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina</artifactId>
- <version>7.0.2</version>
- </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-wci</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <version>7.0.2</version>
+ </dependency>
</dependencies>
-
</project>
Modified: sandbox/as7_support/wci/wci/pom.xml
===================================================================
--- sandbox/as7_support/wci/wci/pom.xml 2011-06-27 05:35:36 UTC (rev 6756)
+++ sandbox/as7_support/wci/wci/pom.xml 2011-06-27 14:12:40 UTC (rev 6757)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta03-SNAPSHOT</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-wci</artifactId>
More information about the gatein-commits
mailing list