Author: julien(a)jboss.com Date: 2007-09-15 10:06:19 -0400 (Sat, 15 Sep 2007) New Revision: 8288 Modified: modules/portlet/trunk/jboss-portal-portlet.iws modules/portlet/trunk/portlet/build.xml modules/portlet/trunk/test/build.xml modules/portlet/trunk/test/src/resources/test/servers.xml modules/portlet/trunk/testsuite/build.xml modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent modules/portlet/trunk/tools/lib/explode.jar Log: make the portlet container test suite work Modified: modules/portlet/trunk/jboss-portal-portlet.iws =================================================================== --- modules/portlet/trunk/jboss-portal-portlet.iws 2007-09-15 13:30:20 UTC (rev 8287) +++ modules/portlet/trunk/jboss-portal-portlet.iws 2007-09-15 14:06:19 UTC (rev 8288) @@ -17,10 +17,11 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> - <change type="DELETED" beforePath="$PROJECT_DIR$/tools/lib/cargo-core-uberjar-0.8.jar" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tools/lib/explode.jar" afterPath="$PROJECT_DIR$/tools/lib/explode.jar" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/testsuite/build.xml" afterPath="$PROJECT_DIR$/testsuite/build.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/build.xml" afterPath="$PROJECT_DIR$/portlet/build.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/build.xml" afterPath="$PROJECT_DIR$/test/build.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml" afterPath="$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/src/resources/test/servers.xml" afterPath="$PROJECT_DIR$/test/src/resources/test/servers.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent" afterPath="$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent" /> </list> </component> @@ -799,23 +800,50 @@ <component name="FileEditorManager"> <leaf> <file leaf-file-name="build.xml" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/test/build.xml"> + <entry file="file://$PROJECT_DIR$/testsuite/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="622" column="0" selection-start="34293" selection-end="34293" vertical-scroll-proportion="0.76942044"> + <state line="109" column="47" selection-start="4897" selection-end="4897" vertical-scroll-proportion="0.76325524"> <folding /> </state> </provider> </entry> </file> + <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/portlet/build.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="366" column="0" selection-start="18512" selection-end="18512" vertical-scroll-proportion="0.76325524"> + <folding /> + </state> + </provider> + </entry> + </file> <file leaf-file-name="servers.xml" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/test/src/resources/test/servers.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="24" column="25" selection-start="762" selection-end="762" vertical-scroll-proportion="0.35511714"> <folding /> </state> </provider> </entry> </file> + <file leaf-file-name="buildmagic.ent" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent"> + <provider selected="true" editor-type-id="text-editor"> + <state line="1122" column="0" selection-start="39981" selection-end="39981" vertical-scroll-proportion="0.879397"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/test/build.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="620" column="39" selection-start="35681" selection-end="35681" vertical-scroll-proportion="0.2219482"> + <folding /> + </state> + </provider> + </entry> + </file> </leaf> </component> <component name="FindManager"> @@ -904,10 +932,6 @@ <option name="myItemId" value="jboss-portal-portlet.ipr" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="tools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -915,13 +939,9 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="tools" /> + <option name="myItemId" value="testsuite" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -929,17 +949,13 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="tools" /> + <option name="myItemId" value="testsuite" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools/etc" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -947,34 +963,6 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="tools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools/etc" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools/etc/buildfragments" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> <option name="myItemId" value="test" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> @@ -1058,16 +1046,28 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="jboss-portal-portlet.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/portlet-test-war" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="portlet" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF" /> + <option name="myItemId" value="jboss-portal-portlet.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="portlet" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -1077,33 +1077,47 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="test" /> + <option name="myItemId" value="portlet" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/jboss-4.2" /> + <option name="myItemId" value="jboss-portal-portlet.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="portlet" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/jboss-4.2/portlet-test-war" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1111,15 +1125,15 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="test" /> + <option name="myItemId" value="portlet" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -1466,20 +1480,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/build.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="105" column="0" selection-start="5717" selection-end="5783" vertical-scroll-proportion="0.9321825"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/testsuite/build.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="48" column="0" selection-start="2701" selection-end="2701" vertical-scroll-proportion="0.21331689"> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/tools/etc/buildmagic/aliases.ent"> <provider selected="true" editor-type-id="text-editor"> <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> @@ -1517,13 +1517,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent"> - <provider selected="true" editor-type-id="text-editor"> - <state line="887" column="20" selection-start="32706" selection-end="32706" vertical-scroll-proportion="0.4522613"> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java"> <provider selected="true" editor-type-id="text-editor"> <state line="47" column="13" selection-start="2776" selection-end="2776" vertical-scroll-proportion="0.16582915"> @@ -1545,20 +1538,41 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/test/build.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="620" column="39" selection-start="35681" selection-end="35681" vertical-scroll-proportion="0.2219482"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent"> + <provider selected="true" editor-type-id="text-editor"> + <state line="1122" column="0" selection-start="39981" selection-end="39981" vertical-scroll-proportion="0.879397"> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/test/src/resources/test/servers.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="24" column="25" selection-start="762" selection-end="762" vertical-scroll-proportion="0.35511714"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/test/build.xml"> + <entry file="file://$PROJECT_DIR$/portlet/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="622" column="0" selection-start="34293" selection-end="34293" vertical-scroll-proportion="0.76942044"> + <state line="366" column="0" selection-start="18512" selection-end="18512" vertical-scroll-proportion="0.76325524"> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/testsuite/build.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="109" column="47" selection-start="4897" selection-end="4897" vertical-scroll-proportion="0.76325524"> + <folding /> + </state> + </provider> + </entry> </component> </project> Modified: modules/portlet/trunk/portlet/build.xml =================================================================== --- modules/portlet/trunk/portlet/build.xml 2007-09-15 13:30:20 UTC (rev 8287) +++ modules/portlet/trunk/portlet/build.xml 2007-09-15 14:06:19 UTC (rev 8288) @@ -342,7 +342,6 @@ <target name="test-framework" depends="init"> <execute-tests> <x-test> - <test todir="${test.reports}" name="org.jboss.portal.test.portlet.deployment.UnmarshallerTestCase"/> <test todir="${test.reports}" name="org.jboss.portal.test.portlet.state.LocalStoreProducerStatefulPortletInvokerTestCase"/> <test todir="${test.reports}" name="org.jboss.portal.test.portlet.state.RemoteStoreProducerStatefulPortletInvokerTestCase"/> <test todir="${test.reports}" name="org.jboss.portal.test.portlet.state.LocalStoreConsumerStatefulPortletInvokerTestCase"/> @@ -355,10 +354,6 @@ </x-test> <x-sysproperty> <!-- - <sysproperty key="test.root" value="${build.lib}"/> - <sysproperty key="test.uri" value="/test/redirect/"/> ---> -<!-- <jvmarg value="-Xdebug"/> <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/> --> @@ -369,7 +364,6 @@ <path refid="jboss.microcontainer.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="apache.xerces.classpath"/> - <path refid="jbossas/core.libs.classpath"/> <pathelement location="${source.java}"/> <pathelement location="${build.classes}"/> <pathelement location="${build.resources}"/> Modified: modules/portlet/trunk/test/build.xml =================================================================== --- modules/portlet/trunk/test/build.xml 2007-09-15 13:30:20 UTC (rev 8287) +++ modules/portlet/trunk/test/build.xml 2007-09-15 14:06:19 UTC (rev 8288) @@ -350,7 +350,7 @@ <param name="cargo.wait" value="false"/> </antcall> <antcall target="tests.remote"> - <param name="server.name" value="RemoteJBoss-4.2"/> + <param name="server.name" value="RemoteJBoss_4_2"/> </antcall> <antcall target="cargo.jboss.stop"> </antcall> @@ -363,7 +363,7 @@ <param name="cargo.wait" value="false"/> </antcall> <antcall target="tests.remote"> - <param name="server.name" value="RemoteTomcat-6.0"/> + <param name="server.name" value="RemoteTomcat_6_0"/> </antcall> <antcall target="cargo.tomcat.stop"> </antcall> @@ -377,78 +377,78 @@ <!--Spec TCK Assertions tests--> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.DispatcherTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.DispatcherTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.DispatcherTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.DispatcherTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-dispatcher.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PortletConfigTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletConfigTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletConfigTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletConfigTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-portletconfig.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PortletContextTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletContextTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletContextTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletContextTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-portletcontext.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PortletInterfaceTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletInterfaceTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletInterfaceTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletInterfaceTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-portletinterface.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PortletModeTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletModeTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletModeTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletModeTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-portletmode.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PortletRequestsTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletRequestsTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletRequestsTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletRequestsTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-portletrequests.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PortletResponsesTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletResponsesTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletResponsesTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletResponsesTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-portletresponses.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PortletSessionTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletSessionTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletSessionTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletSessionTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-portletsession.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PortletURLTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletURLTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletURLTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletURLTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-portleturl.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PreferencesTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PreferencesTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PreferencesTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PreferencesTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-preferences.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.WindowStatesTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.WindowStatesTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.WindowStatesTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.WindowStatesTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-windowstates.war"/> <parameter name="serverName" value="${server.name}"/> </zest> @@ -456,92 +456,92 @@ <!--API Tests--> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.ActionRequestTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.ActionRequestTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.ActionRequestTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.ActionRequestTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-api-actionrequest.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.ActionResponseTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.ActionResponseTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.ActionResponseTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.ActionResponseTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-api-actionresponse.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.PortalContextTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortalContextTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortalContextTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortalContextTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-api-portalcontext.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.PortletConfigTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletConfigTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletConfigTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletConfigTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-api-portletconfig.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.PortletContextTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletContextTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletContextTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletContextTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-api-portletcontext.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.PortletModeTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletModeTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletModeTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletModeTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-api-portletmode.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.PortletPreferencesTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletPreferencesTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletPreferencesTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletPreferencesTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-api-portletpreferences.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.PortletSessionTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletSessionTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletSessionTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletSessionTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-api-portletsession.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.PortletSessionUtilTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletSessionUtilTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletSessionUtilTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletSessionUtilTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-api-portletsessionutil.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.PortletURLTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletURLTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletURLTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletURLTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-api-portleturl.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.RenderRequestTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.RenderRequestTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.RenderRequestTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.RenderRequestTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-api-renderrequest.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.RenderResponseTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.RenderResponseTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.RenderResponseTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.RenderResponseTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-api-renderresponse.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.WindowStateTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.WindowStateTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.WindowStateTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.WindowStateTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-api-windowstate.war"/> <parameter name="serverName" value="${server.name}"/> </zest> @@ -549,71 +549,71 @@ <!--Ext Tests--> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.DispatcherTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.DispatcherTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.DispatcherTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.DispatcherTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-ext-dispatcher.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.PortletConfigTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.PortletConfigTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.PortletConfigTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.PortletConfigTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-ext-portletconfig.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.PortletModeTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.PortletModeTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.PortletModeTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.PortletModeTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-ext-portletmode.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.PortletRequestsTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.PortletRequestsTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.PortletRequestsTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.PortletRequestsTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-ext-portletrequests.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.PortletResponsesTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.PortletResponsesTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.PortletResponsesTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.PortletResponsesTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-ext-portletresponses.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.PreferencesTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.PreferencesTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.PreferencesTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.PreferencesTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-ext-preferences.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.SessionTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.SessionTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.SessionTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.SessionTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-ext-session.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.ExpiringCacheTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.ExpiringCacheTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.ExpiringCacheTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.ExpiringCacheTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-ext-expiringcache.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.NeverExpiringCacheTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.NeverExpiringCacheTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.NeverExpiringCacheTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.NeverExpiringCacheTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-ext-neverexpiringcache.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.NoCacheTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.NoCacheTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.NoCacheTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.NoCacheTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-ext-nocache.war"/> <parameter name="serverName" value="${server.name}"/> </zest> @@ -622,8 +622,8 @@ <!-- <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.misc.Log4jTestCase" - id="org.jboss.portal.test.portlet.jsr168.misc.Log4jTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.misc.Log4jTestCase" + id="org.jboss.portal.test.portlet.jsr168.misc.Log4jTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-misc-log4j.war"/> <parameter name="serverName" value="${server.name}"/> </zest> Modified: modules/portlet/trunk/test/src/resources/test/servers.xml =================================================================== --- modules/portlet/trunk/test/src/resources/test/servers.xml 2007-09-15 13:30:20 UTC (rev 8287) +++ modules/portlet/trunk/test/src/resources/test/servers.xml 2007-09-15 14:06:19 UTC (rev 8288) @@ -1,6 +1,6 @@ <servers> <server> - <server-name>RemoteTomcat-6.0</server-name> + <server-name>RemoteTomcat_6_0</server-name> <node> <node-id>default</node-id> <service> @@ -22,7 +22,7 @@ </node> </server> <server> - <server-name>RemoteJBoss-4.2</server-name> + <server-name>RemoteJBoss_4_2</server-name> <node> <node-id>default</node-id> <service> Modified: modules/portlet/trunk/testsuite/build.xml =================================================================== --- modules/portlet/trunk/testsuite/build.xml 2007-09-15 13:30:20 UTC (rev 8287) +++ modules/portlet/trunk/testsuite/build.xml 2007-09-15 14:06:19 UTC (rev 8288) @@ -48,15 +48,6 @@ <pathelement location="${project.tools}/lib/explode.jar"/> </path> - <taskdef - name="deploy" - classname="org.jboss.portal.common.ant.Deploy" - classpathref="portal.task.classpath"/> - <taskdef - name="undeploy" - classname="org.jboss.portal.common.ant.Undeploy" - classpathref="portal.task.classpath"/> - <target name="init"> <mkdir dir="${log.dir}"/> <mkdir dir="${reports.dir}"/> @@ -109,6 +100,15 @@ <!-- executes all modules' tests --> <target name="tests" depends="init"> + <antcall target="internal-test-module"> + <param name="module" value="portlet"/> + </antcall> + <antcall target="internal-test-module"> + <param name="module" value="test"/> + </antcall> + <antcall target="internal-test-module"> + <param name="module" value="federation"/> + </antcall> <antcall target="reports"/> </target> @@ -122,12 +122,25 @@ </junitreport> </target> + <target name="internal-invoke-clean"> + <delete> + <fileset dir="../${module}" includes="*.log"/> + <fileset dir="../${module}" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt"/> + </delete> + </target> + <target name="clean"> <!-- remove generated test xml files --> - <delete> - <fileset dir="../common" includes="*.log"/> - <fileset dir="../common" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt"/> - </delete> + <antcall target="internal-invoke-clean"> + <param name="module" value="portlet"/> + </antcall> + <antcall target="internal-invoke-clean"> + <param name="module" value="test"/> + </antcall> + <antcall target="internal-invoke-clean"> + <param name="module" value="federation"/> + </antcall> + <!-- remove testsuite output dir --> <delete includeEmptyDirs="true" quiet="true"> <fileset dir="output"/> Modified: modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent =================================================================== --- modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-15 13:30:20 UTC (rev 8287) +++ modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-15 14:06:19 UTC (rev 8288) @@ -1121,16 +1121,4 @@ <!-- Configure deployment tasks --> <target name="_buildmagic:configure:deployment"> - <path id="portal.task.classpath"> - <pathelement location="${project.tools}/lib/ant.jar"/> - <pathelement location="${project.tools}/lib/explode.jar"/> - </path> - <taskdef - name="deploy" - classname="org.jboss.portal.common.ant.Deploy" - classpathref="portal.task.classpath"/> - <taskdef - name="undeploy" - classname="org.jboss.portal.common.ant.Undeploy" - classpathref="portal.task.classpath"/> </target> Modified: modules/portlet/trunk/tools/lib/explode.jar =================================================================== (Binary files differ)