2:22 p.m.
Author: mwringe
Date: 2009-08-29 15:22:47 -0400 (Sat, 29 Aug 2009)
New Revision: 122
Modified:
components/wci/trunk/build/pom.xml
components/wci/trunk/wci/
components/wci/trunk/wci/pom.xml
components/wci/trunk/wci/src/test/build.xml
Log:
Fix test issues and failures.
Modified: components/wci/trunk/build/pom.xml
===================================================================
--- components/wci/trunk/build/pom.xml 2009-08-29 18:57:56 UTC (rev 121)
+++ components/wci/trunk/build/pom.xml 2009-08-29 19:22:47 UTC (rev 122)
@@ -31,16 +31,18 @@
<version.jetty>6.1.7</version.jetty>
<version.jboss-logging>2.0.4.GA</version.jboss-logging>
<version.apache.log4j>1.2.14</version.apache.log4j>
- <version.jboss-remoting>2.2.2.SP1</version.jboss-remoting>
+ <version.jboss-remoting>2.5.0.GA</version.jboss-remoting>
<version.jboss.portal.common>3.0.0-SNAPSHOT</version.jboss.portal.common>
<version.jboss.unit>1.2.2</version.jboss.unit>
<version.jboss-reflect>2.0.2.GA</version.jboss-reflect>
<version.apache.commons-logging>1.1.0.jboss</version.apache.commons-logging>
<version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient>
<version.jboss.microcontainer>2.0.2.GA</version.jboss.microcontainer>
- <version.cargo>1.0-alpha-6</version.cargo>
+ <version.jboss.serialization>1.0.3.GA</version.jboss.serialization>
+ <version.cargo>1.0.1-SNAPSHOT</version.cargo>
<version.junit>3.8.2-brew</version.junit>
<version.ant>1.7.0</version.ant>
+ <version.jaxb>2.1</version.jaxb>
</properties>
<repositories>
@@ -65,6 +67,16 @@
<enabled>false</enabled>
</releases>
</repository>
+ <repository>
+ <id>codehaus snapshot repository</id>
+ <url>http://snapshots.repository.codehaus.org/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
</repositories>
<build>
@@ -181,7 +193,7 @@
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.remoting</groupId>
<artifactId>jboss-remoting</artifactId>
<version>${version.jboss-remoting}</version>
</dependency>
@@ -196,8 +208,13 @@
<artifactId>jboss-dependency</artifactId>
<version>${version.jboss.microcontainer}</version>
</dependency>
-
<dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-serialization</artifactId>
+ <version>${version.jboss.serialization}</version>
+ </dependency>
+
+ <dependency>
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
<version>${version.concurrent}</version>
@@ -207,7 +224,7 @@
<artifactId>jboss-kernel</artifactId>
<version>${version.jboss.microcontainer}</version>
</dependency>
-
+
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -245,6 +262,11 @@
<artifactId>cargo-core-uberjar</artifactId>
<version>${version.cargo}</version>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${version.jaxb}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Property changes on: components/wci/trunk/wci
___________________________________________________________________
Name: svn:ignore
+ target
Modified: components/wci/trunk/wci/pom.xml
===================================================================
--- components/wci/trunk/wci/pom.xml 2009-08-29 18:57:56 UTC (rev 121)
+++ components/wci/trunk/wci/pom.xml 2009-08-29 19:22:47 UTC (rev 122)
@@ -97,7 +97,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.remoting</groupId>
<artifactId>jboss-remoting</artifactId>
</dependency>
<dependency>
@@ -116,6 +116,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-serialization</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<scope>test</scope>
@@ -134,6 +139,11 @@
<artifactId>saxpath</artifactId>
</dependency>
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>cargo</groupId>
<artifactId>cargo-manager</artifactId>
<type>war</type>
@@ -228,7 +238,7 @@
<property name="dependency.jboss-unit-remote.jar"
value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
<property name="dependency.portal-test.jar"
value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
<property name="dependency.portal-test-generic.jar"
value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
- <property name="dependency.jboss-remoting.jar"
value="${maven.dependency.jboss.jboss-remoting.jar.path}"/>
+ <property name="dependency.jboss-remoting.jar"
value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
<!-- JBoss Microcontainer -->
<property name="dependency.concurrent.jar"
value="${maven.dependency.concurrent.concurrent.jar.path}"/>
@@ -245,6 +255,7 @@
<property name="dependency.xercesImpl.jar"
value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
<property name="dependency.xml-apis.jar"
value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
<property name="dependency.jbossxb.jar"
value="${maven.dependency.org.jboss.jbossxb.jar.path}"/>
+ <property name="dependency.jboss-serialization.jar"
value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
<!-- Cargo Jetty deployer -->
<property name="dependency.cargo.jetty-deployer"
value="${maven.dependency.org.codehaus.cargo.cargo-jetty-deployer.war.path}"/>
Modified: components/wci/trunk/wci/src/test/build.xml
===================================================================
--- components/wci/trunk/wci/src/test/build.xml 2009-08-29 18:57:56 UTC (rev 121)
+++ components/wci/trunk/wci/src/test/build.xml 2009-08-29 19:22:47 UTC (rev 122)
@@ -268,6 +268,7 @@
<path location="${dependency.activation.jar}"/>
<path location="${dependency.junit.jar}"/>
<path location="${target}/wci-wci-${project.version}.jar"/>
+ <path location="${dependency.jboss-serialization.jar}"/>
</path>
<path id="jetty-6.1">
@@ -597,8 +598,9 @@
<!--Strip cargo manager war filename-->
<copy file="${dependency.cargo-manager.war}"
tofile="${test.temp.lib}/manager.war"/>
+ <!-- unjar the war -->
+ <unzip src="${test.temp.lib}/manager.war"
dest="${test.temp.lib}/manager"/>
-
</target>
<target name="cargo.setup">
@@ -884,6 +886,7 @@
<!--<property name="cargo.jvmargs" value="-Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"/>-->
<deployable type="war"
file="${test.temp.lib}/manager.war"/>
+ <file file="${test.temp.lib}/manager"
todir="webapps/manager"/>
<deployable type="war" file="${cargo.war}"/>
</configuration>
</cargo>