12:56 p.m.
Author: mwringe
Date: 2009-09-01 13:56:06 -0400 (Tue, 01 Sep 2009)
New Revision: 13800
Modified:
modules/portlet/trunk/build/pom.xml
modules/portlet/trunk/test/pom.xml
modules/portlet/trunk/test/src/test/build.xml
Log:
Fix issue with Tomcat not having jaxb in its classpath.
Update version of JBoss remoting to prevent a potential issue where the server will
silently stop running some of the tests.
Modified: modules/portlet/trunk/build/pom.xml
===================================================================
--- modules/portlet/trunk/build/pom.xml 2009-09-01 15:05:32 UTC (rev 13799)
+++ modules/portlet/trunk/build/pom.xml 2009-09-01 17:56:06 UTC (rev 13800)
@@ -32,7 +32,8 @@
<version.apache.tomcat>5.5.12</version.apache.tomcat>
<version.jboss-logging>2.0.4.GA</version.jboss-logging>
<version.jbossxb>2.0.0.GA</version.jbossxb>
- <version.jboss-remoting>2.2.1.GA</version.jboss-remoting>
+ <version.jboss-remoting>2.5.0.GA</version.jboss-remoting>
+ <version.jboss.serialization>1.0.3.GA</version.jboss.serialization>
<version.jboss.portal.common>1.2.5</version.jboss.portal.common>
<version.jboss.portal.web>1.2.3</version.jboss.portal.web>
<version.jboss.unit>1.2.3</version.jboss.unit>
@@ -236,10 +237,15 @@
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.remoting</groupId>
<artifactId>jboss-remoting</artifactId>
<version>${version.jboss-remoting}</version>
</dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-serialization</artifactId>
+ <version>${version.jboss.serialization}</version>
+ </dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
Modified: modules/portlet/trunk/test/pom.xml
===================================================================
--- modules/portlet/trunk/test/pom.xml 2009-09-01 15:05:32 UTC (rev 13799)
+++ modules/portlet/trunk/test/pom.xml 2009-09-01 17:56:06 UTC (rev 13800)
@@ -88,7 +88,7 @@
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.remoting</groupId>
<artifactId>jboss-remoting</artifactId>
</dependency>
@@ -107,6 +107,11 @@
<artifactId>jboss-reflect</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-serialization</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>jboss</groupId>
@@ -162,6 +167,11 @@
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- JSTL for Tomcat -->
<dependency>
@@ -250,7 +260,7 @@
<property name="dependency.junit.jar"
value="${maven.dependency.junit.junit.jar.path}"/>
<property name="dependency.jsr168api.jar"
value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
<property name="dependency.ccpp.jar"
value="${maven.dependency.javax.ccpp.ccpp.jar.path}"/>
- <property name="dependency.jaxb.jar"
value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}"/>
+ <property name="dependency.jaxb.jar"
value="${maven.dependency.sun-jaxb.jaxb-api.jar.path}"/>
<property name="dependency.portal-common-common.jar"
value="${maven.dependency.org.jboss.portal.common.common-common.jar.path}"/>
<property name="dependency.portal-common-portal.jar"
value="${maven.dependency.org.jboss.portal.common.common-portal.jar.path}"/>
@@ -268,7 +278,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}"/>
<property name="dependency.concurrent.jar"
value="${maven.dependency.concurrent.concurrent.jar.path}"/>
<property name="dependency.trove.jar"
value="${maven.dependency.trove.trove.jar.path}"/>
@@ -279,13 +289,13 @@
<property name="dependency.jboss-dependency.jar"
value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
<property name="dependency.jboss-reflect.jar"
value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
<property name="dependency.jboss-common-core.jar"
value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
- <property name="dependency.jaxb.jar"
value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}"/>
<property name="dependency.jboss-mdr.jar"
value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
<property name="dependency.javassist.jar"
value="${maven.dependency.org.jboss.javassist.jar.path}"/>
<property name="dependency.resolver.jar"
value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
<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}"/>
<property name="dependency.cargo-core-uberjar.jar"
value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
<property name="dependency.cargo-ant.jar"
value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
Modified: modules/portlet/trunk/test/src/test/build.xml
===================================================================
--- modules/portlet/trunk/test/src/test/build.xml 2009-09-01 15:05:32 UTC (rev 13799)
+++ modules/portlet/trunk/test/src/test/build.xml 2009-09-01 17:56:06 UTC (rev 13800)
@@ -160,6 +160,7 @@
<path location="${dependency.activation.jar}"/>
<path location="${dependency.jaxb.jar}"/>
<path location="${dependency.ccpp.jar}"/>
+ <path location="${dependency.jboss-serialization.jar}"/>
</path>
<path id="jetty-6.1">