Author: julien(a)jboss.com Date: 2008-04-20 18:55:30 -0400 (Sun, 20 Apr 2008) New Revision: 10658 Modified: modules/web/trunk/build/pom.xml modules/web/trunk/web/pom.xml modules/web/trunk/web/src/test/build.xml Log: update web module to MC 2.0.0.Beta13 Modified: modules/web/trunk/build/pom.xml =================================================================== --- modules/web/trunk/build/pom.xml 2008-04-20 22:54:17 UTC (rev 10657) +++ modules/web/trunk/build/pom.xml 2008-04-20 22:55:30 UTC (rev 10658) @@ -28,14 +28,15 @@ <version.concurrent>1.3.4</version.concurrent> <version.sun.servlet>2.4</version.sun.servlet> <version.apache.tomcat>5.5.12</version.apache.tomcat> - <version.jboss-logging>2.0.3.GA</version.jboss-logging> + <version.apache.log4j>1.2.14</version.apache.log4j> + <version.jboss-logging>2.0.4.GA</version.jboss-logging> <version.jboss-remoting>2.2.1.GA</version.jboss-remoting> <version.jboss.portal.common>1.2.0-SNAPSHOT</version.jboss.portal.common> <version.jboss.unit>1.2.0.Beta2</version.jboss.unit> <version.log4j>1.2.14</version.log4j> <version.apache.commons-logging>1.1.1</version.apache.commons-logging> <version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient> - <version.jboss.microcontainer>2.0.0.Beta9</version.jboss.microcontainer> + <version.jboss.microcontainer>2.0.0.Beta13</version.jboss.microcontainer> <version.cargo>0.9-portal</version.cargo> <version.junit>3.8.1</version.junit> <version.ant>1.7.0</version.ant> @@ -90,6 +91,11 @@ <version>${version.jboss.portal.common}</version> </dependency> <dependency> + <groupId>org.jboss.portal.common</groupId> + <artifactId>common-mc</artifactId> + <version>${version.jboss.portal.common}</version> + </dependency> + <dependency> <groupId>sun-servlet</groupId> <artifactId>servlet-api</artifactId> <version>${version.sun.servlet}</version> @@ -99,18 +105,13 @@ <artifactId>catalina</artifactId> <version>${version.apache.tomcat}</version> </dependency> - <dependency> - <groupId>concurrent</groupId> - <artifactId>concurrent</artifactId> - <version>${version.concurrent}</version> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + <version>${version.apache.log4j}</version> </dependency> + <dependency> - <groupId>org.jboss.portal.common</groupId> - <artifactId>common-mc</artifactId> - <version>${version.jboss.portal.common}</version> - </dependency> - <dependency> <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit</artifactId> <version>${version.jboss.unit}</version> @@ -140,102 +141,36 @@ <artifactId>portal-test-generic</artifactId> <version>${version.jboss.unit}</version> </dependency> + <dependency> <groupId>jboss</groupId> - <artifactId>jboss-logging-jdk</artifactId> + <artifactId>jboss-common-logging-jdk</artifactId> <version>${version.jboss-logging}</version> </dependency> <dependency> <groupId>jboss</groupId> - <artifactId>jboss-logging-log4j</artifactId> + <artifactId>jboss-common-logging-log4j</artifactId> <version>${version.jboss-logging}</version> </dependency> + <dependency> <groupId>jboss</groupId> <artifactId>jboss-remoting</artifactId> <version>${version.jboss-remoting}</version> </dependency> + <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-aop-mc-int</artifactId> - <version>${version.jboss.microcontainer}</version> + <groupId>concurrent</groupId> + <artifactId>concurrent</artifactId> + <version>${version.concurrent}</version> </dependency> <dependency> <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-classloader</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-container</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-dependency</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-client-spi</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-client</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-core-spi</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-core</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-impl</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-spi</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-structure-spi</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-vfs-spi</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-vfs</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-kernel</artifactId> <version>${version.jboss.microcontainer}</version> </dependency> + <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-managed</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-metatype</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>${version.apache.commons-logging}</version> Modified: modules/web/trunk/web/pom.xml =================================================================== --- modules/web/trunk/web/pom.xml 2008-04-20 22:54:17 UTC (rev 10657) +++ modules/web/trunk/web/pom.xml 2008-04-20 22:55:30 UTC (rev 10658) @@ -36,6 +36,10 @@ <groupId>apache-tomcat</groupId> <artifactId>catalina</artifactId> </dependency> + <dependency> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> <!-- SCOPE TEST --> @@ -81,12 +85,12 @@ </dependency> <dependency> <groupId>jboss</groupId> - <artifactId>jboss-logging-jdk</artifactId> + <artifactId>jboss-common-logging-jdk</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>jboss</groupId> - <artifactId>jboss-logging-log4j</artifactId> + <artifactId>jboss-common-logging-log4j</artifactId> <scope>test</scope> </dependency> <dependency> @@ -95,85 +99,10 @@ </dependency> <dependency> <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-aop-mc-int</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-classloader</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-container</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-dependency</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-client-spi</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-core-spi</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-impl</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-spi</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-structure-spi</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-vfs-spi</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-vfs</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-kernel</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-managed</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-metatype</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <scope>test</scope> @@ -230,56 +159,50 @@ <property name="runtime_classpath" refid="maven.runtime.classpath"/> <property name="test_classpath" refid="maven.test.classpath"/> <property name="plugin_classpath" refid="maven.plugin.classpath"/> - <property name="project.version" value="${project.version}"/> + <!-- --> + <property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}"/> + <property name="dependency.commons-logging.jar" value="${maven.dependency.commons-logging.commons-logging.jar.path}"/> + <property name="dependency.commons-httpclient.jar" value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/> + <property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}"/> + <property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}"/> + <property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}"/> + + <!-- JBoss Portal --> + <property name="dependency.portal-common-common.jar" value="${maven.dependency.org.jboss.portal.common.common-common.jar.path}"/> + <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.jboss.portal.common.common-mc.jar.path}"/> + + <!-- JBoss Unit --> + <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/> + <property name="dependency.jboss-unit-mc.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/> + <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}"/> + + <!-- JBoss Microcontainer --> <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}"/> <property name="dependency.trove.jar" value="${maven.dependency.trove.trove.jar.path}"/> - <property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-logging-spi.jar.path}"/> - <property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-logging-jdk.jar.path}"/> - <property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-logging-log4j.jar.path}"/> - <property name="dependency.jboss-vfs.jar" value="${maven.dependency.org.jboss.jboss-vfs.jar.path}"/> - <property name="dependency.jboss-aop-mc-int.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-aop-mc-int.jar.path}"/> - <property name="dependency.jboss-classloader.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-classloader.jar.path}"/> - <property name="dependency.jboss-container.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-container.jar.path}"/> - <property name="dependency.jboss-dependency.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/> - <property name="dependency.jboss-deployers-client-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-client-spi.jar.path}"/> - <property name="dependency.jboss-deployers-client.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-client.jar.path}"/> - <property name="dependency.jboss-deployers-core-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-core-spi.jar.path}"/> - <property name="dependency.jboss-deployers-core.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-core.jar.path}"/> - <property name="dependency.jboss-deployers-impl.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-impl.jar.path}"/> - <property name="dependency.jboss-deployers-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-spi.jar.path}"/> - <property name="dependency.jboss-deployers-structure-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-structure-spi.jar.path}"/> - <property name="dependency.jboss-deployers-vfs-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-vfs-spi.jar.path}"/> - <property name="dependency.jboss-deployers-vfs.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-vfs.jar.path}"/> + <property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/> + <property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/> + <property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/> <property name="dependency.jboss-kernel.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/> - <property name="dependency.jboss-managed.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-managed.jar.path}"/> - <property name="dependency.jboss-metatype.jar" value="${maven.dependency.org.jboss.microcontainer.jboss.metatype.jar.path}"/> - <property name="dependency.jboss-aop.jar" value="${maven.dependency.org.jboss.aop.jboss-aop.jar.path}"/> - <property name="dependency.javassist.jar" value="${maven.dependency.org.jboss.javassist.jar.path}"/> + <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-remoting.jar" value="${maven.dependency.jboss.jboss-remoting.jar.path}"/> - <property name="dependency.portal-common.jar" value="${maven.dependency.org.jboss.portal.common.common-common.jar.path}"/> - <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.jboss.portal.common.common-mc.jar.path}"/> - <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/> - <property name="dependency.jboss-unit-mc.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/> - <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.log4j.jar" value="${maven.dependency.log4j.log4j.jar.path}"/> - <property name="dependency.commons-logging.jar" value="${maven.dependency.commons-logging.commons-logging.jar.path}"/> - <property name="dependency.commons-httpclient.jar" value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/> - <property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}"/> - <property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}"/> - <property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}"/> <ant antfile="${basedir}/src/test/build.xml"> <target name="tests"/> </ant> + </tasks> </configuration> <goals> Modified: modules/web/trunk/web/src/test/build.xml =================================================================== --- modules/web/trunk/web/src/test/build.xml 2008-04-20 22:54:17 UTC (rev 10657) +++ modules/web/trunk/web/src/test/build.xml 2008-04-20 22:55:30 UTC (rev 10658) @@ -122,109 +122,73 @@ <fileset dir="${target}/test-classes/support"/> </copy> - <path id="mc.concurrent"> - <pathelement path="${dependency.concurrent.jar}"/> - </path> - <path id="mc.trove"> - <pathelement path="${dependency.trove.jar}"/> - </path> - <path id="mc.xerces"> - <pathelement path="${dependency.xercesImpl.jar}"/> - <pathelement path="${dependency.resolver.jar}"/> - <pathelement path="${dependency.xml-apis.jar}"/> - </path> - <path id="mc.javassist"> - <pathelement path="${dependency.javassist.jar}"/> - </path> - <path id="mc.jboss_common_logging_spi"> + <path id="jboss-logging"> <pathelement path="${dependency.jboss-logging-spi.jar}"/> - </path> - <path id="mc.jboss_common_logging_jdk"> <pathelement path="${dependency.jboss-logging-jdk.jar}"/> - </path> - <path id="mc.jboss_common_logging_log4j"> <pathelement path="${dependency.jboss-logging-log4j.jar}"/> </path> - <path id="mc.jboss_common_core"> + + <path id="jboss-microcontainer"> + <pathelement path="${dependency.jboss-kernel.jar}"/> + <pathelement path="${dependency.jboss-dependency.jar}"/> + <pathelement path="${dependency.jboss-reflect.jar}"/> <pathelement path="${dependency.jboss-common-core.jar}"/> - </path> - <path id="mc.jboss_vfs"> - <pathelement path="${dependency.jboss-vfs.jar}"/> - </path> - <path id="mc.jboss_xb"> + <pathelement path="${dependency.jboss-mdr.jar}"/> + <pathelement path="${dependency.jaxb.jar}"/> <pathelement path="${dependency.jbossxb.jar}"/> </path> - <path id="mc.jboss_aop"> - <pathelement path="${dependency.jboss-aop.jar}"/> - </path> - <path id="mc.jboss_microcontainer"> - <pathelement path="${dependency.jboss-aop-mc-int.jar}"/> - <pathelement path="${dependency.jboss-classloader.jar}"/> - <pathelement path="${dependency.jboss-container.jar}"/> - <pathelement path="${dependency.jboss-dependency.jar}"/> - <pathelement path="${dependency.jboss-container-metadata.jar}"/> - <pathelement path="${dependency.jboss-container-metadata-spi.jar}"/> - <pathelement path="${dependency.jboss-deployers-core.jar}"/> - <pathelement path="${dependency.jboss-deployers-core-spi.jar}"/> - <pathelement path="${dependency.jboss-deployers-client.jar}"/> - <pathelement path="${dependency.jboss-deployers-client-spi.jar}"/> - <pathelement path="${dependency.jboss-deployers-impl.jar}"/> - <pathelement path="${dependency.jboss-deployers-spi.jar}"/> - <pathelement path="${dependency.jboss-deployers-structure-spi.jar}"/> - <pathelement path="${dependency.jboss-deployers-vfs.jar}"/> - <pathelement path="${dependency.jboss-deployers-vfs-spi.jar}"/> - <pathelement path="${dependency.jboss-managed.jar}"/> - <pathelement path="${dependency.jboss-metatype.jar}"/> - <pathelement path="${dependency.jboss-kernel.jar}"/> - </path> - <path id="mc.portal-common"> + + <path id="portal-common"> <pathelement path="${dependency.portal-common-mc.jar}"/> </path> - <path id="mc.jboss-unit"> + + <path id="portal-common-shared"> + <pathelement path="${dependency.portal-common-common.jar}"/> + </path> + + <path id="jboss-unit"> <pathelement path="${dependency.jboss-unit.jar}"/> <pathelement path="${dependency.jboss-unit-mc.jar}"/> <pathelement path="${dependency.jboss-unit-remote.jar}"/> <pathelement path="${dependency.portal-test-generic.jar}"/> <pathelement path="${dependency.portal-test.jar}"/> - </path> - <path id="mc.portal-test-generic"> - <pathelement path="${dependency.portal-test-generic.jar}"/> - </path> - <path id="mc.jboss-remoting"> <pathelement path="${dependency.jboss-remoting.jar}"/> </path> - <path id="mc.log4j"> - <pathelement path="${dependency.log4j.jar}"/> - </path> <path id="jboss-4.2"> - <path refid="mc.portal-common"/> - <path refid="mc.portal-test-generic"/> - <path refid="mc.trove"/> - <path refid="mc.javassist"/> - <path refid="mc.jboss_common_core"/> - <path refid="mc.jboss_vfs"/> - <path refid="mc.jboss_xb"/> - <path refid="mc.jboss_aop"/> - <path refid="mc.jboss_microcontainer"/> + <path refid="portal-common"/> + <path refid="jboss-microcontainer"/> </path> + <path id="jboss-4.2-shared"> + <path refid="portal-common-shared"/> + <path location="${dependency.jboss-unit.jar}"/> + <path location="${dependency.jboss-unit-remote.jar}"/> + <path location="${target}/web-web-${project.version}.jar"/> + </path> + <path id="tomcat-6.0"> - <path refid="mc.portal-common"/> - <path refid="mc.jboss-unit"/> - <path refid="mc.jboss-remoting"/> - <path refid="mc.log4j"/> - <path refid="mc.concurrent"/> - <path refid="mc.trove"/> - <path refid="mc.xerces"/> - <path refid="mc.javassist"/> - <path refid="mc.jboss_common_core"/> - <path refid="mc.jboss_vfs"/> - <path refid="mc.jboss_xb"/> - <path refid="mc.jboss_aop"/> - <path refid="mc.jboss_microcontainer"/> + <path refid="portal-common"/> + <path refid="jboss-unit"/> + <path refid="jboss-microcontainer"/> + <pathelement path="${dependency.log4j.jar}"/> + <pathelement path="${dependency.javassist.jar}"/> + <pathelement path="${dependency.xercesImpl.jar}"/> + <pathelement path="${dependency.resolver.jar}"/> + <pathelement path="${dependency.xml-apis.jar}"/> + <pathelement path="${dependency.trove.jar}"/> + <pathelement path="${dependency.concurrent.jar}"/> </path> + <path id="tomcat-6.0-shared"> + <path refid="jboss-logging"/> + <path refid="portal-common-shared"/> + <path location="${dependency.log4j.jar}"/> + <path location="${dependency.activation.jar}"/> + <path location="${dependency.junit.jar}"/> + <path location="${target}/web-web-${project.version}.jar"/> + </path> + <!-- SPI Test case--> <mkdir dir="${test.temp.lib}"/> @@ -418,7 +382,6 @@ org.jboss.ws.integration.jboss42.DeployerInterceptorJSE.isWebserviceDeployment(DeployerInterceptorJSE.java:84) --> - <cargo containerId="jboss42x" home="${test.jboss-4.2.home}" @@ -428,10 +391,7 @@ wait="${cargo.wait}"> <sharedClasspath> - <path location="${dependency.portal-common.jar}"/> - <path location="${dependency.jboss-unit.jar}"/> - <path location="${dependency.jboss-unit-remote.jar}"/> - <path location="${target}/web-web-${project.version}.jar"/> + <path refid="jboss-4.2-shared"/> </sharedClasspath> <configuration> @@ -509,7 +469,7 @@ </antcall> </target> - <target name="tests.jboss-4.2" if="biltobilto"> + <target name="tests.jboss-4.2"> <!-- spi tests --> @@ -555,18 +515,8 @@ wait="${cargo.wait}"> <sharedClasspath> - <path refid="mc.jboss_common_logging_spi"/> - <path refid="mc.jboss_common_logging_jdk"/> - <path refid="mc.jboss_common_logging_log4j"/> + <path refid="tomcat-6.0-shared"/> - <path location="${dependency.log4j.jar}"/> - <path location="${dependency.concurrent.jar}"/> - <path location="${dependency.portal-common.jar}"/> - <path location="${dependency.activation.jar}"/> - <path location="${dependency.junit.jar}"/> - - <path location="${target}/web-web-${project.version}.jar"/> - </sharedClasspath> <configuration> <property name="cargo.servlet.port" value="8080"/>