Author: julien(a)jboss.com Date: 2007-09-17 17:07:11 -0400 (Mon, 17 Sep 2007) New Revision: 8301 Modified: modules/portlet/trunk/jboss-portal-portlet.ipr modules/portlet/trunk/jboss-portal-portlet.iws 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 Log: support 4.2.0 and 4.2.1 for portlet container tests Modified: modules/portlet/trunk/jboss-portal-portlet.ipr =================================================================== --- modules/portlet/trunk/jboss-portal-portlet.ipr 2007-09-17 20:59:55 UTC (rev 8300) +++ modules/portlet/trunk/jboss-portal-portlet.ipr 2007-09-17 21:07:11 UTC (rev 8301) @@ -129,6 +129,32 @@ <option name="FILTER_INFO" value="true" /> <option name="CUSTOM_FILTER" /> </component> + <component name="MavenBuildProjectComponent"> + <option name="mavenExecutable" value="" /> + <option name="Settings File" value="" /> + <option name="mavenCommandLineParams" value="" /> + <option name="vmOptions" value="" /> + <option name="useMavenEmbedder" value="false" /> + <option name="useFilter" value="false" /> + <option name="Batch Mode" value="false" /> + <option name="Check Plugin Updates" value="false" /> + <option name="Debug" value="false" /> + <option name="Errors" value="false" /> + <option name="Fail At End" value="false" /> + <option name="Fail Fast" value="false" /> + <option name="Fail Never" value="false" /> + <option name="Lax Checksums" value="false" /> + <option name="No Plugin Registry" value="false" /> + <option name="No Plugin Updates" value="false" /> + <option name="Non Recursive" value="false" /> + <option name="Offline" value="false" /> + <option name="Reactor" value="false" /> + <option name="Strict Checksums" value="false" /> + <option name="Update Plugins" value="false" /> + <option name="Update Snapshots" value="false" /> + <option name="Skip Tests" value="false" /> + <pom-list /> + </component> <component name="Palette2"> <group name="Swing"> <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> Modified: modules/portlet/trunk/jboss-portal-portlet.iws =================================================================== --- modules/portlet/trunk/jboss-portal-portlet.iws 2007-09-17 20:59:55 UTC (rev 8300) +++ modules/portlet/trunk/jboss-portal-portlet.iws 2007-09-17 21:07:11 UTC (rev 8301) @@ -16,7 +16,12 @@ <option name="USER" value="" /> </component> <component name="ChangeListManager"> - <list default="true" name="Default" comment="" /> + <list default="true" name="Default" comment=""> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/testsuite/build.xml" afterPath="$PROJECT_DIR$/testsuite/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/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> <component name="ChangeListSynchronizer" /> <component name="ChangesViewManager" flattened_view="true" /> @@ -818,96 +823,33 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="AbstractStatefulPortletInvokerTestCase.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java"> + <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="290" column="0" selection-start="9294" selection-end="9294" vertical-scroll-proportion="0.19346733"> + <state line="346" column="0" selection-start="16903" selection-end="16903" vertical-scroll-proportion="0.5622688"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="StringValue.class" pinned="false" current="false" current-in-tab="false"> - <entry file="jar://$PROJECT_DIR$/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar!/org/jboss/portal/common/value/StringValue.class"> + <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="11" column="0" selection-start="389" selection-end="389" vertical-scroll-proportion="0.14796548"> + <state line="840" column="0" selection-start="31597" selection-end="31597" vertical-scroll-proportion="0.63316584"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="ConsumerStatefulPortletInvokerTestCase.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="170" column="0" selection-start="7060" selection-end="7060" vertical-scroll-proportion="0.19605425"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ConsumerPortletInvoker.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="304" column="0" selection-start="11147" selection-end="11147" vertical-scroll-proportion="0.19346733"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ProducerPortletInvoker.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="597" column="0" selection-start="21936" selection-end="21936" vertical-scroll-proportion="0.19346733"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="PortletInvokerSupport.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/PortletInvokerSupport.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="183" column="0" selection-start="6417" selection-end="6417" vertical-scroll-proportion="0.19346733"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="PreferencesInfoSupport.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="69" column="0" selection-start="2855" selection-end="2855" vertical-scroll-proportion="0.621455"> - <folding /> - </state> - </provider> - </entry> - </file> <file leaf-file-name="build.xml" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/portlet/build.xml"> + <entry file="file://$PROJECT_DIR$/testsuite/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="353" column="16" selection-start="18024" selection-end="18024" vertical-scroll-proportion="0.57090014"> + <state line="127" column="109" selection-start="5489" selection-end="5489" vertical-scroll-proportion="0.4969174"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="AbstractConsumerPersistenceManagerService.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/AbstractConsumerPersistenceManagerService.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="74" column="24" selection-start="3634" selection-end="3634" vertical-scroll-proportion="0.2763819"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ConsumerPersistenceManagerService.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/ConsumerPersistenceManagerService.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="41" column="0" selection-start="2243" selection-end="2243" vertical-scroll-proportion="0.25154132"> - <folding /> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindManager"> @@ -996,14 +938,8 @@ <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="portlet" /> + <option name="myItemId" value="tools" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> </PATH> @@ -1013,11 +949,11 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="portlet" /> + <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$/portlet" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -1027,15 +963,15 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="portlet" /> + <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$/portlet" /> + <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$/portlet/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools/etc" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -1045,71 +981,27 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="portlet" /> + <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$/portlet" /> + <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$/portlet/src" /> + <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$/portlet/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools/etc/buildfragments" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet" /> - <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_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$/portlet/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1117,29 +1009,9 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="portlet" /> + <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$/portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <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$/portlet/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1147,30 +1019,18 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="portlet" /> + <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$/portlet" /> + <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$/portlet/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> </subPane> </component> <component name="ProjectReloadState"> - <option name="STATE" value="2" /> + <option name="STATE" value="0" /> </component> <component name="ProjectView"> <navigator currentView="ProjectPane" proportions="0.11111111" version="1" splitterProportion="0.5"> @@ -1180,7 +1040,7 @@ <showLibraryContents /> <hideEmptyPackages /> <abbreviatePackageNames /> - <showStructure PackagesPane="false" ProjectPane="false" Scope="false" Favorites="false" /> + <showStructure Favorites="false" PackagesPane="false" Scope="false" ProjectPane="false" /> <autoscrollToSource /> <autoscrollFromSource /> <sortByType /> @@ -1215,12 +1075,24 @@ </component> <component name="RestoreUpdateTree" /> <component name="RunManager" selected="Remote.Runner"> - <configuration default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> + <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> + <module name="" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="PACKAGE_NAME" /> + <option name="MAIN_CLASS_NAME" /> + <option name="METHOD_NAME" /> + <option name="TEST_OBJECT" value="class" /> + <option name="VM_PARAMETERS" /> + <option name="PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ADDITIONAL_CLASS_PATH" /> + <option name="TEST_SEARCH_SCOPE"> + <value defaultName="wholeProject" /> + </option> + <method> + <option name="Make" value="true" /> + </method> </configuration> <configuration default="true" type="Applet" factoryName="Applet"> <module name="" /> @@ -1244,24 +1116,12 @@ <option name="ENABLE_SWING_INSPECTOR" value="false" /> <module name="" /> </configuration> - <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> - <module name="" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="PACKAGE_NAME" /> - <option name="MAIN_CLASS_NAME" /> - <option name="METHOD_NAME" /> - <option name="TEST_OBJECT" value="class" /> - <option name="VM_PARAMETERS" /> - <option name="PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="ADDITIONAL_CLASS_PATH" /> - <option name="TEST_SEARCH_SCOPE"> - <value defaultName="wholeProject" /> - </option> - <method> - <option name="Make" value="true" /> - </method> + <configuration default="true" type="Remote" factoryName="Remote"> + <option name="USE_SOCKET_TRANSPORT" value="true" /> + <option name="SERVER_MODE" value="false" /> + <option name="SHMEM_ADDRESS" value="javadebug" /> + <option name="HOST" value="localhost" /> + <option name="PORT" value="5005" /> </configuration> <configuration default="false" name="Tomcat" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> @@ -1386,12 +1246,12 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="11" y="29" width="1680" height="958" extended-state="0" /> + <frame x="24" y="24" width="1680" height="958" extended-state="0" /> <editor active="true" /> <layout> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> + <window_info id="Maven-2 Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> - <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.329859" order="0" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.329849" order="1" /> @@ -1409,12 +1269,13 @@ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3786295" order="4" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" /> <window_info id="JProfiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> - <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> + <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" /> <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" /> <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="3" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" /> + <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> </layout> </component> <component name="VCS.FileViewConfiguration"> @@ -1507,111 +1368,116 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="1122" column="0" selection-start="39981" selection-end="39981" vertical-scroll-proportion="0.879397"> + <state line="597" column="0" selection-start="21936" selection-end="21936" vertical-scroll-proportion="0.19346733"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="243" column="12" selection-start="12668" selection-end="12668" vertical-scroll-proportion="0.33291456"> + <state line="290" column="0" selection-start="9294" selection-end="9294" vertical-scroll-proportion="0.19346733"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/test/build.xml"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="329" column="67" selection-start="16466" selection-end="16466" vertical-scroll-proportion="-4.4685574"> + <state line="170" column="0" selection-start="7060" selection-end="7060" vertical-scroll-proportion="0.19605425"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/ContentTypesTestCase.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="38" column="13" selection-start="2241" selection-end="2241" vertical-scroll-proportion="0.16276202"> + <state line="304" column="0" selection-start="11147" selection-end="11147" vertical-scroll-proportion="0.19346733"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/info/PortletInfoSupport.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/PortletInvokerSupport.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="36" column="13" selection-start="2277" selection-end="2277" vertical-scroll-proportion="0.22594142"> + <state line="183" column="0" selection-start="6417" selection-end="6417" vertical-scroll-proportion="0.19346733"> <folding /> </state> </provider> </entry> - <entry file="jar://$PROJECT_DIR$/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar!/org/jboss/portal/common/value/StringValue.class"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="11" column="0" selection-start="389" selection-end="389" vertical-scroll-proportion="0.14796548"> + <state line="69" column="0" selection-start="2855" selection-end="2855" vertical-scroll-proportion="0.621455"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java"> + <entry file="file://$PROJECT_DIR$/portlet/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="69" column="0" selection-start="2855" selection-end="2855" vertical-scroll-proportion="0.621455"> + <state line="319" column="25" selection-start="15935" selection-end="15935" vertical-scroll-proportion="0.06781751"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/PortletInvokerSupport.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/AbstractConsumerPersistenceManagerService.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="183" column="0" selection-start="6417" selection-end="6417" vertical-scroll-proportion="0.19346733"> + <state line="74" column="24" selection-start="3634" selection-end="3634" vertical-scroll-proportion="0.2763819"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/ConsumerPersistenceManagerService.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="597" column="0" selection-start="21936" selection-end="21936" vertical-scroll-proportion="0.19346733"> + <state line="41" column="0" selection-start="2243" selection-end="2243" vertical-scroll-proportion="0.25154132"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="290" column="0" selection-start="9294" selection-end="9294" vertical-scroll-proportion="0.19346733"> + <state line="33" column="13" selection-start="2151" selection-end="2151" vertical-scroll-proportion="0.13316892"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="170" column="0" selection-start="7060" selection-end="7060" vertical-scroll-proportion="0.19605425"> + <state line="67" column="30" selection-start="3207" selection-end="3207" vertical-scroll-proportion="0.5622688"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java"> + <entry file="file://$PROJECT_DIR$/test/src/resources/test/servers.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="304" column="0" selection-start="11147" selection-end="11147" vertical-scroll-proportion="0.19346733"> + <state line="42" column="36" selection-start="1345" selection-end="1345" vertical-scroll-proportion="0.621455"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/ConsumerPersistenceManagerService.java"> + <entry file="file://$PROJECT_DIR$/test/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="41" column="0" selection-start="2243" selection-end="2243" vertical-scroll-proportion="0.25154132"> + <state line="346" column="0" selection-start="16903" selection-end="16903" vertical-scroll-proportion="0.5622688"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/AbstractConsumerPersistenceManagerService.java"> + <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent"> <provider selected="true" editor-type-id="text-editor"> - <state line="74" column="24" selection-start="3634" selection-end="3634" vertical-scroll-proportion="0.2763819"> + <state line="840" column="0" selection-start="31597" selection-end="31597" vertical-scroll-proportion="0.63316584"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/build.xml"> + <entry file="file://$PROJECT_DIR$/testsuite/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="353" column="16" selection-start="18024" selection-end="18024" vertical-scroll-proportion="0.57090014"> + <state line="127" column="109" selection-start="5489" selection-end="5489" vertical-scroll-proportion="0.4969174"> <folding /> </state> </provider> </entry> </component> + <component name="testng.defaultConfiguration"> + <outputDirectory /> + <properties /> + <groups /> + </component> </project> Modified: modules/portlet/trunk/test/build.xml =================================================================== --- modules/portlet/trunk/test/build.xml 2007-09-17 20:59:55 UTC (rev 8300) +++ modules/portlet/trunk/test/build.xml 2007-09-17 21:07:11 UTC (rev 8301) @@ -269,12 +269,12 @@ </taskdef> </target> - <target name="cargo.jboss.start" depends="cargo.setup"> + <target name="cargo.jboss-4.2.start" depends="cargo.setup"> <cargo containerId="jboss42x" - home="${jboss-4.2.home}" - output="${cargo.log.dir}/cargo.jboss.server.log" - log="${cargo.log.dir}/cargo.jboss.log" + home="${test.jboss-4.2.home}" + output="${cargo.log.dir}/cargo.${test.id}.server.log" + log="${cargo.log.dir}/cargo.${test.id}.startup.log" action="start" wait="${cargo.wait}"> <sharedClasspath> @@ -292,11 +292,11 @@ </cargo> </target> - <target name="cargo.jboss.stop" depends="cargo.setup"> + <target name="cargo.jboss-4.2.stop" depends="cargo.setup"> <cargo containerId="jboss42x" - home="${jboss-4.2.home}" - log="${cargo.log.dir}/cargo.jboss.log" + home="${test.jboss-4.2.home}" + log="${cargo.log.dir}/cargo.${test.id}.shutdown.log" action="stop"> <configuration> <property name="cargo.rmi.port" value="1099"/> @@ -304,12 +304,55 @@ </cargo> </target> - <target name="cargo.tomcat.start" depends="cargo.setup"> + <target name="tests.jboss-4.2.container-servlet" depends="init" if="${test.jboss-4.2.home.variable-name}"> + <antcall target="cargo.jboss-4.2.start"> + <param name="cargo.wait" value="false"/> + </antcall> + <antcall target="tests.remote"> + <param name="server.name" value="${test.jboss-4.2.name}"/> + </antcall> + <antcall target="cargo.jboss-4.2.stop"> + </antcall> + </target> + + <target name="tests.jboss-4.2" depends="init"> + <fail message="Please set the environment variable JBOSS_4_2_0_HOME or JBOSS_4_2_1_HOME"> + <condition> + <and> + <not> + <isset property="jboss-4.2.0.home"/> + </not> + <not> + <isset property="jboss-4.2.1.home"/> + </not> + </and> + </condition> + </fail> + <antcall target="tests.jboss-4.2.container-servlet"> + <param name="test.id" value="JBoss-4_2_0-container-servlet"/> + <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_0"/> + <param name="test.jboss-4.2.home" value="${jboss-4.2.0.home}"/> + <param name="test.jboss-4.2.home.variable-name" value="jboss-4.2.0.home"/> + </antcall> + <antcall target="tests.jboss-4.2.container-servlet"> + <param name="test.id" value="JBoss-4_2_1-container-servlet"/> + <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_1"/> + <param name="test.jboss-4.2.home" value="${jboss-4.2.1.home}"/> + <param name="test.jboss-4.2.home.variable-name" value="jboss-4.2.1.home"/> + </antcall> + </target> + + <target name="tests.jboss" depends="init"> + <antcall target="tests.jboss-4.2"> + </antcall> + </target> + + <target name="cargo.tomcat-6.start" depends="cargo.setup"> <cargo containerId="tomcat5x" - home="${tomcat-6.0.home}" - output="${cargo.log.dir}/cargo.tomcat.server.log" - log="${cargo.log.dir}/cargo.tomcat.log" + home="${test.tomcat-6.home}" + output="${cargo.log.dir}/cargo.${test.id}.server.log" + log="${cargo.log.dir}/cargo.${test.id}.startup.log" action="start" wait="${cargo.wait}"> <sharedClasspath> @@ -333,41 +376,50 @@ </cargo> </target> - <target name="cargo.tomcat.stop" depends="cargo.setup"> + <target name="cargo.tomcat-6.stop" depends="cargo.setup"> <cargo containerId="tomcat5x" - home="${tomcat-6.0.home}" - log="${cargo.log.dir}/cargo.tomcat.log" + home="${test.tomcat-6.home}" + log="${cargo.log.dir}/cargo.${test.id}.shutdown.log" action="stop"> <configuration> </configuration> </cargo> </target> - <target name="tests.jboss" depends="init"> - <fail unless="jboss-4.2.home" message="Please set the environment variable JBOSS_4_2_HOME"/> - <echo message="Starting JBoss 4.2 tests with ${jboss-4.2.home}"/> - <antcall target="cargo.jboss.start"> + <target name="tests.tomcat-6.container-servlet" depends="init" if="${test.tomcat-6.home.variable-name}"> + <echo message="Starting Tomcat 6 container-servlet tests with ${test.tomcat-6.home}"/> + <antcall target="cargo.tomcat-6.start"> <param name="cargo.wait" value="false"/> </antcall> <antcall target="tests.remote"> - <param name="server.name" value="RemoteJBoss_4_2"/> + <param name="server.name" value="RemoteTomcat_6_0"/> </antcall> - <antcall target="cargo.jboss.stop"> + <antcall target="cargo.tomcat-6.stop"> </antcall> </target> + <target name="tests.tomcat-6" depends="init"> + <fail message="Please set the environment variable JBOSS_6_0_HOME"> + <condition> + <and> + <not> + <isset property="tomcat-6.0.home"/> + </not> + </and> + </condition> + </fail> + <antcall target="tests.tomcat-6.container-servlet"> + <param name="test.id" value="Tomcat-6_0-container-servlet"/> + <param name="test.tomcat-6.name" value="RemoteTomcat_6_0"/> + <param name="test.tomcat-6.home" value="${tomcat-6.0.home}"/> + <param name="test.tomcat-6.home.variable-name" value="tomcat-6.0.home"/> + </antcall> + </target> + <target name="tests.tomcat" depends="init"> - <fail unless="tomcat-6.0.home" message="Please set the environment variable TOMCAT_6_0_HOME"/> - <echo message="Starting Tomcat 6.0 tests with ${tomcat-6.0.home}"/> - <antcall target="cargo.tomcat.start"> - <param name="cargo.wait" value="false"/> + <antcall target="tests.tomcat-6"> </antcall> - <antcall target="tests.remote"> - <param name="server.name" value="RemoteTomcat_6_0"/> - </antcall> - <antcall target="cargo.tomcat.stop"> - </antcall> </target> <target name="tests.remote" depends="init"> @@ -378,78 +430,78 @@ <!--Spec TCK Assertions tests--> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.DispatcherTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.DispatcherTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.DispatcherTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.DispatcherTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletConfigTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletConfigTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PortletConfigTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletConfigTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletContextTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletContextTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PortletContextTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletContextTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletInterfaceTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletInterfaceTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PortletInterfaceTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletInterfaceTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletModeTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletModeTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PortletModeTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletModeTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletRequestsTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletRequestsTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PortletRequestsTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletRequestsTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletResponsesTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletResponsesTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PortletResponsesTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletResponsesTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletSessionTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletSessionTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PortletSessionTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletSessionTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletURLTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletURLTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PortletURLTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletURLTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PreferencesTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PreferencesTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PreferencesTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PreferencesTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.WindowStatesTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.WindowStatesTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.WindowStatesTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.WindowStatesTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-windowstates.war"/> <parameter name="serverName" value="${server.name}"/> </zest> @@ -457,92 +509,92 @@ <!--API Tests--> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.ActionRequestTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.ActionRequestTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.ActionRequestTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.ActionRequestTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.api.ActionResponseTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.ActionResponseTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.ActionResponseTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.ActionResponseTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortalContextTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortalContextTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.PortalContextTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortalContextTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletConfigTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletConfigTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.PortletConfigTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletConfigTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletContextTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletContextTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.PortletContextTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletContextTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletModeTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletModeTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.PortletModeTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletModeTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletPreferencesTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletPreferencesTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.PortletPreferencesTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletPreferencesTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletSessionTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletSessionTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.PortletSessionTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletSessionTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletSessionUtilTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletSessionUtilTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.PortletSessionUtilTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletSessionUtilTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletURLTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletURLTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.PortletURLTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletURLTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.api.RenderRequestTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.RenderRequestTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.RenderRequestTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.RenderRequestTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.api.RenderResponseTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.RenderResponseTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.RenderResponseTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.RenderResponseTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.api.WindowStateTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.WindowStateTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.WindowStateTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.WindowStateTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-api-windowstate.war"/> <parameter name="serverName" value="${server.name}"/> </zest> @@ -550,71 +602,71 @@ <!--Ext Tests--> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.DispatcherTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.DispatcherTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.DispatcherTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.DispatcherTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.PortletConfigTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.PortletConfigTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.PortletConfigTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.PortletConfigTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.PortletModeTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.PortletModeTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.PortletModeTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.PortletModeTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.PortletRequestsTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.PortletRequestsTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.PortletRequestsTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.PortletRequestsTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.PortletResponsesTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.PortletResponsesTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.PortletResponsesTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.PortletResponsesTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.PreferencesTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.PreferencesTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.PreferencesTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.PreferencesTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.SessionTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.SessionTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.SessionTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.SessionTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.ExpiringCacheTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.ExpiringCacheTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.ExpiringCacheTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.ExpiringCacheTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.NeverExpiringCacheTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.NeverExpiringCacheTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.NeverExpiringCacheTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.NeverExpiringCacheTestCase,${test.id}"> <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-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.NoCacheTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.NoCacheTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.NoCacheTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.NoCacheTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-ext-nocache.war"/> <parameter name="serverName" value="${server.name}"/> </zest> @@ -623,8 +675,8 @@ <!-- <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.misc.Log4jTestCase" - id="org.jboss.portal.test.portlet.jsr168.misc.Log4jTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.misc.Log4jTestCase" + id="org.jboss.portal.test.portlet.jsr168.misc.Log4jTestCase,${test.id}"> <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-17 20:59:55 UTC (rev 8300) +++ modules/portlet/trunk/test/src/resources/test/servers.xml 2007-09-17 21:07:11 UTC (rev 8301) @@ -22,7 +22,7 @@ </node> </server> <server> - <server-name>RemoteJBoss_4_2</server-name> + <server-name>RemoteJBoss_4_2_0</server-name> <node> <node-id>default</node-id> <service> @@ -39,4 +39,22 @@ </deployer> </node> </server> + <server> + <server-name>RemoteJBoss_4_2_1</server-name> + <node> + <node-id>default</node-id> + <service> + <service-name>TestDriverServer</service-name> + <interface>org.jboss.portal.test.framework.driver.remote.RemoteTestDriver</interface> + <uri>socket://localhost:5400</uri> + </service> + <deployer> + <remote> + <name>jboss4x</name> + <host>localhost</host> + <port>8080</port> + </remote> + </deployer> + </node> + </server> </servers> Modified: modules/portlet/trunk/testsuite/build.xml =================================================================== --- modules/portlet/trunk/testsuite/build.xml 2007-09-17 20:59:55 UTC (rev 8300) +++ modules/portlet/trunk/testsuite/build.xml 2007-09-17 21:07:11 UTC (rev 8301) @@ -125,7 +125,7 @@ <target name="internal-invoke-clean"> <delete> <fileset dir="../${module}" includes="*.log"/> - <fileset dir="../${module}" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt"/> + <fileset dir="../${module}" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt,output/cargo/*"/> </delete> </target> Modified: modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent =================================================================== --- modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-17 20:59:55 UTC (rev 8300) +++ modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-17 21:07:11 UTC (rev 8301) @@ -83,17 +83,27 @@ <!-- Setup the environment --> <property environment="env"/> - <!-- Define jboss home --> - <condition property="jboss-4.2.home" value="${env.JBOSS_4_2_HOME}"> + <!-- Define JBoss homes --> + + <condition property="jboss-4.2.0.home" value="${env.JBOSS_4_2_0_HOME}"> <and> <not> - <isset property="jboss-4.2.home"/> + <isset property="jboss-4.2.0.home"/> </not> - <isset property="env.JBOSS_4_2_HOME"/> + <isset property="env.JBOSS_4_2_0_HOME"/> </and> </condition> + <condition property="jboss-4.2.1.home" value="${env.JBOSS_4_2_1_HOME}"> + <and> + <not> + <isset property="jboss-4.2.1.home"/> + </not> + <isset property="env.JBOSS_4_2_1_HOME"/> + </and> + </condition> - <!-- Define tomcat home --> + <!-- Define Tomcat homes --> + <condition property="tomcat-6.0.home" value="${env.TOMCAT_6_0_HOME}"> <and> <not>