Author: julien_viet Date: 2011-01-07 09:29:18 -0500 (Fri, 07 Jan 2011) New Revision: 5706 Modified: components/pc/trunk/test/servers/tomcat6/src/test/common.xml Log: GTNPC-46 : remove what is not needed Modified: components/pc/trunk/test/servers/tomcat6/src/test/common.xml =================================================================== --- components/pc/trunk/test/servers/tomcat6/src/test/common.xml 2011-01-07 13:47:58 UTC (rev 5705) +++ components/pc/trunk/test/servers/tomcat6/src/test/common.xml 2011-01-07 14:29:18 UTC (rev 5706) @@ -72,7 +72,6 @@ <path id="portal-portlet"> <pathelement path="${dependency.portal-portlet-controller.jar}"/> <pathelement path="${dependency.portal-portlet-mc.jar}"/> - <pathelement path="${dependency.portal-portlet-tests.jar}"/> </path> <path id="portal-portlet-shared"> @@ -92,45 +91,6 @@ <pathelement path="${dependency.jboss-remoting.jar}"/> </path> - <path id="JBoss-4.2"> - <path refid="portal-common"/> - <path refid="portal-web"/> - <path refid="portal-portlet"/> - <path refid="jboss-microcontainer"/> - <path location="${dependency.jboss-common-core.jar}"/> - </path> - - <path id="JBoss-4.2-shared"> - <path refid="portal-common-shared"/> - <path refid="portal-web-shared"/> - <path refid="portal-portlet-shared"/> - <path refid="jboss-unit-shared"/> - <path location="${dependency.ccpp.jar}"/> - <path location="${dependency.portal-wci-tomcat.jar}"/> - </path> - - <path id="JBoss-5.1"> - <path refid="portal-common"/> - <path refid="portal-web"/> - <path refid="portal-portlet"/> - <path refid="jboss-microcontainer"/> - <path location="${dependency.jboss-common-core.jar}"/> - </path> - - <path id="JBoss-5.1-shared"> - <path refid="portal-common-shared"/> - <path refid="portal-web-shared"/> - <path refid="portal-portlet-shared"/> - <path refid="jboss-unit-shared"/> - <path location="${dependency.ccpp.jar}"/> - <path location="${dependency.portal-wci-tomcat.jar}"/> - - <!-- paths needed for remote jboss deployment --> - <path location="${dependency.cargo-jboss-deployer.jar}"/> - <path location="${dependency.jboss-profile-service.jar}"/> - <path location="${dependency.cargo-core-container-jboss.jar}"/> - </path> - <path id="Tomcat-6.0"> <path refid="portal-common"/> <path refid="portal-web"/> @@ -140,7 +100,6 @@ <pathelement path="${dependency.xercesImpl.jar}"/> <pathelement path="${dependency.resolver.jar}"/> <pathelement path="${dependency.xml-apis.jar}"/> - <pathelement path="${dependency.trove.jar}"/> </path> <path id="Tomcat-6.0-shared"> @@ -159,62 +118,6 @@ <path location="${dependency.portal-wci-tomcat.jar}"/> </path> - <path id="Tomcat-7.0"> - <path refid="portal-common"/> - <path refid="portal-web"/> - <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 path="${dependency.trove.jar}"/> - </path> - - <path id="Tomcat-7.0-shared"> - <path refid="portal-common-shared"/> - <path refid="portal-web-shared"/> - <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}"/> - </path> - - <path id="Jetty-6.1"> - <path refid="portal-common"/> - <path refid="portal-web"/> - <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 path="${dependency.trove.jar}"/> - </path> - - <path id="Jetty-6.1-shared"> - <path refid="portal-common-shared"/> - <path refid="portal-web-shared"/> - <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-jetty.jar}"/> - </path> - </target> <!-- Check which servlet containers are known --> @@ -223,22 +126,6 @@ <property environment="env"/> <!--If properties are not in command line check if they are set in env--> - <condition property="JBOSS_4_2_HOME" value="${env.JBOSS_4_2_HOME}"> - <and> - <isset property="env.JBOSS_4_2_HOME"/> - <not> - <isset property="JBOSS_4_2_HOME"/> - </not> - </and> - </condition> - <condition property="JBOSS_5_1_HOME" value="${env.JBOSS_5_1_HOME}"> - <and> - <isset property="env.JBOSS_5_1_HOME"/> - <not> - <isset property="JBOSS_5_1_HOME"/> - </not> - </and> - </condition> <condition property="TOMCAT_6_0_HOME" value="${env.TOMCAT_6_0_HOME}"> <and> <isset property="env.TOMCAT_6_0_HOME"/> @@ -247,28 +134,8 @@ </not> </and> </condition> - <condition property="TOMCAT_7_0_HOME" value="${env.TOMCAT_7_0_HOME}"> - <and> - <isset property="env.TOMCAT_7_0_HOME"/> - <not> - <isset property="TOMCAT_7_0_HOME"/> - </not> - </and> - </condition> - <condition property="JETTY_6_1_HOME" value="${env.JETTY_6_1_HOME}"> - <and> - <isset property="env.JETTY_6_1_HOME"/> - <not> - <isset property="JETTY_6_1_HOME"/> - </not> - </and> - </condition> - <echo message="JBOSS_4_2_HOME: ${JBOSS_4_2_HOME}"/> - <echo message="JBOSS_5_1_HOME: ${JBOSS_5_1_HOME}"/> <echo message="TOMCAT_6_0_HOME: ${TOMCAT_6_0_HOME}"/> - <echo message="TOMCAT_7_0_HOME: ${TOMCAT_7_0_HOME}"/> - <echo message="JETTY_6_1_HOME: ${JETTY_6_1_HOME}"/> </target> <target name="evaluate_properties.tomcat"> @@ -283,42 +150,7 @@ </fail> </target> - <target name="evaluate_properties.jetty"> - <fail message="Please set the environment variable JETTY_6_1_HOME"> - <condition> - <and> - <not> - <isset property="JETTY_6_1_HOME"/> - </not> - </and> - </condition> - </fail> - </target> - - <target name="evaluate_properties.jboss"> - <fail message="Please set the environment variables JBOSS_4_2_HOME"> - <condition> - <and> - <not> - <isset property="JBOSS_4_2_HOME"/> - </not> - </and> - </condition> - </fail> - <fail message="Please set the environment variable JBOSS_5_1_HOME"> - <condition> - <and> - <not> - <isset property="JBOSS_5_1_HOME"/> - </not> - </and> - </condition> - </fail> - </target> - <target name="evaluate_properties.all"> - <antcall target="evaluate_properties.jboss"/> - <antcall target="evaluate_properties.jetty"/> <antcall target="evaluate_properties.tomcat"/> </target> @@ -446,21 +278,19 @@ <package-jsr286-ext-test test="portletmode"/> <!-- --> - <copy todir="${test.temp.dir}/${test.server.name}-${test.server.version}/portlet-test-war"> - <fileset dir="${target}/test-classes/portlet-test-war"/> - </copy> - <copy todir="${test.temp.dir}/${test.server.name}-${test.server.version}/portlet-test-war/WEB-INF/lib" flatten="true"> + <copy todir="${target}/test-classes/portlet-test-war/WEB-INF/lib" flatten="true"> <path refid="${test.server.name}-${test.server.version}"/> <path> <pathelement location="${org.gatein.pc:pc-test-core:jar}"/> <pathelement location="${org.gatein.pc:pc-test-core:test-jar:tests}"/> </path> </copy> - <mkdir dir="${test.temp.lib}/${test.server.name}-${test.server.version}"/> - <jar jarfile="${test.temp.lib}/${test.server.name}-${test.server.version}/portlet-test.war"> - <fileset dir="${test.temp.dir}/${test.server.name}-${test.server.version}/portlet-test-war"/> - </jar> + <war + destfile="${test.temp.lib}/${test.server.name}-${test.server.version}/portlet-test.war" + needxmlfile="false"> + <fileset dir="${target}/test-classes/portlet-test-war"/> + </war> </target> @@ -511,44 +341,4 @@ </target> -<!-- - <target name="package-tck-portal" depends="prepare_env"> - - <property name="tck" value="${target}/tck"/> - <property name="tck-server" value="${tck}/${test.server.name}-${test.server.version}"/> - - <mkdir dir="${tck}"/> - <mkdir dir="${tck-server}"/> - - <jar jarfile="${target}/portlet-test-lib.jar"> - <fileset dir="${target}/classes" excludes="org/gatein/pc/portal/samples/**"/> - </jar> - - <copy todir="${tck-server}/portlet-tck-war"> - <fileset dir="${target}/classes/portlet-tck-war"/> - </copy> - <copy todir="${tck-server}/portlet-tck-war"> - <fileset dir="${target}/classes/${test.server.name}-${test.server.version}/portlet-tck-war"/> - </copy> - - <copy todir="${tck-server}/portlet-tck-war/WEB-INF/lib" flatten="true"> - <fileset dir="${target}" includes="portlet-test-lib.jar"/> - <path refid="${test.server.name}-${test.server.version}"/> - </copy> - - <mkdir dir="${tck-server}/tck-portal"/> - - <jar jarfile="${tck-server}/tck-portal/portlet-tck.war"> - <fileset dir="${tck-server}/portlet-tck-war"/> - </jar> - - <copy todir="${tck-server}/tck-portal" flatten="true"> - <path refid="${test.server.name}-${test.server.version}-shared"/> - </copy> - - <delete file="${target}/portlet-test-lib.jar"/> - - </target> ---> - </project>