Author: julien(a)jboss.com
Date: 2007-08-22 12:07:20 -0400 (Wed, 22 Aug 2007)
New Revision: 8032
Added:
modules/portlet/trunk/build/ide/intellij/idea60/modules/test/
modules/portlet/trunk/build/ide/intellij/idea60/modules/test/test.iml
Modified:
modules/portlet/trunk/build/build-thirdparty.xml
modules/portlet/trunk/jboss-portal-portlet.ipr
modules/portlet/trunk/jboss-portal-portlet.iws
modules/portlet/trunk/portlet/build.xml
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java
modules/portlet/trunk/test/build.xml
modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java
modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml
modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent
Log:
update portlet module to have deployment of portlet tests
Modified: modules/portlet/trunk/build/build-thirdparty.xml
===================================================================
--- modules/portlet/trunk/build/build-thirdparty.xml 2007-08-22 16:01:32 UTC (rev 8031)
+++ modules/portlet/trunk/build/build-thirdparty.xml 2007-08-22 16:07:20 UTC (rev 8032)
@@ -52,6 +52,8 @@
<componentref name="jboss-portal/modules/test"
version="1.0.0-SNAPSHOT"/>
<componentref name="sun-servlet" version="2.4"/>
+ <componentref name="jboss/remoting" version="2.2.1.GA"/>
+
<!-- Based on
http://anonsvn.jboss.org/repos/jbossas/tags/EMBEDDED_JBOSS_BETA_2/build/b...
-->
<componentref name="jboss/microcontainer"
version="2.0.0.Beta3"/>
<componentref name="jboss/aop" version="2.0.0.alpha4"/>
Added: modules/portlet/trunk/build/ide/intellij/idea60/modules/test/test.iml
===================================================================
--- modules/portlet/trunk/build/ide/intellij/idea60/modules/test/test.iml
(rev 0)
+++ modules/portlet/trunk/build/ide/intellij/idea60/modules/test/test.iml 2007-08-22
16:07:20 UTC (rev 8032)
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true"
type="JAVA_MODULE">
+ <component name="ModuleRootManager" />
+ <component name="NewModuleRootManager"
inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$/../../../../../../test">
+ <sourceFolder
url="file://$MODULE_DIR$/../../../../../../test/src/main"
isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="portlet" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root
url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar!/"
/>
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root
url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-container.jar!/"
/>
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root
url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-dependency.jar!/"
/>
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root
url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar!/"
/>
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root
url="jar://$MODULE_DIR$/../../../../../../thirdparty/apache-log4j/lib/log4j.jar!/"
/>
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root
url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar!/"
/>
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntryProperties />
+ </component>
+ <component name="VcsManagerConfiguration">
+ <option name="ACTIVE_VCS_NAME" value="svn" />
+ <option name="USE_PROJECT_VCS" value="false" />
+ </component>
+</module>
+
Modified: modules/portlet/trunk/jboss-portal-portlet.ipr
===================================================================
--- modules/portlet/trunk/jboss-portal-portlet.ipr 2007-08-22 16:01:32 UTC (rev 8031)
+++ modules/portlet/trunk/jboss-portal-portlet.ipr 2007-08-22 16:07:20 UTC (rev 8032)
@@ -73,15 +73,15 @@
<used_levels>
<error>
<option name="myName" value="ERROR" />
- <option name="myVal" value="200" />
+ <option name="myVal" value="400" />
</error>
<warning>
<option name="myName" value="WARNING" />
- <option name="myVal" value="100" />
+ <option name="myVal" value="300" />
</warning>
<information>
<option name="myName" value="INFO" />
- <option name="myVal" value="100" />
+ <option name="myVal" value="200" />
</information>
<server>
<option name="myName" value="SERVER PROBLEM" />
Modified: modules/portlet/trunk/jboss-portal-portlet.iws
===================================================================
--- modules/portlet/trunk/jboss-portal-portlet.iws 2007-08-22 16:01:32 UTC (rev 8031)
+++ modules/portlet/trunk/jboss-portal-portlet.iws 2007-08-22 16:07:20 UTC (rev 8032)
@@ -17,7 +17,14 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java"
afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java"
/>
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java"
afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java"
/>
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java"
afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java"
/>
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java"
afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java"
/>
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java"
afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java"
/>
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/portlet/build.xml"
afterPath="$PROJECT_DIR$/portlet/build.xml" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/test/build.xml"
afterPath="$PROJECT_DIR$/test/build.xml" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml"
afterPath="$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml"
/>
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent"
afterPath="$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -89,7 +96,7 @@
</component>
<component name="DebuggerManager">
<line_breakpoints>
- <breakpoint
url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletApplicationImpl.java"
line="130"
class="org.jboss.portal.portlet.impl.jsr168.PortletApplicationImpl"
package="org.jboss.portal.portlet.impl.jsr168">
+ <breakpoint
url="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalServlet.java"
line="60" class="org.jboss.portal.portlet.test.PortalServlet"
package="org.jboss.portal.portlet.test">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -148,84 +155,33 @@
<component name="FavoritesProjectViewPane" />
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="PortletApplicationDeployment.java"
pinned="false" current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java">
+ <file leaf-file-name="TestDriverRegistryAccess.java"
pinned="false" current="false" current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java">
<provider selected="true"
editor-type-id="text-editor">
- <state line="88" column="0"
selection-start="4226" selection-end="4226"
vertical-scroll-proportion="0.014796548">
- <folding>
- <element signature="imports" expanded="true"
/>
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="PortalKernelBootstrap.java"
pinned="false" current="true" current-in-tab="true">
- <entry
file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java">
- <provider selected="true"
editor-type-id="text-editor">
- <state line="67" column="0"
selection-start="2950" selection-end="2950"
vertical-scroll-proportion="0.6004932">
- <folding>
- <element signature="imports" expanded="true"
/>
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="PortletApplicationImpl.java"
pinned="false" current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletApplicationImpl.java">
- <provider selected="true"
editor-type-id="text-editor">
- <state line="130" column="0"
selection-start="4473" selection-end="4473"
vertical-scroll-proportion="0.24660912">
+ <state line="35" column="7"
selection-start="2114" selection-end="2114"
vertical-scroll-proportion="0.19235511">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="PortalServlet.java" pinned="false"
current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalServlet.java">
+ <file leaf-file-name="PortletTestSuite.java" pinned="false"
current="false" current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java">
<provider selected="true"
editor-type-id="text-editor">
- <state line="31" column="13"
selection-start="1991" selection-end="1991"
vertical-scroll-proportion="0.13316892">
+ <state line="101" column="31"
selection-start="4316" selection-end="4316"
vertical-scroll-proportion="0.5437731">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="PortletApplicationDeployer.java"
pinned="false" current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployer.java">
+ <file leaf-file-name="SessionTestCase.java" pinned="false"
current="true" current-in-tab="true">
+ <entry
file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java">
<provider selected="true"
editor-type-id="text-editor">
- <state line="52" column="13"
selection-start="2913" selection-end="2913"
vertical-scroll-proportion="-0.7788945">
- <folding>
- <element signature="imports" expanded="true"
/>
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="build.xml" pinned="false"
current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/test/build.xml">
- <provider selected="true"
editor-type-id="text-editor">
- <state line="168" column="0"
selection-start="8708" selection-end="8708"
vertical-scroll-proportion="0.28853267">
+ <state line="36" column="12"
selection-start="2174" selection-end="2174"
vertical-scroll-proportion="0.20715167">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="log4j.properties" pinned="false"
current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/classes/log4j.properties">
- <provider selected="true"
editor-type-id="text-editor">
- <state line="9" column="38"
selection-start="523" selection-end="523"
vertical-scroll-proportion="0.13316892">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="PortletContainerImpl.java"
pinned="false" current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java">
- <provider selected="true"
editor-type-id="text-editor">
- <state line="159" column="0"
selection-start="6224" selection-end="6224"
vertical-scroll-proportion="0.4535176">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FindManager">
@@ -473,6 +429,40 @@
<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_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/classes"
/>
+ <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/main" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -552,6 +542,10 @@
<option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test/jsr168" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -571,6 +565,154 @@
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test/jsr168" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test/jsr168/api" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jboss-portal-portlet.ipr"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="portlet" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test/jsr168" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test/jsr168/api" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test/jsr168/api/actionrequest-war"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test/jsr168/api/actionrequest-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="portlet" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test/jsr168" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test/jsr168/api" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test/jsr168/api/actionrequest-war"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/classes"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jboss-portal-portlet.ipr"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="portlet" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jboss-portal-portlet.ipr"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="portlet" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/main" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -639,6 +781,40 @@
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/management"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jboss-portal-portlet.ipr"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="portlet" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/main" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/deployment"
/>
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -709,15 +885,31 @@
<component name="ReadonlyStatusHandler">
<option name="SHOW_DIALOG" value="true" />
</component>
- <component name="RecentsManager" />
+ <component name="RecentsManager">
+ <key name="CopyClassDialog.RECENTS_KEY">
+ <recent name="org.jboss.portal.portlet.registry" />
+ </key>
+ </component>
<component name="RestoreUpdateTree" />
<component name="RunManager" selected="Remote.Unnamed">
- <configuration default="true" type="Remote"
factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
+ <configuration default="true" type="JUnit"
factoryName="JUnit" enabled="false" merge="false">
+ <module name="" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false"
/>
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$"
/>
+ <option name="ADDITIONAL_CLASS_PATH" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="wholeProject" />
+ </option>
+ <method>
+ <option name="Make" value="true" />
+ </method>
</configuration>
<configuration default="true" type="Application"
factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" />
@@ -729,6 +921,13 @@
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<module name="" />
</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="Applet"
factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
@@ -741,25 +940,6 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false"
/>
<option name="ALTERNATIVE_JRE_PATH" />
</configuration>
- <configuration default="true" type="JUnit"
factoryName="JUnit" enabled="false" merge="false">
- <module name="" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false"
/>
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
- <option name="VM_PARAMETERS" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$"
/>
- <option name="ADDITIONAL_CLASS_PATH" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="wholeProject" />
- </option>
- <method>
- <option name="Make" value="true" />
- </method>
- </configuration>
<configuration default="false" name="Unnamed"
type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
@@ -840,6 +1020,7 @@
<option name="UPDATE_RECURSIVELY" value="true" />
<option name="MERGE_DRY_RUN" value="false" />
<configuration
useDefault="false">/Users/julien/.subversion</configuration>
+ <upgradeMode>none</upgradeMode>
</component>
<component name="TodoView" selected-index="0">
<todo-panel id="selected-file">
@@ -866,7 +1047,7 @@
<window_info id="Project" active="false"
anchor="left" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="true" weight="0.329859"
order="0" />
<window_info id="Find" active="false"
anchor="bottom" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="false" weight="0.329849"
order="1" />
<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.33"
order="8" />
+ <window_info id="Messages" active="false"
anchor="bottom" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="false" weight="0.329849"
order="8" />
<window_info id="Inspection" active="false"
anchor="bottom" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="false" weight="0.4"
order="6" />
<window_info id="Module Dependencies" active="false"
anchor="right" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="false" weight="0.33"
order="3" />
<window_info id="Dependency Viewer" active="false"
anchor="bottom" auto_hide="false" internal_type="DOCKED"
type="DOCKED" visible="false" weight="0.33"
order="8" />
@@ -900,7 +1081,7 @@
<option name="PERFORM_COMMIT_IN_BACKGROUND" value="false"
/>
<option name="PUT_FOCUS_INTO_COMMENT" value="false" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
- <option name="LAST_COMMIT_MESSAGE" />
+ <option name="LAST_COMMIT_MESSAGE" value="- somehow the portal
servlet can almost render portlets" />
<option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
<option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8"
/>
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT"
value="false" />
@@ -913,6 +1094,13 @@
<option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6"
/>
+ <MESSAGE value="- wire more portlet container beans - inject kernel
beans into the servlet context attributes - added tomcat logging based on
jul" />
+ <MESSAGE value="fixed wrong registration logic" />
+ <MESSAGE value="added a registration flag to know when we should unregister
from the registry" />
+ <MESSAGE value="leverage MC install/uninstall to update the
PortletApplicationRegistry upon life cycle changes" />
+ <MESSAGE value="added few comments" />
+ <MESSAGE value="- forgot to wire the PortletContainer to the
PortletApplication" />
+ <MESSAGE value="- somehow the portal servlet can almost render portlets"
/>
</component>
<component name="VssConfiguration">
<option name="CLIENT_PATH" value="" />
@@ -966,117 +1154,104 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry
file="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar!/org/jboss/kernel/spi/registry/KernelRegistryEntry.class">
+ <entry
file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistry.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="106"
selection-start="260" selection-end="260"
vertical-scroll-proportion="0.05918619">
+ <state line="31" column="17"
selection-start="2014" selection-end="2014"
vertical-scroll-proportion="0.14796548">
<folding />
</state>
</provider>
</entry>
- <entry
file="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar!/org/jboss/dependency/spi/ControllerContext.class">
+ <entry
file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/container/PortletApplication.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="17"
selection-start="166" selection-end="166"
vertical-scroll-proportion="0.06030151">
+ <state line="42" column="0"
selection-start="1995" selection-end="2240"
vertical-scroll-proportion="0.3107275">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationContext.java">
+ <entry
file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/TestRenderContext.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="17"
selection-start="2204" selection-end="2204"
vertical-scroll-proportion="0.19235511">
+ <state line="39" column="56"
selection-start="2383" selection-end="2383"
vertical-scroll-proportion="0.1356784">
<folding />
</state>
</provider>
</entry>
- <entry
file="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar!/org/jboss/dependency/plugins/AbstractController.class">
+ <entry
file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/TestPortletInvocationContext.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="13"
selection-start="166" selection-end="166"
vertical-scroll-proportion="0.06030151">
+ <state line="66" column="75"
selection-start="3157" selection-end="3157"
vertical-scroll-proportion="0.50308263">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/web.xml">
+ <entry
file="file://$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0"
selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="829" column="63"
selection-start="31326" selection-end="31326"
vertical-scroll-proportion="0.76884425">
<folding />
</state>
</provider>
</entry>
- <entry
file="jar:///System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Classes/classes.jar!/com/sun/tools/javadoc/Start.class">
+ <entry
file="file://$PROJECT_DIR$/tools/etc/buildfragments/modules.ent">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="6" selection-start="152"
selection-end="152" vertical-scroll-proportion="0.10786517">
+ <state line="13" column="83"
selection-start="688" selection-end="720"
vertical-scroll-proportion="0.19235511">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java">
+ <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="159" column="0"
selection-start="6224" selection-end="6224"
vertical-scroll-proportion="0.4535176">
+ <state line="21" column="0"
selection-start="902" selection-end="902"
vertical-scroll-proportion="0.30150753">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/classes/log4j.properties">
+ <entry
file="file://$PROJECT_DIR$/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/classes/logging.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="38"
selection-start="523" selection-end="523"
vertical-scroll-proportion="0.13316892">
+ <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$/test/build.xml">
+ <entry
file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="168" column="0"
selection-start="8708" selection-end="8708"
vertical-scroll-proportion="0.28853267">
+ <state line="90" column="51"
selection-start="3981" selection-end="3981"
vertical-scroll-proportion="0.6118091">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml">
+ <entry file="file://$PROJECT_DIR$/portlet/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="21" column="0"
selection-start="768" selection-end="768"
vertical-scroll-proportion="0.3107275">
+ <state line="227" column="56"
selection-start="11875" selection-end="11875"
vertical-scroll-proportion="0.77681875">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletApplicationImpl.java">
+ <entry file="file://$PROJECT_DIR$/test/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="130" column="0"
selection-start="4473" selection-end="4473"
vertical-scroll-proportion="0.24660912">
+ <state line="162" column="93"
selection-start="8435" selection-end="8435"
vertical-scroll-proportion="0.30456227">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java">
+ <entry
file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="88" column="0"
selection-start="4226" selection-end="4226"
vertical-scroll-proportion="0.014796548">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="35" column="7"
selection-start="2114" selection-end="2114"
vertical-scroll-proportion="0.19235511">
+ <folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployer.java">
+ <entry
file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="52" column="13"
selection-start="2913" selection-end="2913"
vertical-scroll-proportion="-0.7788945">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="101" column="31"
selection-start="4316" selection-end="4316"
vertical-scroll-proportion="0.5437731">
+ <folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalServlet.java">
+ <entry
file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="31" column="13"
selection-start="1991" selection-end="1991"
vertical-scroll-proportion="0.13316892">
+ <state line="36" column="12"
selection-start="2174" selection-end="2174"
vertical-scroll-proportion="0.20715167">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="67" column="0"
selection-start="2950" selection-end="2950"
vertical-scroll-proportion="0.6004932">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
</component>
</project>
Modified: modules/portlet/trunk/portlet/build.xml
===================================================================
--- modules/portlet/trunk/portlet/build.xml 2007-08-22 16:01:32 UTC (rev 8031)
+++ modules/portlet/trunk/portlet/build.xml 2007-08-22 16:07:20 UTC (rev 8032)
@@ -189,6 +189,9 @@
<fileset dir="${build.classes}"
includes="org/jboss/portal/test/portlet/framework/**"/>
</copy>
<mkdir
dir="${build.resources}/test/jsr168/ext/@{test}-war/WEB-INF/lib"/>
+ <copy
todir="${build.resources}/test/jsr168/ext/@{test}-war/WEB-INF/lib">
+ <fileset dir="${build.lib}"
includes="portal-portlet-test-framework-lib.jar"/>
+ </copy>
<jar jarfile="${build.lib}/test-jsr168-ext-(a){test}.war">
<fileset
dir="${build.resources}/test/jsr168/ext/@{test}-war"/>
</jar>
@@ -204,6 +207,9 @@
<fileset dir="${build.classes}"
includes="org/jboss/portal/test/portlet/framework/**"/>
</copy>
<mkdir
dir="${build.resources}/test/jsr168/tck/@{test}-war/WEB-INF/lib"/>
+ <copy
todir="${build.resources}/test/jsr168/tck/@{test}-war/WEB-INF/lib">
+ <fileset dir="${build.lib}"
includes="portal-portlet-test-framework-lib.jar"/>
+ </copy>
<jar jarfile="${build.lib}/test-jsr168-(a){test}.war">
<fileset
dir="${build.resources}/test/jsr168/tck/@{test}-war"/>
</jar>
@@ -219,6 +225,9 @@
<fileset dir="${build.classes}"
includes="org/jboss/portal/test/portlet/framework/**"/>
</copy>
<mkdir
dir="${build.resources}/test/jsr168/api/@{test}-war/WEB-INF/lib"/>
+ <copy
todir="${build.resources}/test/jsr168/api/@{test}-war/WEB-INF/lib">
+ <fileset dir="${build.lib}"
includes="portal-portlet-test-framework-lib.jar"/>
+ </copy>
<jar jarfile="${build.lib}/test-jsr168-api-(a){test}.war">
<fileset
dir="${build.resources}/test/jsr168/api/@{test}-war"/>
</jar>
Modified:
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java
===================================================================
---
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java 2007-08-22
16:01:32 UTC (rev 8031)
+++
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java 2007-08-22
16:07:20 UTC (rev 8032)
@@ -93,13 +93,13 @@
//
sce.getServletContext().setAttribute("SequenceRegistry", driver);
- TestDriverRegistryAccess.getInstance().getTestDriverRegistry().addDriver(driver);
+ TestDriverRegistryAccess.getTestDriverRegistry().addDriver(driver);
}
public void contextDestroyed(ServletContextEvent sce)
{
sce.getServletContext().removeAttribute("SequenceRegistry");
-
TestDriverRegistryAccess.getInstance().getTestDriverRegistry().removeDriver(driver);
+ TestDriverRegistryAccess.getTestDriverRegistry().removeDriver(driver);
}
/**
Modified:
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java
===================================================================
---
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java 2007-08-22
16:01:32 UTC (rev 8031)
+++
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java 2007-08-22
16:07:20 UTC (rev 8032)
@@ -23,6 +23,7 @@
package org.jboss.portal.test.framework.portlet;
import org.jboss.portal.test.framework.driver.TestDriverContainer;
+import org.jboss.portal.test.framework.driver.remote.RemoteTestDriverServer;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -32,41 +33,10 @@
{
/** . */
- private static TestDriverContainer testDriverContainer;
+ private static TestDriverContainer testDriverContainer = new
RemoteTestDriverServer();
- /** . */
- private static TestDriverRegistryAccess instance;
-
- public TestDriverContainer getTestDriverRegistry()
+ public static TestDriverContainer getTestDriverRegistry()
{
return testDriverContainer;
}
-
- public void setTestDriverRegistry(TestDriverContainer testDriverContainer)
- {
- this.testDriverContainer = testDriverContainer;
- }
-
- public void start() throws Exception
- {
- if (instance != null)
- {
- throw new IllegalStateException("A sequence registry already exist");
- }
- instance = this;
- }
-
- public void stop() throws Exception
- {
- instance = null;
- }
-
- public static TestDriverRegistryAccess getInstance() throws IllegalStateException
- {
- if (instance == null)
- {
- throw new IllegalStateException("No existing instance");
- }
- return instance;
- }
}
Modified:
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java
===================================================================
---
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java 2007-08-22
16:01:32 UTC (rev 8031)
+++
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java 2007-08-22
16:07:20 UTC (rev 8032)
@@ -33,6 +33,9 @@
{
public SessionTestCase()
{
- super("test-ha-session.war", new
NodeId[]{NodeId.PORTS_01,NodeId.PORTS_02});
+ super(new NodeId[]{NodeId.PORTS_01,NodeId.PORTS_02});
+
+ //
+ init("test-ha-session.war");
}
}
Modified: modules/portlet/trunk/test/build.xml
===================================================================
--- modules/portlet/trunk/test/build.xml 2007-08-22 16:01:32 UTC (rev 8031)
+++ modules/portlet/trunk/test/build.xml 2007-08-22 16:07:20 UTC (rev 8032)
@@ -160,11 +160,14 @@
<!-- Portlet test lib jar -->
<copy todir="${build.resources}/portlet-test-war/WEB-INF/lib">
<fileset dir="${build.lib}"
includes="portlet-test-lib.jar"/>
- <fileset dir="${jboss.portal/modules/common.lib}"
includes="*.jar"/>
+ <fileset dir="${jboss.portal/modules/common.lib}"
includes="portal-common-portal-lib.jar"/>
+ <fileset dir="${jboss.portal/modules/test.lib}"
includes="portal-test-generic-lib.jar"/>
<fileset dir="${jboss.portal-portlet.lib}"
includes="*.jar"/>
-
+
<fileset dir="${sun.jaf.lib}" includes="*.jar"/>
+ <fileset dir="${jboss.remoting.lib}"
includes="jboss-remoting.jar"/>
+
<fileset dir="${jboss.microcontainer.lib}"
includes="*.jar"/>
<fileset dir="${jboss/common.core.lib}"
includes="*.jar"/>
<fileset dir="${jboss/common.logging.log4j.lib}"
includes="*.jar"/>
@@ -173,7 +176,7 @@
<fileset dir="${jboss.jbossxb.lib}"
includes="*.jar"/>
<fileset dir="${jboss/jboss.vfs.lib}"
includes="*.jar"/>
<fileset dir="${javassist.javassist.lib}"
includes="*.jar"/>
- <fileset dir="${apache.log4j.lib}" includes="*.jar"/>
+ <!--<fileset dir="${apache.log4j.lib}"
includes="*.jar"/>-->
<fileset dir="${apache.xerces.lib}"
includes="*.jar"/>
<fileset dir="${wutka.dtdparser.lib}"
includes="*.jar"/>
<fileset dir="${oswego.concurrent.lib}"
includes="*.jar"/>
@@ -225,4 +228,39 @@
<!--<antcall target="test-framework"/>-->
</target>
+ <target name="bilto" depends="init">
+ <execute-tests>
+ <x-test>
+ <zest todir="${test.reports}"
+
name="org.jboss.portal.test.framework.runner.GenericHTTPTestRunner"
+
outfile="TEST-org.jboss.portal.test.portlet.info.InfoTestCase"
+ id="org.jboss.portal.test.portlet.info.InfoTestCase">
+ <parameter name="archive"
value="test-jsr168-api-actionrequest.war"/>
+ </zest>
+ </x-test>
+ <x-sysproperty>
+ <sysproperty key="test.root"
value="${jboss.portal-portlet.root}/lib"/>
+ <sysproperty key="test.uri"
value="/test/redirect/"/>
+ </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"/>
+ <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>
+
</project>
Modified:
modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java
===================================================================
---
modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java 2007-08-22
16:01:32 UTC (rev 8031)
+++
modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java 2007-08-22
16:07:20 UTC (rev 8032)
@@ -78,6 +78,23 @@
{
servletContext = event.getServletContext();
+ try
+ {
+ Class c =
Thread.currentThread().getContextClassLoader().loadClass("org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter");
+ System.out.println("Loaded " + c.getName());
+ System.out.println("Loaded " + c.getName());
+ System.out.println("Loaded " + c.getName());
+ System.out.println("Loaded " + c.getName());
+ System.out.println("Loaded " + c.getName());
+ System.out.println("Loaded " + c.getName());
+ System.out.println("Loaded " + c.getName());
+ System.out.println("Loaded " + c.getName());
+ }
+ catch (ClassNotFoundException e)
+ {
+ e.printStackTrace(); //To change body of catch statement use File | Settings |
File Templates.
+ }
+
// For now we do it here
// System.setProperty("org.jboss.logging.Logger.pluginClass",
"org.jboss.logging.log4j.Log4jLoggerPlugin");
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-08-22
16:01:32 UTC (rev 8031)
+++
modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2007-08-22
16:07:20 UTC (rev 8032)
@@ -4,6 +4,27 @@
xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_2_0.xsd"
xmlns="urn:jboss:bean-deployer:2.0">
+
+
+ <bean name="TestDriverServer"
class="org.jboss.portal.test.framework.driver.remote.RemoteTestDriverServer">
+<!--
+ <depends
+ optional-attribute-name="Agent"
+ proxy-type="attribute">portal.test:service=Agent</depends>
+-->
+ </bean>
+ <bean name="TestDriverServerExporter"
class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter">
+ <constructor>
+ <parameter>socket://localhost:5400</parameter>
+ <parameter><inject
bean="TestDriverServer"/></parameter>
+
<parameter>org.jboss.portal.test.framework.driver.http.HttpTestDriver</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="PortletTestDriver"
class="org.jboss.portal.test.framework.portlet.TestDriverRegistryAccess">
+ <property name="testDriverRegistry"><inject
bean="TestDriverServer"/></property>
+ </bean>
+
<!-- An application registry mainly for listeners -->
<bean name="PortletApplicationRegistry"
class="org.jboss.portal.portlet.impl.container.PortletApplicationRegistryImpl">
</bean>
Modified: modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent
===================================================================
--- modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent 2007-08-22 16:01:32 UTC
(rev 8031)
+++ modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent 2007-08-22 16:07:20 UTC
(rev 8032)
@@ -685,7 +685,7 @@
jvm="${junit.jvm}">
<formatter type="plain" usefile="false"/>
<formatter
-
classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+
classname="org.jboss.portal.common.junit.ant.ConfigurableXMLJUnitResultFormatter"
usefile="${junit.formatter.usefile}"
extension="${jboss-junit-configuration}.xml"/>
<sysproperty key="build.resources"
value="${build.resources}"/>
@@ -696,7 +696,7 @@
<jvmarg value="${junit.jvm.options}"/>
<x-test/>
<classpath>
- <path refid="jboss.test.classpath"/>
+ <path refid="jboss.portal/modules/test.classpath"/>
<pathelement path="${driver.path}"/>
<x-classpath/>
</classpath>