Author: julien_viet Date: 2011-01-07 10:13:01 -0500 (Fri, 07 Jan 2011) New Revision: 5709 Modified: components/pc/trunk/test/servers/tomcat6/pom.xml components/pc/trunk/test/servers/tomcat6/src/test/build.xml components/pc/trunk/test/servers/tomcat6/src/test/common.xml Log: GTNPC-46 : more diet Modified: components/pc/trunk/test/servers/tomcat6/pom.xml =================================================================== --- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-07 14:39:32 UTC (rev 5708) +++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-07 15:13:01 UTC (rev 5709) @@ -359,50 +359,6 @@ </not> </condition> - <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.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.sun-jaxb.jaxb-api.jar.path}"/> - - <property name="dependency.portal-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}"/> - <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/> - <property name="dependency.portal-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}"/> - <property name="dependency.slf4j-simple.jar" value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}"/> - <property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}"/> - - <property name="dependency.portal-wci-wci.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/> - <property name="dependency.portal-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}"/> - - <property name="dependency.portal-portlet-portlet.jar" value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/> - <property name="dependency.portal-portlet-controller.jar" value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/> - <property name="dependency.portal-portlet-mc.jar" value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/> - <property name="dependency.portal-portlet-api.jar" value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/> - - <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.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.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}"/> - <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-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.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.apache-jstl.jar" value="${maven.dependency.apache-taglibs.jstl.jar.path}"/> - <property name="dependency.apache-standard.jar" value="${maven.dependency.apache-taglibs.standard.jar.path}"/> - <!-- location of common.xml shared between the different server's build.xml --> <!--<property name="common.xml.file" value="${test.common.xml}"/>--> <property name="common.xml.file" value="${basedir}/src/test/common.xml"/> Modified: components/pc/trunk/test/servers/tomcat6/src/test/build.xml =================================================================== --- components/pc/trunk/test/servers/tomcat6/src/test/build.xml 2011-01-07 14:39:32 UTC (rev 5708) +++ components/pc/trunk/test/servers/tomcat6/src/test/build.xml 2011-01-07 15:13:01 UTC (rev 5709) @@ -20,9 +20,9 @@ <path refid="portal-portlet"/> <path refid="jboss-unit"/> <path refid="jboss-microcontainer"/> - <pathelement path="${dependency.xercesImpl.jar}"/> - <pathelement path="${dependency.resolver.jar}"/> - <pathelement path="${dependency.xml-apis.jar}"/> + <pathelement location="${apache-xerces:xerces:jar}"/> + <pathelement location="${apache-xerces:xml-apis:jar}"/> + <pathelement location="${apache-xerces:resolver:jar}"/> </path> <path id="Tomcat-6.0-shared"> @@ -31,14 +31,14 @@ <path refid="portal-portlet-shared"/> <path refid="jboss-unit-shared"/> <path refid="jboss-logging"/> - <path location="${dependency.jboss-common-core.jar}"/> - <path location="${dependency.log4j.jar}"/> - <path location="${dependency.concurrent.jar}"/> - <path location="${dependency.activation.jar}"/> - <path location="${dependency.jaxb.jar}"/> - <path location="${dependency.ccpp.jar}"/> - <path location="${dependency.jboss-serialization.jar}"/> - <path location="${dependency.portal-wci-tomcat.jar}"/> + <pathelement location="${org.jboss:jboss-common-core:jar}"/> + <pathelement location="${apache-log4j:log4j:jar}"/> + <pathelement location="${concurrent:concurrent:jar}"/> + <pathelement location="${javax.activation:activation:jar}"/> + <pathelement location="${sun-jaxb:jaxb-api:jar}"/> + <pathelement location="${javax.ccpp:ccpp:jar}"/> + <pathelement location="${jboss:jboss-serialization:jar}"/> + <pathelement location="${org.gatein.wci:wci-tomcat6:jar}"/> </path> <target name="tests" unless="maven.test.skip"> Modified: components/pc/trunk/test/servers/tomcat6/src/test/common.xml =================================================================== --- components/pc/trunk/test/servers/tomcat6/src/test/common.xml 2011-01-07 14:39:32 UTC (rev 5708) +++ components/pc/trunk/test/servers/tomcat6/src/test/common.xml 2011-01-07 15:13:01 UTC (rev 5709) @@ -41,53 +41,53 @@ <echo message="Preparing environment"/> <path id="jboss-logging"> - <pathelement path="${dependency.jboss-logging-spi.jar}"/> - <pathelement path="${dependency.jboss-logging-jdk.jar}"/> - <pathelement path="${dependency.jboss-logging-log4j.jar}"/> + <pathelement location="${jboss:jboss-common-logging-spi:jar}"/> + <pathelement location="${jboss:jboss-common-logging-jdk:jar}"/> + <pathelement location="${jboss:jboss-common-logging-log4j:jar}"/> </path> <path id="jboss-microcontainer"> - <pathelement path="${dependency.jbossxb.jar}"/> + <pathelement location="${org.jboss:jbossxb:jar}"/> </path> <path id="portal-common"> - <pathelement path="${dependency.portal-common-mc.jar}"/> + <pathelement location="${org.gatein.common:common-mc:jar}"/> </path> <path id="portal-common-shared"> - <pathelement path="${dependency.portal-common-common.jar}"/> - <pathelement path="${dependency.portal-common-logging.jar}"/> - <pathelement path="${dependency.slf4j-simple.jar}"/> - <pathelement path="${dependency.slf4j-api.jar}"/> + <pathelement location="${org.gatein.common:common-common:jar}"/> + <pathelement location="${org.gatein.common:common-logging:jar}"/> + <pathelement location="${org.slf4j:slf4j-simple:jar}"/> + <pathelement location="${org.slf4j:slf4j-api:jar}"/> </path> <path id="portal-web"> </path> <path id="portal-web-shared"> - <pathelement path="${dependency.portal-wci-wci.jar}"/> + <pathelement location="${org.gatein.wci:wci-wci:jar}"/> </path> <path id="portal-portlet"> - <pathelement path="${dependency.portal-portlet-controller.jar}"/> - <pathelement path="${dependency.portal-portlet-mc.jar}"/> + <pathelement location="${org.gatein.pc:pc-controller:jar}"/> + <pathelement location="${org.gatein.pc:pc-mc:jar}"/> </path> <path id="portal-portlet-shared"> - <path location="${dependency.portal-portlet-portlet.jar}"/> - <path location="${dependency.portal-portlet-api.jar}"/> - <path location="${dependency.jsr168api.jar}"/> + <pathelement location="${org.gatein.pc:pc-portlet:jar}"/> + <pathelement location="${org.gatein.pc:pc-api:jar}"/> + <pathelement location="${javax.portlet:portlet-api:jar}"/> </path> <path id="jboss-unit"> </path> <path id="jboss-unit-shared"> - <pathelement path="${dependency.jboss-unit.jar}"/> - <pathelement path="${dependency.jboss-unit-remote.jar}"/> - <pathelement path="${dependency.portal-test-generic.jar}"/> - <pathelement path="${dependency.portal-test.jar}"/> - <pathelement path="${dependency.jboss-remoting.jar}"/> + <pathelement location="${org.jboss.unit:jboss-unit:jar}"/> + <pathelement location="${org.jboss.unit:jboss-unit-remote:jar}"/> + <pathelement location="${org.jboss.unit:portal-test-generic:jar}"/> + <pathelement location="${org.jboss.unit:portal-test:jar}"/> + <pathelement location="${org.jboss.remoting:jboss-remoting:jar}"/> </path> </target>