9:50 a.m.
Author: mwringe
Date: 2010-02-16 10:50:47 -0500 (Tue, 16 Feb 2010)
New Revision: 1750
Removed:
components/wci/trunk/test/src/test/resources/portal-test-spi-cs-jar/org/jboss/portal/test/web/server-beans.xml
Modified:
components/wci/trunk/pom.xml
components/wci/trunk/test/servers/jetty6/
components/wci/trunk/test/servers/jetty6/pom.xml
Log:
Update cargo version to remove hacks in Jetty test configuration.
Remove unused server-beans.xml file.
Modified: components/wci/trunk/pom.xml
===================================================================
--- components/wci/trunk/pom.xml 2010-02-16 14:33:35 UTC (rev 1749)
+++ components/wci/trunk/pom.xml 2010-02-16 15:50:47 UTC (rev 1750)
@@ -32,7 +32,7 @@
<version.discovery>0.4</version.discovery>
<!-- used in test module by maven-antrun-extended-plugin -->
<version.jboss.unit>1.2.3</version.jboss.unit>
- <version.cargo>1.0.1-alpha-1</version.cargo>
+ <version.cargo>1.0.1-alpha-2</version.cargo>
</properties>
Property changes on: components/wci/trunk/test/servers/jetty6
___________________________________________________________________
Name: svn:ignore
+ target
Modified: components/wci/trunk/test/servers/jetty6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jetty6/pom.xml 2010-02-16 14:33:35 UTC (rev 1749)
+++ components/wci/trunk/test/servers/jetty6/pom.xml 2010-02-16 15:50:47 UTC (rev 1750)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.0.0-CR02-SNAPSHOT</version>
+ <version>2.0.0-CR03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jetty6</artifactId>
@@ -183,7 +183,7 @@
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-jetty-deployer</artifactId>
<type>war</type>
- <version>1.0.1-SNAPSHOT</version>
+ <version>${version.cargo}</version>
</dependency>
</dependencies>
@@ -248,8 +248,7 @@
<dependency>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-ant</artifactId>
- <!-- <version>${version.cargo}</version> -->
- <version>1.0.1-SNAPSHOT</version>
+ <version>${version.cargo}</version>
<exclusions>
<exclusion>
<groupId>ant</groupId>
@@ -260,8 +259,7 @@
<dependency>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
-<!-- <version>${version.cargo}</version> -->
- <version>1.0.1-SNAPSHOT</version>
+ <version>${version.cargo}</version>
<scope>test</scope>
</dependency>
</dependencies>
Deleted:
components/wci/trunk/test/src/test/resources/portal-test-spi-cs-jar/org/jboss/portal/test/web/server-beans.xml
===================================================================
---
components/wci/trunk/test/src/test/resources/portal-test-spi-cs-jar/org/jboss/portal/test/web/server-beans.xml 2010-02-16
14:33:35 UTC (rev 1749)
+++
components/wci/trunk/test/src/test/resources/portal-test-spi-cs-jar/org/jboss/portal/test/web/server-beans.xml 2010-02-16
15:50:47 UTC (rev 1750)
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
- ~ contributors as indicated by the @authors tag. See the ~
- ~ copyright.txt in the distribution for a full listing of ~
- ~ individual contributors. ~
- ~ ~
- ~ This is free software; you can redistribute it and/or modify it ~
- ~ under the terms of the GNU Lesser General Public License as ~
- ~ published by the Free Software Foundation; either version 2.1 of ~
- ~ the License, or (at your option) any later version. ~
- ~ ~
- ~ This software is distributed in the hope that it will be useful, ~
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
- ~ Lesser General Public License for more details. ~
- ~ ~
- ~ You should have received a copy of the GNU Lesser General Public ~
- ~ License along with this software; if not, write to the Free ~
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_2_0.xsd"
- xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="RemoteTestSuite"
class="org.jboss.unit.remote.driver.CompositeRemoteTestDriver">
- <constructor>
- <parameter
class="org.jboss.unit.driver.impl.composite.AbstractCompositeTestDriver"><inject
bean="TestSuite"/></parameter>
- </constructor>
- </bean>
-
- <bean name="TestDriverServer"
class="org.jboss.unit.remote.driver.RemoteTestDriverServer">
- <property name="delegate"><inject
bean="RemoteTestSuite"/></property>
- </bean>
-
- <bean name="TestDriverServerExporter"
class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter">
- <constructor>
- <parameter>socket://localhost:5400</parameter>
- <parameter><inject
bean="TestDriverServer"/></parameter>
-
<parameter>org.jboss.unit.remote.driver.RemoteTestDriver</parameter>
- </constructor>
- </bean>
-
- <bean name="ServletContainerFactory"
GetTestCaseclass="org.gatein.wci.impl.DefaultServletContainerFactory">
- <constructor
factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory"
factoryMethod="getInstance"/>
- </bean>
-
- <bean name="ServletContainer"
class="org.gatein.wci.ServletContainer">
- <constructor factoryMethod="getServletContainer">
- <factory bean="ServletContainerFactory"/>
- </constructor>
- </bean>
-
- <bean name="TestSuite"
class="org.jboss.unit.driver.impl.composite.CompositeTestDriver"/>
-
- <bean name="SPITestCase"
class="org.gatein.wci.spi.SPITestCase">
- <install bean="TestSuite" method="mount">
- <parameter><this/></parameter>
- </install>
- <uninstall bean="TestSuite" method="unmount">
- <parameter><this/></parameter>
- </uninstall>
- </bean>
-
- <bean name="SPICompatiblityTestCase"
class="org.gatein.wci.spi.SPICompatibilityTestCase">
- <install bean="TestSuite" method="mount">
- <parameter><this/></parameter>
- </install>
- <uninstall bean="TestSuite" method="unmount">
- <parameter><this/></parameter>
- </uninstall>
- </bean>
-
-</deployment>