Author: julien(a)jboss.com Date: 2007-09-15 08:20:46 -0400 (Sat, 15 Sep 2007) New Revision: 8285 Removed: modules/portlet/trunk/tools/lib/cargo-core-uberjar-0.8.jar Modified: modules/portlet/trunk/build/build-thirdparty.xml modules/portlet/trunk/jboss-portal-portlet.iws modules/portlet/trunk/test/build.xml modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml modules/portlet/trunk/testsuite/build.xml modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent Log: update portlet container tests to be automated Modified: modules/portlet/trunk/build/build-thirdparty.xml =================================================================== --- modules/portlet/trunk/build/build-thirdparty.xml 2007-09-15 11:55:48 UTC (rev 8284) +++ modules/portlet/trunk/build/build-thirdparty.xml 2007-09-15 12:20:46 UTC (rev 8285) @@ -60,6 +60,8 @@ <componentref name="portals-bridges" version="1.0.3"/> + <componentref name="codehaus/cargo" version="0.9-portal"/> + <!-- MC 1.0.2 --> <!-- <componentref name="jboss/common" version="1.2.0.GA-brew"/> Modified: modules/portlet/trunk/jboss-portal-portlet.iws =================================================================== --- modules/portlet/trunk/jboss-portal-portlet.iws 2007-09-15 11:55:48 UTC (rev 8284) +++ modules/portlet/trunk/jboss-portal-portlet.iws 2007-09-15 12:20:46 UTC (rev 8285) @@ -17,43 +17,11 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management/src/main/org/jboss/portal/portlet/management" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/src" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management/src/main/org/jboss/portal/portlet/management/LocalPortletManagement.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/.classpath" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management/src" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/management/PortletInfo.java" afterPath="" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management/src/main/org/jboss/portal" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/build.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/.project" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/build.sh" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/src/main/org/jboss" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/src/main/org/jboss/portal/portlet" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/management/LocalPortletManagement.java" afterPath="" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/src/main/org/jboss/portal/portlet/bridge" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptor.java" afterPath="" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/src/main/org/jboss/portal/portlet/bridge/JBossServletContextProvider.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/src/main" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management/src/main/org" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeResponse.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java" afterPath="" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptor.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/management/LocalPortletManagementMBean.java" afterPath="" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/src/main/org/jboss/portal" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/src/main/org" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/build.bat" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeInterceptor.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/.cvsignore" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management/build.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management/src/main/org/jboss/portal/portlet" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management/src/main/org/jboss" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management/src/main/org/jboss/portal/portlet/management/PortletInfo.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management/src/main/org/jboss/portal/portlet/management/LocalPortletManagementMBean.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management/src/main" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeRequest.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/management" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/tools/lib/cargo-core-uberjar-0.8.jar" afterPath="" /> + <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/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$/tools/etc/buildfragments/buildmagic.ent" afterPath="$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent" /> </list> </component> <component name="ChangeListSynchronizer" /> @@ -829,7 +797,26 @@ </subPane> </component> <component name="FileEditorManager"> - <leaf /> + <leaf> + <file leaf-file-name="build.xml" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/test/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"> + <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"> + <folding /> + </state> + </provider> + </entry> + </file> + </leaf> </component> <component name="FindManager"> <FindUsagesManager> @@ -917,11 +904,229 @@ <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> + <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_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> + <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_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> + <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="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> + </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> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test" /> + <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="test" /> + <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="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/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="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="test" /> + <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="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/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="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/test" /> + <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="test" /> + <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="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/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="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </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" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF" /> + <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="test" /> + <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="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/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="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" /> + <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="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="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="test" /> + <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="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> </subPane> </component> <component name="ProjectReloadState"> - <option name="STATE" value="0" /> + <option name="STATE" value="2" /> </component> <component name="ProjectView"> <navigator currentView="ProjectPane" proportions="0.11111111" version="1" splitterProportion="0.5"> @@ -931,7 +1136,7 @@ <showLibraryContents /> <hideEmptyPackages /> <abbreviatePackageNames /> - <showStructure Scope="false" ProjectPane="false" PackagesPane="false" Favorites="false" /> + <showStructure PackagesPane="false" ProjectPane="false" Scope="false" Favorites="false" /> <autoscrollToSource /> <autoscrollFromSource /> <sortByType /> @@ -965,7 +1170,14 @@ </key> </component> <component name="RestoreUpdateTree" /> - <component name="RunManager" selected="Remote.Runner"> + <component name="RunManager"> + <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="true" type="Applet" factoryName="Applet"> <module name="" /> <option name="MAIN_CLASS_NAME" /> @@ -978,13 +1190,6 @@ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> </configuration> - <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="true" type="Application" factoryName="Application" enabled="false" merge="false"> <option name="MAIN_CLASS_NAME" /> <option name="VM_PARAMETERS" /> @@ -1127,14 +1332,14 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="11" y="28" width="1680" height="958" extended-state="0" /> - <editor active="false" /> + <frame x="11" y="29" 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="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="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.329859" order="0" /> + <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" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.329849" order="8" /> @@ -1247,107 +1452,109 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java"> + <entry file="file://$PROJECT_DIR$/management/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="13" selection-start="2108" selection-end="2108" vertical-scroll-proportion="0.17755857"> + <state line="100" column="0" selection-start="5483" selection-end="5539" vertical-scroll-proportion="0.50308263"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/LocalInterceptor.java"> + <entry file="file://$PROJECT_DIR$/bridge/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="13" selection-start="2194" selection-end="2194" vertical-scroll-proportion="0.16276202"> + <state line="67" column="64" selection-start="4063" selection-end="4063" vertical-scroll-proportion="0.014796548"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/management/src/main/org/jboss/portal/portlet/management/LocalPortletManagementMBean.java"> + <entry file="file://$PROJECT_DIR$/portlet/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="28" column="17" selection-start="1917" selection-end="1917" vertical-scroll-proportion="0.10357583"> + <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$/management/src/main/org/jboss/portal/portlet/management/LocalPortletManagement.java"> + <entry file="file://$PROJECT_DIR$/testsuite/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="31" column="13" selection-start="2015" selection-end="2015" vertical-scroll-proportion="0.13316892"> + <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$/management/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptor.java"> + <entry file="file://$PROJECT_DIR$/tools/etc/buildmagic/aliases.ent"> <provider selected="true" editor-type-id="text-editor"> - <state line="28" column="17" selection-start="1917" selection-end="1917" vertical-scroll-proportion="0.10357583"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/management/src/main/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java"> + <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/deployment/UnmarshallerTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="39" column="13" selection-start="2355" selection-end="2355" vertical-scroll-proportion="0.13316892"> - <folding /> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/management/src/main/org/jboss/portal/portlet/management/PortletInfo.java"> + <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/deployment/PortletApplicationMetaDataFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="28" column="13" selection-start="1913" selection-end="1913" vertical-scroll-proportion="0.10357583"> + <state line="57" column="13" selection-start="3539" selection-end="3539" vertical-scroll-proportion="0.13316892"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeInterceptor.java"> + <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/modules.ent"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="13" selection-start="2138" selection-end="2138" vertical-scroll-proportion="0.16276202"> + <state line="6" column="52" selection-start="280" selection-end="314" vertical-scroll-proportion="0.088779286"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeResponse.java"> + <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/defaults.ent"> <provider selected="true" editor-type-id="text-editor"> - <state line="41" column="13" selection-start="2333" selection-end="2333" vertical-scroll-proportion="0.13316892"> + <state line="65" column="52" selection-start="3295" selection-end="3308" vertical-scroll-proportion="0.7398274"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/bridge/src/main/org/jboss/portal/portlet/bridge/BridgeRequest.java"> + <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent"> <provider selected="true" editor-type-id="text-editor"> - <state line="45" column="13" selection-start="2494" selection-end="2494" vertical-scroll-proportion="0.13316892"> + <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$/bridge/src/main/org/jboss/portal/portlet/bridge/JBossServletContextProvider.java"> + <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="44" column="13" selection-start="2677" selection-end="2677" vertical-scroll-proportion="0.1959799"> + <state line="47" column="13" selection-start="2776" selection-end="2776" vertical-scroll-proportion="0.16582915"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/management/build.sh"> + <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployer.java"> <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="55" column="13" selection-start="3139" selection-end="3139" vertical-scroll-proportion="0.1356784"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/management/build.xml"> + <entry file="file://$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="100" column="0" selection-start="5483" selection-end="5539" vertical-scroll-proportion="0.50308263"> + <state line="88" column="77" selection-start="4986" selection-end="5002" vertical-scroll-proportion="0.33291456"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/bridge/build.xml"> + <entry file="file://$PROJECT_DIR$/test/src/resources/test/servers.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="67" column="64" selection-start="4063" selection-end="4063" vertical-scroll-proportion="0.014796548"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/build.xml"> + <entry file="file://$PROJECT_DIR$/test/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"> + <state line="622" column="0" selection-start="34293" selection-end="34293" vertical-scroll-proportion="0.76942044"> <folding /> </state> </provider> Modified: modules/portlet/trunk/test/build.xml =================================================================== --- modules/portlet/trunk/test/build.xml 2007-09-15 11:55:48 UTC (rev 8284) +++ modules/portlet/trunk/test/build.xml 2007-09-15 12:20:46 UTC (rev 8285) @@ -162,6 +162,7 @@ <copy todir="${build.resources}/jboss-4.2/portlet-test-war/WEB-INF/lib"> <fileset dir="${build.lib}" includes="portlet-test-lib.jar"/> <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-portal-lib.jar,portal-common-mc-lib.jar"/> + <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-generic-lib.jar"/> <fileset dir="${jboss.portal-portlet.lib}" includes="portal-portlet-lib.jar"/> <fileset dir="${jboss.microcontainer.lib}" includes="*.jar"/> @@ -253,53 +254,123 @@ <!-- ================================================================== --> <target name="tests" depends="init, _buildmagic:configure:deployment"> - <!--<antcall target="test-framework"/>--> + <antcall target="tests.local"/> + <antcall target="tests.jboss"/> + <antcall target="tests.tomcat"/> </target> - <target name="bilta" depends="init"> - <execute-tests> - <x-test> -<!-- - <test todir="${test.reports}" name="org.jboss.portal.portlet.test.url.EncoderTestCase"/> - <test todir="${test.reports}" name="org.jboss.portal.portlet.test.url.DecoderTestCase"/> ---> - <test todir="${test.reports}" name="org.jboss.portal.portlet.test.StringCodecTestCase"/> - </x-test> - <x-sysproperty> -<!-- - <jvmarg value="-Xdebug"/> - <jvmarg value="-Xrunjdwp:transport=dt_socket,address=7878,server=y,suspend=y"/> ---> - </x-sysproperty> - <x-classpath> - <path refid="oswego.concurrent.classpath"/> - <path refid="jboss.remoting.classpath"/> - <path refid="jboss.microcontainer.classpath"/> - <path refid="jboss.aop.classpath"/> - <path refid="javassist.javassist.classpath"/> - <path refid="trove.trove.classpath"/> - <path refid="apache.httpclient.classpath"/> - <path refid="apache.logging.classpath"/> - <path refid="apache.codec.classpath"/> - <pathelement location="../tools/lib/cargo-core-uberjar-0.8.jar"/> - <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}"/> - <pathelement location="${jboss.portal-portlet.root}/classes"/> - <path refid="library.classpath"/> - <path refid="dependentmodule.classpath"/> - </x-classpath> - </execute-tests> + <target name="cargo.setup" depends="init"> + <property name="cargo.log.dir" value="${module.output}/cargo"/> + <mkdir dir="${cargo.log.dir}"/> + <taskdef resource="cargo.tasks"> + <classpath> + <path refid="codehaus.cargo.classpath"/> + </classpath> + </taskdef> </target> - <target name="bilto" depends="init"> + <target name="cargo.jboss.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" + action="start" + wait="${cargo.wait}"> + <sharedClasspath> + <path location="${jboss.portal/modules/common.lib}/portal-common-lib.jar"/> + <path location="${jboss.portal/modules/test.lib}/portal-test-lib.jar"/> + <path location="${jboss.portal/modules/web.lib}/portal-web-lib.jar"/> + <path location="${junit.junit.lib}/junit.jar"/> + <path location="${jboss.portal-portlet-jsr168api.lib}/portal-portlet-jsr168api-lib.jar"/> + </sharedClasspath> + <configuration> + <property name="cargo.servlet.port" value="8080"/> + <property name="cargo.logging" value="high"/> + <deployable type="war" file="${build.lib}/jboss-4.2/portlet-test.war"/> + </configuration> + </cargo> + </target> - <!--<property name="ServerName" value="RemoteJBoss-4.2"/>--> - <property name="ServerName" value="RemoteTomcat-6.0"/> + <target name="cargo.jboss.stop" depends="cargo.setup"> + <cargo + containerId="jboss42x" + home="${jboss-4.2.home}" + log="${cargo.log.dir}/cargo.jboss.log" + action="stop"> + <configuration> + <property name="cargo.rmi.port" value="1099"/> + </configuration> + </cargo> + </target> + <target name="cargo.tomcat.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" + action="start" + wait="${cargo.wait}"> + <sharedClasspath> + <path location="${jboss.portal/modules/common.lib}/portal-common-lib.jar"/> + <path location="${jboss.portal/modules/test.lib}/portal-test-lib.jar"/> + <path location="${jboss.portal/modules/web.lib}/portal-web-lib.jar"/> + <path location="${junit.junit.lib}/junit.jar"/> + <path location="${jboss.portal-portlet-jsr168api.lib}/portal-portlet-jsr168api-lib.jar"/> + <path location="${apache.log4j.lib}/log4j.jar"/> + <path location="${oswego.concurrent.lib}/concurrent.jar"/> + <path location="${sun.jaf.lib}/activation.jar"/> + <path location="${junit.junit.lib}/junit.jar"/> + </sharedClasspath> + <configuration> + <property name="cargo.servlet.port" value="8080"/> + <property name="cargo.logging" value="high"/> + <deployable type="war" file="${codehaus.cargo.lib}/manager.war"/> + <deployable type="war" file="${build.lib}/tomcat-6.0/portlet-test.war"/> + </configuration> + </cargo> + </target> + + <target name="cargo.tomcat.stop" depends="cargo.setup"> + <cargo + containerId="tomcat5x" + home="${tomcat-6.0.home}" + log="${cargo.log.dir}/cargo.tomcat.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"> + <param name="cargo.wait" value="false"/> + </antcall> + <antcall target="tests.remote"> + <param name="server.name" value="RemoteJBoss-4.2"/> + </antcall> + <antcall target="cargo.jboss.stop"> + </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> + <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"> + <execute-tests> <x-test> @@ -309,249 +380,243 @@ outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.DispatcherTestCase" id="org.jboss.portal.test.portlet.jsr168.tck.DispatcherTestCase"> <parameter name="archive" value="test-jsr168-dispatcher.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-portletconfig.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-portletcontext.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-portletinterface.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-portletmode.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-portletrequests.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-portletresponses.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-portletsession.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-portleturl.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-preferences.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-windowstates.war"/> - <parameter name="serverName" value="${ServerName}"/> + <parameter name="serverName" value="${server.name}"/> </zest> ---> <!--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"> <parameter name="archive" value="test-jsr168-api-actionrequest.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-api-actionresponse.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-api-portalcontext.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-api-portletconfig.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-api-portletcontext.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-api-portletmode.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-api-portletpreferences.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-api-portletsession.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-api-portletsessionutil.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-api-portleturl.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-api-renderrequest.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-api-renderresponse.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-api-windowstate.war"/> - <parameter name="serverName" value="${ServerName}"/> + <parameter name="serverName" value="${server.name}"/> </zest> ---> <!--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"> <parameter name="archive" value="test-jsr168-ext-dispatcher.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-ext-portletconfig.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-ext-portletmode.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-ext-portletrequests.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-ext-portletresponses.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-ext-preferences.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-ext-session.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-ext-expiringcache.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-ext-neverexpiringcache.war"/> - <parameter name="serverName" value="${ServerName}"/> + <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"> <parameter name="archive" value="test-jsr168-ext-nocache.war"/> - <parameter name="serverName" value="${ServerName}"/> + <parameter name="serverName" value="${server.name}"/> </zest> ---> <!--Misc Tests--> <!-- @@ -560,7 +625,7 @@ outfile="TEST-org.jboss.portal.test.portlet.jsr168.misc.Log4jTestCase" id="org.jboss.portal.test.portlet.jsr168.misc.Log4jTestCase"> <parameter name="archive" value="test-jsr168-misc-log4j.war"/> - <parameter name="serverName" value="${ServerName}"/> + <parameter name="serverName" value="${server.name}"/> </zest> --> @@ -583,7 +648,7 @@ <path refid="apache.logging.classpath"/> <path refid="apache.codec.classpath"/> <pathelement location="${build.resources}/test"/> - <pathelement location="../tools/lib/cargo-core-uberjar-0.8.jar"/> + <path refid="codehaus.cargo.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="apache.xerces.classpath"/> <pathelement location="${source.java}"/> @@ -593,6 +658,44 @@ <path refid="dependentmodule.classpath"/> </x-classpath> </execute-tests> + </target> + <target name="tests.local" depends="init"> + <execute-tests> + <x-test> + <test todir="${test.reports}" name="org.jboss.portal.portlet.test.url.EncoderTestCase"/> + <test todir="${test.reports}" name="org.jboss.portal.portlet.test.url.DecoderTestCase"/> + <test todir="${test.reports}" name="org.jboss.portal.portlet.test.StringCodecTestCase"/> + </x-test> + <x-sysproperty> +<!-- + <jvmarg value="-Xdebug"/> + <jvmarg value="-Xrunjdwp:transport=dt_socket,address=7878,server=y,suspend=y"/> +--> + </x-sysproperty> + <x-classpath> + <path refid="oswego.concurrent.classpath"/> + <path refid="jboss.remoting.classpath"/> + <path refid="jboss.microcontainer.classpath"/> + <path refid="jboss.aop.classpath"/> + <path refid="javassist.javassist.classpath"/> + <path refid="trove.trove.classpath"/> + <path refid="apache.httpclient.classpath"/> + <path refid="apache.logging.classpath"/> + <path refid="apache.codec.classpath"/> + <path refid="codehaus.cargo.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}"/> + <pathelement location="${jboss.portal-portlet.root}/classes"/> + <path refid="library.classpath"/> + <path refid="dependentmodule.classpath"/> + </x-classpath> + </execute-tests> + </target> + </project> Modified: modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml =================================================================== --- modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2007-09-15 11:55:48 UTC (rev 8284) +++ modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2007-09-15 12:20:46 UTC (rev 8285) @@ -51,9 +51,16 @@ <bean name="PortletInfoFactory" class="org.jboss.portal.portlet.impl.jsr168.PortletInfoFactoryImpl"> </bean> - <!-- The servlet container obtained from the ServletContainer factory --> + <!-- The ServletContainerFactory --> + <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory"> + <constructor factoryClass="org.jboss.portal.web.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/> + </bean> + + <!-- The servlet container obtained from the ServletContainerFactory --> <bean name="ServletContainer" class="org.jboss.portal.web.ServletContainer"> - <constructor factoryClass="org.jboss.portal.web.ServletContainer" factoryMethod="getInstance"/> + <constructor factoryMethod="getServletContainer"> + <factory bean="ServletContainerFactory"/> + </constructor> </bean> <!-- Consumer stack --> @@ -79,7 +86,7 @@ <bean name="SecureTransportInterceptor" class="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor"> </bean> <bean name="ContextDispatcherInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor"> - <property name="servletContainer"><inject bean="ServletContainer"/></property> + <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property> </bean> <bean name="WindowStatesInterceptor" class="org.jboss.portal.portlet.aspects.portlet.WindowStatesInterceptor"> </bean> Modified: modules/portlet/trunk/testsuite/build.xml =================================================================== --- modules/portlet/trunk/testsuite/build.xml 2007-09-15 11:55:48 UTC (rev 8284) +++ modules/portlet/trunk/testsuite/build.xml 2007-09-15 12:20:46 UTC (rev 8285) @@ -46,7 +46,6 @@ <path id="portal.task.classpath"> <pathelement location="${project.tools}/lib/ant.jar"/> <pathelement location="${project.tools}/lib/explode.jar"/> - <pathelement location="${project.tools}/lib/cargo-core-uberjar-0.8.jar"/> </path> <taskdef Modified: modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent =================================================================== --- modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-15 11:55:48 UTC (rev 8284) +++ modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-15 12:20:46 UTC (rev 8285) @@ -80,16 +80,29 @@ <property file="${user.home}/.buildmagic.properties"/> <property file="${user.home}/.ant.properties"/> - <!-- Setup the JBoss environment --> + <!-- Setup the environment --> <property environment="env"/> <!-- Define jboss home --> - <condition property="jboss.home" value="${env.JBOSS_HOME}"> - <not> - <isset property="jboss.home"/> - </not> + <condition property="jboss-4.2.home" value="${env.JBOSS_4_2_HOME}"> + <and> + <not> + <isset property="jboss-4.2.home"/> + </not> + <isset property="env.JBOSS_4_2_HOME"/> + </and> </condition> + <!-- Define tomcat home --> + <condition property="tomcat-6.0.home" value="${env.TOMCAT_6_0_HOME}"> + <and> + <not> + <isset property="tomcat-6.0.home"/> + </not> + <isset property="env.TOMCAT_6_0_HOME"/> + </and> + </condition> + <!-- Setup the build.log --> <call target="_buildmagic:init:buildlog" unless="init-buildlog.disable"/> @@ -1111,7 +1124,6 @@ <path id="portal.task.classpath"> <pathelement location="${project.tools}/lib/ant.jar"/> <pathelement location="${project.tools}/lib/explode.jar"/> - <pathelement location="${project.tools}/lib/cargo-core-uberjar-0.8.jar"/> </path> <taskdef name="deploy" Deleted: modules/portlet/trunk/tools/lib/cargo-core-uberjar-0.8.jar =================================================================== (Binary files differ)