JBoss Portal SVN: r8285 - in modules/portlet/trunk: build and 5 other directories.
by portal-commits@lists.jboss.org
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)
18 years, 7 months
JBoss Portal SVN: r8284 - modules/web/trunk/web.
by portal-commits@lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-09-15 07:55:48 -0400 (Sat, 15 Sep 2007)
New Revision: 8284
Modified:
modules/web/trunk/web/build.xml
Log:
fix minor things in the build
Modified: modules/web/trunk/web/build.xml
===================================================================
--- modules/web/trunk/web/build.xml 2007-09-15 11:54:15 UTC (rev 8283)
+++ modules/web/trunk/web/build.xml 2007-09-15 11:55:48 UTC (rev 8284)
@@ -327,7 +327,7 @@
<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="wait" value="false"/>
+ <param name="cargo.wait" value="false"/>
</antcall>
<antcall target="tests.remote">
<param name="server.name" value="RemoteJBoss-4.2"/>
@@ -340,7 +340,7 @@
<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="wait" value="false"/>
+ <param name="cargo.wait" value="false"/>
</antcall>
<antcall target="tests.remote">
<param name="server.name" value="RemoteTomcat-6.0"/>
18 years, 7 months
JBoss Portal SVN: r8283 - in modules/web/trunk: web and 1 other directory.
by portal-commits@lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-09-15 07:54:15 -0400 (Sat, 15 Sep 2007)
New Revision: 8283
Modified:
modules/web/trunk/tools/etc/buildfragments/buildmagic.ent
modules/web/trunk/web/build.xml
Log:
fix minor issues in the build
Modified: modules/web/trunk/tools/etc/buildfragments/buildmagic.ent
===================================================================
--- modules/web/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-15 11:42:10 UTC (rev 8282)
+++ modules/web/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-15 11:54:15 UTC (rev 8283)
@@ -80,7 +80,7 @@
<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 -->
@@ -93,7 +93,7 @@
</and>
</condition>
- <!-- Define jboss home -->
+ <!-- Define tomcat home -->
<condition property="tomcat-6.0.home" value="${env.TOMCAT_6_0_HOME}">
<and>
<not>
Modified: modules/web/trunk/web/build.xml
===================================================================
--- modules/web/trunk/web/build.xml 2007-09-15 11:42:10 UTC (rev 8282)
+++ modules/web/trunk/web/build.xml 2007-09-15 11:54:15 UTC (rev 8283)
@@ -243,7 +243,7 @@
</target>
<target name="cargo.setup" depends="init">
- <property name="cargo.log.dir" value="${build.output}/cargo"/>
+ <property name="cargo.log.dir" value="${module.output}/cargo"/>
<mkdir dir="${cargo.log.dir}"/>
<taskdef resource="cargo.tasks">
<classpath>
18 years, 7 months
JBoss Portal SVN: r8282 - modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment.
by portal-commits@lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-09-15 07:42:10 -0400 (Sat, 15 Sep 2007)
New Revision: 8282
Modified:
modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/UnmarshallerTestCase.java
Log:
remove wrong imports
Modified: modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/UnmarshallerTestCase.java
===================================================================
--- modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/UnmarshallerTestCase.java 2007-09-14 23:07:18 UTC (rev 8281)
+++ modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/UnmarshallerTestCase.java 2007-09-15 11:42:10 UTC (rev 8282)
@@ -26,8 +26,6 @@
import org.jboss.portal.common.transaction.Transactions;
import org.jboss.portal.common.net.URLTools;
import org.jboss.portal.portlet.TransportGuarantee;
-import org.jboss.portal.portlet.deployment.JBossApplicationMetaDataFactory;
-import org.jboss.portal.portlet.deployment.PortletApplicationMetaDataFactory;
import org.jboss.portal.portlet.impl.jsr168.metadata.LocalizedValueMetaData;
import org.jboss.portal.portlet.impl.jsr168.metadata.ParameterMetaData;
import org.jboss.portal.portlet.impl.jsr168.metadata.PortletApplicationMetaData;
18 years, 7 months
JBoss Portal SVN: r8281 - in modules/web/trunk: tools/etc/buildfragments and 1 other directories.
by portal-commits@lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-09-14 19:07:18 -0400 (Fri, 14 Sep 2007)
New Revision: 8281
Modified:
modules/web/trunk/build/build-thirdparty.xml
modules/web/trunk/tools/etc/buildfragments/buildmagic.ent
modules/web/trunk/web/build.xml
Log:
finished the configuration of web spi tests in tomcat and jboss
Modified: modules/web/trunk/build/build-thirdparty.xml
===================================================================
--- modules/web/trunk/build/build-thirdparty.xml 2007-09-14 21:39:10 UTC (rev 8280)
+++ modules/web/trunk/build/build-thirdparty.xml 2007-09-14 23:07:18 UTC (rev 8281)
@@ -66,7 +66,7 @@
<componentref name="jboss/jbossxb" version="1.0.0.GA-brew"/>
<componentref name="junit" version="3.8.1"/>
- <componentref name="codehaus/cargo" version="0.9"/>
+ <componentref name="codehaus/cargo" version="0.9-portal"/>
<!-- Based on http://anonsvn.jboss.org/repos/jbossas/tags/EMBEDDED_JBOSS_BETA_2/build/b... -->
<!--
Modified: modules/web/trunk/tools/etc/buildfragments/buildmagic.ent
===================================================================
--- modules/web/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-14 21:39:10 UTC (rev 8280)
+++ modules/web/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-14 23:07:18 UTC (rev 8281)
@@ -84,12 +84,25 @@
<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 jboss 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"/>
Modified: modules/web/trunk/web/build.xml
===================================================================
--- modules/web/trunk/web/build.xml 2007-09-14 21:39:10 UTC (rev 8280)
+++ modules/web/trunk/web/build.xml 2007-09-14 23:07:18 UTC (rev 8281)
@@ -243,6 +243,8 @@
</target>
<target name="cargo.setup" depends="init">
+ <property name="cargo.log.dir" value="${build.output}/cargo"/>
+ <mkdir dir="${cargo.log.dir}"/>
<taskdef resource="cargo.tasks">
<classpath>
<path refid="codehaus.cargo.classpath"/>
@@ -251,12 +253,11 @@
</target>
<target name="cargo.jboss.start" depends="cargo.setup">
- <property name="cargo.jboss.home" value="/Users/julien/java/jboss-4.2.0.GA"/>
<cargo
containerId="jboss42x"
- home="${cargo.jboss.home}"
- output="jboss.log"
- log="cargo.log"
+ 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>
@@ -274,10 +275,10 @@
</target>
<target name="cargo.jboss.stop" depends="cargo.setup">
- <property name="cargo.jboss.home" value="/Users/julien/java/jboss-4.2.0.GA"/>
<cargo
containerId="jboss42x"
- home="${cargo.jboss.home}"
+ home="${jboss-4.2.home}"
+ log="${cargo.log.dir}/cargo.jboss.log"
action="stop">
<configuration>
<property name="cargo.rmi.port" value="1099"/>
@@ -286,12 +287,11 @@
</target>
<target name="cargo.tomcat.start" depends="cargo.setup">
- <property name="tomcat.home" value="/Users/julien/java/apache-tomcat-6.0.14"/>
<cargo
containerId="tomcat5x"
- home="${tomcat.home}"
- output="tomcat.log"
- log="cargo.log"
+ 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>
@@ -306,17 +306,17 @@
<configuration>
<property name="cargo.servlet.port" value="8080"/>
<property name="cargo.logging" value="high"/>
- <deployable type="war" file="manager.war"/>
+ <deployable type="war" file="${codehaus.cargo.lib}/manager.war"/>
<deployable type="war" file="${build.lib}/tomcat-container-servlet-6.0/test-spi-server.war"/>
</configuration>
</cargo>
</target>
<target name="cargo.tomcat.stop" depends="cargo.setup">
- <property name="tomcat.home" value="/Users/julien/java/apache-tomcat-6.0.14"/>
<cargo
containerId="tomcat5x"
- home="${cargo.jboss.home}"
+ home="${tomcat-6.0.home}"
+ log="${cargo.log.dir}/cargo.tomcat.log"
action="stop">
<configuration>
</configuration>
@@ -324,10 +324,12 @@
</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="wait" value="false"/>
</antcall>
- <antcall target="blah">
+ <antcall target="tests.remote">
<param name="server.name" value="RemoteJBoss-4.2"/>
</antcall>
<antcall target="cargo.jboss.stop">
@@ -335,6 +337,8 @@
</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="wait" value="false"/>
</antcall>
18 years, 7 months
JBoss Portal SVN: r8280 - in modules/test/trunk: build/ide/intellij/idea60/modules/test and 3 other directories.
by portal-commits@lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-09-14 17:39:10 -0400 (Fri, 14 Sep 2007)
New Revision: 8280
Added:
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/remote/response/DeployResponse.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/remote/response/UndeployResponse.java
Modified:
modules/test/trunk/build/build-thirdparty.xml
modules/test/trunk/build/ide/intellij/idea60/modules/test/test.iml
modules/test/trunk/test/build.xml
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/config/RemoteDeployerConfig.java
Log:
update to use cargo 0.9
Modified: modules/test/trunk/build/build-thirdparty.xml
===================================================================
--- modules/test/trunk/build/build-thirdparty.xml 2007-09-14 21:38:23 UTC (rev 8279)
+++ modules/test/trunk/build/build-thirdparty.xml 2007-09-14 21:39:10 UTC (rev 8280)
@@ -48,6 +48,9 @@
-->
<componentref name="jboss-portal/modules/common" version="1.0.0-SNAPSHOT"/>
+
+ <componentref name="codehaus/cargo" version="0.9"/>
+
<componentref name="jbossas/core-libs" version="4.0.4.GA"/>
<componentref name="hibernate" version="3.2.0.CR2"/>
<componentref name="jboss/microcontainer" version="1.0.2"/>
Modified: modules/test/trunk/build/ide/intellij/idea60/modules/test/test.iml
===================================================================
--- modules/test/trunk/build/ide/intellij/idea60/modules/test/test.iml 2007-09-14 21:38:23 UTC (rev 8279)
+++ modules/test/trunk/build/ide/intellij/idea60/modules/test/test.iml 2007-09-14 21:39:10 UTC (rev 8280)
@@ -301,7 +301,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../tools/lib/cargo-core-uberjar-0.8.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/sun-servlet/lib/servlet-api.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -310,7 +310,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/sun-servlet/lib/servlet-api.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/remoting/lib/jboss-remoting.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -319,12 +319,21 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/remoting/lib/jboss-remoting.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/codehaus/cargo/lib/cargo-ant-0.9.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/codehaus/cargo/lib/cargo-core-uberjar-0.9.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
Modified: modules/test/trunk/test/build.xml
===================================================================
--- modules/test/trunk/test/build.xml 2007-09-14 21:38:23 UTC (rev 8279)
+++ modules/test/trunk/test/build.xml 2007-09-14 21:39:10 UTC (rev 8280)
@@ -98,7 +98,7 @@
<path refid="junit.junit.classpath"/>
<path refid="sun.servlet.classpath"/>
<path refid="jboss.remoting.classpath"/>
- <pathelement location="../tools/lib/cargo-core-uberjar-0.8.jar"/>
+ <path refid="codehaus.cargo.classpath"/>
<path location="selenium-java-client-driver-backport.jar"/>
<!--<path refid="sun.opends.classpath"/>-->
</path>
Added: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/remote/response/DeployResponse.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/remote/response/DeployResponse.java (rev 0)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/remote/response/DeployResponse.java 2007-09-14 21:39:10 UTC (rev 8280)
@@ -0,0 +1,50 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.test.framework.driver.remote.response;
+
+import org.jboss.portal.test.framework.driver.DriverResponse;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class DeployResponse extends DriverResponse
+{
+
+ /** . */
+ private final String id;
+
+ public DeployResponse(String id)
+ {
+ if (id == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ this.id = id;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+}
Added: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/remote/response/UndeployResponse.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/remote/response/UndeployResponse.java (rev 0)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/remote/response/UndeployResponse.java 2007-09-14 21:39:10 UTC (rev 8280)
@@ -0,0 +1,50 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.test.framework.driver.remote.response;
+
+import org.jboss.portal.test.framework.driver.DriverResponse;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class UndeployResponse extends DriverResponse
+{
+
+ /** . */
+ private final String id;
+
+ public UndeployResponse(String id)
+ {
+ if (id == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ this.id = id;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+}
Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/config/RemoteDeployerConfig.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/config/RemoteDeployerConfig.java 2007-09-14 21:38:23 UTC (rev 8279)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/generic/config/RemoteDeployerConfig.java 2007-09-14 21:39:10 UTC (rev 8280)
@@ -56,7 +56,7 @@
public Configuration createConfiguration()
{
ConfigurationFactory cfgFactory = new DefaultConfigurationFactory();
- Configuration cfg = cfgFactory.createConfiguration(name, ConfigurationType.RUNTIME);
+ Configuration cfg = cfgFactory.createConfiguration(name, ContainerType.REMOTE, ConfigurationType.RUNTIME);
cfg.setProperty(GeneralPropertySet.PROTOCOL, "http");
cfg.setProperty(GeneralPropertySet.HOSTNAME, host);
cfg.setProperty(ServletPropertySet.PORT, port);
18 years, 7 months
JBoss Portal SVN: r8279 - in modules/web/trunk: tools/etc/buildfragments and 3 other directories.
by portal-commits@lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-09-14 17:38:23 -0400 (Fri, 14 Sep 2007)
New Revision: 8279
Removed:
modules/web/trunk/tools/lib/cargo-core-uberjar-0.8.jar
Modified:
modules/web/trunk/build/build-thirdparty.xml
modules/web/trunk/tools/etc/buildfragments/buildmagic.ent
modules/web/trunk/web/build.xml
modules/web/trunk/web/src/resources/portal-web-test-jar/org/jboss/portal/test/web/spi/server-beans.xml
Log:
update to use cargo 0.9
Modified: modules/web/trunk/build/build-thirdparty.xml
===================================================================
--- modules/web/trunk/build/build-thirdparty.xml 2007-09-14 21:16:09 UTC (rev 8278)
+++ modules/web/trunk/build/build-thirdparty.xml 2007-09-14 21:38:23 UTC (rev 8279)
@@ -51,6 +51,7 @@
<componentref name="jboss-portal/modules/test" version="1.0.0-SNAPSHOT"/>
<componentref name="sun-servlet" version="2.4"/>
<componentref name="apache-tomcat" version="5.0.30"/>
+ <componentref name="sun-jaf" version="1.0.2"/>
<componentref name="jboss/remoting" version="2.2.0.SP4"/>
@@ -65,6 +66,8 @@
<componentref name="jboss/jbossxb" version="1.0.0.GA-brew"/>
<componentref name="junit" version="3.8.1"/>
+ <componentref name="codehaus/cargo" version="0.9"/>
+
<!-- Based on http://anonsvn.jboss.org/repos/jbossas/tags/EMBEDDED_JBOSS_BETA_2/build/b... -->
<!--
<componentref name="jboss/microcontainer" version="2.0.0.Beta3"/>
Modified: modules/web/trunk/tools/etc/buildfragments/buildmagic.ent
===================================================================
--- modules/web/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-14 21:16:09 UTC (rev 8278)
+++ modules/web/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-14 21:38:23 UTC (rev 8279)
@@ -1105,20 +1105,3 @@
</fileset>
</copy>
</target>
-
-<!-- Configure deployment tasks -->
-<target name="_buildmagic:configure:deployment">
- <path id="portal.task.classpath">
- <pathelement location="${project.tools}/lib/ant.jar"/>
- <pathelement location="${project.tools}/lib/explode.jar"/>
- <pathelement location="${project.tools}/lib/cargo-core-uberjar-0.8.jar"/>
- </path>
- <taskdef
- name="deploy"
- classname="org.jboss.portal.common.ant.Deploy"
- classpathref="portal.task.classpath"/>
- <taskdef
- name="undeploy"
- classname="org.jboss.portal.common.ant.Undeploy"
- classpathref="portal.task.classpath"/>
-</target>
Deleted: modules/web/trunk/tools/lib/cargo-core-uberjar-0.8.jar
===================================================================
(Binary files differ)
Modified: modules/web/trunk/web/build.xml
===================================================================
--- modules/web/trunk/web/build.xml 2007-09-14 21:16:09 UTC (rev 8278)
+++ modules/web/trunk/web/build.xml 2007-09-14 21:38:23 UTC (rev 8279)
@@ -215,7 +215,6 @@
<!-- -->
<copy todir="${build.resources}/test/spi/jboss-container-servlet-4.2/server-war/WEB-INF/lib">
- <fileset dir="${build.lib}" includes="portal-web-lib.jar"/>
<fileset dir="${build.lib}" includes="portal-web-test-lib.jar"/>
<fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar,portal-common-mc-lib.jar"/>
<fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-generic-lib.jar"/>
@@ -243,20 +242,160 @@
</target>
+ <target name="cargo.setup" depends="init">
+ <taskdef resource="cargo.tasks">
+ <classpath>
+ <path refid="codehaus.cargo.classpath"/>
+ </classpath>
+ </taskdef>
+ </target>
+
+ <target name="cargo.jboss.start" depends="cargo.setup">
+ <property name="cargo.jboss.home" value="/Users/julien/java/jboss-4.2.0.GA"/>
+ <cargo
+ containerId="jboss42x"
+ home="${cargo.jboss.home}"
+ output="jboss.log"
+ log="cargo.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="${junit.junit.lib}/junit.jar"/>
+ <path location="${build.lib}/portal-web-lib.jar"/>
+ </sharedClasspath>
+ <configuration>
+ <property name="cargo.servlet.port" value="8080"/>
+ <property name="cargo.logging" value="high"/>
+ <deployable type="war" file="${build.lib}/jboss-container-servlet-4.2/test-spi-server.war"/>
+ </configuration>
+ </cargo>
+ </target>
+
+ <target name="cargo.jboss.stop" depends="cargo.setup">
+ <property name="cargo.jboss.home" value="/Users/julien/java/jboss-4.2.0.GA"/>
+ <cargo
+ containerId="jboss42x"
+ home="${cargo.jboss.home}"
+ action="stop">
+ <configuration>
+ <property name="cargo.rmi.port" value="1099"/>
+ </configuration>
+ </cargo>
+ </target>
+
+ <target name="cargo.tomcat.start" depends="cargo.setup">
+ <property name="tomcat.home" value="/Users/julien/java/apache-tomcat-6.0.14"/>
+ <cargo
+ containerId="tomcat5x"
+ home="${tomcat.home}"
+ output="tomcat.log"
+ log="cargo.log"
+ action="start"
+ wait="${cargo.wait}">
+ <sharedClasspath>
+ <path location="${apache.log4j.lib}/log4j.jar"/>
+ <path location="${oswego.concurrent.lib}/concurrent.jar"/>
+ <path location="${jboss.portal/modules/common.lib}/portal-common-lib.jar"/>
+ <path location="${jboss.portal/modules/test.lib}/portal-test-lib.jar"/>
+ <path location="${sun.jaf.lib}/activation.jar"/>
+ <path location="${junit.junit.lib}/junit.jar"/>
+ <path location="${build.lib}/portal-web-lib.jar"/>
+ </sharedClasspath>
+ <configuration>
+ <property name="cargo.servlet.port" value="8080"/>
+ <property name="cargo.logging" value="high"/>
+ <deployable type="war" file="manager.war"/>
+ <deployable type="war" file="${build.lib}/tomcat-container-servlet-6.0/test-spi-server.war"/>
+ </configuration>
+ </cargo>
+ </target>
+
+ <target name="cargo.tomcat.stop" depends="cargo.setup">
+ <property name="tomcat.home" value="/Users/julien/java/apache-tomcat-6.0.14"/>
+ <cargo
+ containerId="tomcat5x"
+ home="${cargo.jboss.home}"
+ action="stop">
+ <configuration>
+ </configuration>
+ </cargo>
+ </target>
+
+ <target name="tests.jboss" depends="init">
+ <antcall target="cargo.jboss.start">
+ <param name="wait" value="false"/>
+ </antcall>
+ <antcall target="blah">
+ <param name="server.name" value="RemoteJBoss-4.2"/>
+ </antcall>
+ <antcall target="cargo.jboss.stop">
+ </antcall>
+ </target>
+
+ <target name="tests.tomcat" depends="init">
+ <antcall target="cargo.tomcat.start">
+ <param name="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" depends="init">
+ <antcall target="tests.local"/>
+ <antcall target="tests.jboss"/>
+ <antcall target="tests.tomcat"/>
+ </target>
- <!--<property name="ServerName" value="RemoteJBoss-4.2"/>-->
- <property name="ServerName" value="RemoteTomcat-6.0"/>
+ <target name="tests.local" depends="init">
+ <execute-tests>
+ <x-test>
+ <test todir="${test.reports}" name="org.jboss.portal.test.web.container.ServletContainerTestCase"/>
+ </x-test>
+ <x-sysproperty>
+ <sysproperty key="test.root" value="${build.lib}"/>
+<!--
+ <jvmarg value="-Xdebug"/>
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,address=7878,server=y,suspend=y"/>
+-->
+ </x-sysproperty>
+ <x-classpath>
+ <pathelement location="${build.lib}/portal-web-lib.jar"/>
+ <pathelement location="${build.lib}/portal-web-test-lib.jar"/>
+ <pathelement location="${build.resources}/test/config"/>
+ <path refid="oswego.concurrent.classpath"/>
+ <path refid="jboss.remoting.classpath"/>
+ <path refid="jboss.microcontainer.classpath"/>
+ <path refid="jboss.jbossxb.classpath"/>
+ <path refid="apache.xerces.classpath"/>
+ <path refid="jboss.common.classpath"/>
+
+ <path refid="apache.httpclient.classpath"/>
+ <path refid="apache.logging.classpath"/>
+ <path refid="apache.codec.classpath"/>
+ <pathelement location="${build.resources}/test"/>
+ <pathelement location="${source.java}"/>
+ <pathelement location="${jboss.portal-portlet.root}/classes"/>
+ <pathelement location="${jboss.portal/modules/test.lib}/portal-test-generic-lib.jar"/>
+ <path refid="codehaus.cargo.classpath"/>
+ <path refid="library.classpath"/>
+ <path refid="dependentmodule.classpath"/>
+ </x-classpath>
+ </execute-tests>
+ </target>
+
+ <target name="tests.remote" depends="init">
+
<execute-tests>
<x-test>
-
- <!--<test todir="${test.reports}" name="org.jboss.portal.test.web.container.ServletContainerTestCase"/>-->
<zest todir="${test.reports}" name="org.jboss.portal.test.web.spi.SPITestCase">
- <!--<parameter name="archive" value="test-jsr168-dispatcher.war"/>-->
- <parameter name="serverName" value="${ServerName}"/>
+ <parameter name="serverName" value="${server.name}"/>
</zest>
-
</x-test>
<x-sysproperty>
<sysproperty key="test.root" value="${build.lib}"/>
@@ -271,12 +410,6 @@
<pathelement location="${build.resources}/test/config"/>
<path refid="oswego.concurrent.classpath"/>
- <!--<path refid="jboss/common.logging.spi.classpath"/>-->
- <!--<path refid="jboss/common.core.classpath"/>-->
- <!--<path refid="jboss.aop.classpath"/>-->
- <!--<path refid="javassist.javassist.classpath"/>-->
- <!--<path refid="trove.trove.classpath"/>-->
-
<path refid="jboss.remoting.classpath"/>
<path refid="jboss.microcontainer.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
@@ -288,10 +421,10 @@
<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"/>
<pathelement location="${source.java}"/>
<pathelement location="${jboss.portal-portlet.root}/classes"/>
<pathelement location="${jboss.portal/modules/test.lib}/portal-test-generic-lib.jar"/>
+ <path refid="codehaus.cargo.classpath"/>
<path refid="library.classpath"/>
<path refid="dependentmodule.classpath"/>
</x-classpath>
Modified: modules/web/trunk/web/src/resources/portal-web-test-jar/org/jboss/portal/test/web/spi/server-beans.xml
===================================================================
--- modules/web/trunk/web/src/resources/portal-web-test-jar/org/jboss/portal/test/web/spi/server-beans.xml 2007-09-14 21:16:09 UTC (rev 8278)
+++ modules/web/trunk/web/src/resources/portal-web-test-jar/org/jboss/portal/test/web/spi/server-beans.xml 2007-09-14 21:38:23 UTC (rev 8279)
@@ -38,8 +38,14 @@
</constructor>
</bean>
+ <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory">
+ <constructor factoryClass="org.jboss.portal.web.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
+ </bean>
+
<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>
</deployment>
18 years, 7 months
JBoss Portal SVN: r8278 - trunk/core-admin/src/main/org/jboss/portal/core/admin/ui.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-09-14 17:16:09 -0400 (Fri, 14 Sep 2007)
New Revision: 8278
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java
Log:
- JBPORTAL-1682: Fixed comparator to use display name instead of id.
Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2007-09-14 21:15:21 UTC (rev 8277)
+++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2007-09-14 21:16:09 UTC (rev 8278)
@@ -33,6 +33,7 @@
import org.jboss.portal.portlet.federation.FederatedPortletInvoker;
import org.jboss.portal.portlet.federation.FederatingPortletInvoker;
import org.jboss.portal.portlet.federation.impl.FederatedPortlet;
+import org.jboss.portal.portlet.info.MetaInfo;
import org.jboss.portal.portlet.info.ModeInfo;
import org.jboss.portal.portlet.info.PortletInfo;
import org.jboss.portal.portlet.info.PreferenceInfo;
@@ -415,14 +416,15 @@
portletInvokerItems = null;
}
- /** A comparator for portlets. */
+ /** A comparator for portlets. Order portlets in the alphabetical order of their display name. */
final Comparator comparator = new Comparator()
{
public int compare(Object o1, Object o2)
{
Portlet p1 = (Portlet)o1;
Portlet p2 = (Portlet)o2;
- return p1.getContext().getId().compareToIgnoreCase(p2.getContext().getId());
+ return p1.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString()
+ .compareToIgnoreCase(p2.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString());
}
};
}
18 years, 7 months
JBoss Portal SVN: r8277 - branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-09-14 17:15:21 -0400 (Fri, 14 Sep 2007)
New Revision: 8277
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java
Log:
- JBPORTAL-1682: Fixed comparator to use display name instead of id.
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2007-09-14 19:06:15 UTC (rev 8276)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2007-09-14 21:15:21 UTC (rev 8277)
@@ -33,6 +33,7 @@
import org.jboss.portal.portlet.federation.FederatedPortletInvoker;
import org.jboss.portal.portlet.federation.FederatingPortletInvoker;
import org.jboss.portal.portlet.federation.impl.FederatedPortlet;
+import org.jboss.portal.portlet.info.MetaInfo;
import org.jboss.portal.portlet.info.ModeInfo;
import org.jboss.portal.portlet.info.PortletInfo;
import org.jboss.portal.portlet.info.PreferenceInfo;
@@ -415,14 +416,15 @@
portletInvokerItems = null;
}
- /** A comparator for portlets. */
+ /** A comparator for portlets. Order portlets in the alphabetical order of their display name. */
final Comparator comparator = new Comparator()
{
public int compare(Object o1, Object o2)
{
Portlet p1 = (Portlet)o1;
Portlet p2 = (Portlet)o2;
- return p1.getContext().getId().compareToIgnoreCase(p2.getContext().getId());
+ return p1.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString()
+ .compareToIgnoreCase(p2.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString());
}
};
}
18 years, 7 months
JBoss Portal SVN: r8276 - trunk/core-admin/src/resources/portal-admin-war/img.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-09-14 15:06:15 -0400 (Fri, 14 Sep 2007)
New Revision: 8276
Added:
trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_Add.gif
trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_Delete.gif
trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_Details.gif
trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_IsDefault.gif
trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_Layout.gif
trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_MakeDefault.gif
trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_MoveDown.gif
trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_MoveUp.gif
trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_Properties.gif
trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_Rename.gif
trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_Security.gif
trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_Theme.gif
trunk/core-admin/src/resources/portal-admin-war/img/objectPath_Arrow.gif
trunk/core-admin/src/resources/portal-admin-war/img/pathBackground.png
Modified:
trunk/core-admin/src/resources/portal-admin-war/img/pathSeparator.png
Log:
- JBPORTAL-1642: added action icons and pictures for object path navigation. Thanks, Meriah!
Added: trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_Add.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_Add.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_Delete.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_Delete.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_Details.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_Details.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_IsDefault.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_IsDefault.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_Layout.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_Layout.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_MakeDefault.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_MakeDefault.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_MoveDown.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_MoveDown.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_MoveUp.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_MoveUp.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_Properties.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_Properties.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_Rename.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_Rename.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_Security.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_Security.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_Theme.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_Theme.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-admin/src/resources/portal-admin-war/img/objectPath_Arrow.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core-admin/src/resources/portal-admin-war/img/objectPath_Arrow.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core-admin/src/resources/portal-admin-war/img/pathBackground.png
===================================================================
(Binary files differ)
Property changes on: trunk/core-admin/src/resources/portal-admin-war/img/pathBackground.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Modified: trunk/core-admin/src/resources/portal-admin-war/img/pathSeparator.png
===================================================================
(Binary files differ)
18 years, 7 months