JBoss Portal SVN: r10359 - in modules/portlet/trunk/portal/src/main: resources/simple-portal-war/css and 4 other directories.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-03-20 22:36:35 -0400 (Thu, 20 Mar 2008)
New Revision: 10359
Added:
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/css/debugger.css
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/images/debug/
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/images/debug/alert-small.gif
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/images/debug/arrow-elbow.gif
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/images/debug/arrow.gif
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/js/debugger.js
Modified:
modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/demo4.jsp
Log:
event debugger portlet ui
Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java
===================================================================
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java 2008-03-20 22:07:52 UTC (rev 10358)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java 2008-03-21 02:36:35 UTC (rev 10359)
@@ -31,6 +31,7 @@
import javax.portlet.PortletException;
import java.io.IOException;
import java.io.PrintWriter;
+import java.util.Random;
/**
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
@@ -47,32 +48,59 @@
if (eventCC != null)
{
PrintWriter writer = resp.getWriter();
- writer.print("<ul>\n");
+ writer.print("" +
+ "<a href=\"javascript:showAllDetails()\" >Show All Details</a><br/>" +
+ "<div class=\"debug-container\">");
+ int id;
for (EventRoute route : eventCC.getRoots())
{
- writer.println("<li>\n");
- printRoute(route, writer);
- writer.println("</li>\n");
+ id = rand(1,1000);
+ writer.println("<div class=\"event\" id=\"event-" + id + "\">\n");
+ printRoute(route, writer, id, "");
+ writer.println("</div>\n");
}
- writer.println("</ul>\n");
+ writer.println("</div>\n");
}
}
- private void printRoute(EventRoute route, PrintWriter writer)
+ private void printRoute(EventRoute route, PrintWriter writer, int id, String cid)
{
- writer.print("<div>Event name: " + route.getName().getLocalPart() + "</div>\n");
- writer.print("<div>Event payload: " + route.getPayload() + "</div>\n");
- writer.print("<div>Source: " + route.getSource() + "</div>\n");
- writer.print("<div>Destination: " + route.getDestination() + "</div>\n");
- writer.print("<div>Acknowledgement: " + route.getAcknowledgement() + "</div>\n");
- writer.print("<ul>\n");
+ writer.print("<div onmouseover=\"showDetails(this,'details-" + id + cid + "')\" onmouseout=\"hideDetails(this,'details-" + id + cid + "')\">" +
+ "<div class=\"event-header\">\n" +
+ " <h4>" + route.getName().getLocalPart() + "</h4>\n" +
+ " </div>\n");
+
+ writer.print("<div class=\"event-body\">" +
+ "<p><label>Source: </label>" + route.getSource() + "<img src=\"/simple-portal/images/debug/arrow.gif\" alt=\"\"/>");
+ writer.print("<label>Destination: </label>" + route.getDestination() + "</p>\n" +
+ " <div class=\"details\" id=\"details-" + id + cid + "\">\n" +
+ " <div class=\"details-frame\">\n" +
+ " " + route.getAcknowledgement() + "\n" +
+ " <div class=\"dotted-white\"></div>\n" +
+ " <label>Payload: " + route.getPayload() + "</label>\n" +
+ " </div>\n" +
+ " </div></div>" +
+ "");
+ writer.print("</div>");
+
for (EventRoute child : route.getChildren())
{
- writer.println("<li>\n");
- printRoute(child, writer);
- writer.println("</li>\n");
+ id = rand(1,1000);
+ writer.println("<div class=\"children\">");
+ printRoute(child, writer, id, "a");
+ writer.println("</div>");
}
- writer.println("</ul>\n");
+
}
+
+ public static int rand(int lo, int hi)
+ {
+ Random rn2 = new Random();
+ int n = hi - lo + 1;
+ int i = rn2.nextInt() % n;
+ if (i < 0)
+ i = -i;
+ return lo + i;
+ }
}
Added: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/css/debugger.css
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/css/debugger.css (rev 0)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/css/debugger.css 2008-03-21 02:36:35 UTC (rev 10359)
@@ -0,0 +1,70 @@
+div.debug-container {
+ padding: 10px 0 0 0;
+}
+
+div.debug-container div.event {
+
+}
+
+div.debug-container div.event div.event-header {
+ padding: 0 0 0 20px;
+
+}
+
+div.debug-container div.event div.event-header h4 {
+ font-size: 1em;
+ padding: 0;
+ margin: 0;
+}
+
+div.debug-container div.event div.event-body {
+ padding: 0 0 0 20px;
+ font-size: .95em;
+}
+
+div.debug-container div.event div.event-body p {
+ border-bottom: 1px solid #aaa;
+}
+
+div.debug-container div.event div.event-body label {
+ font-weight: bold;
+ color: #222;
+}
+
+div.debug-container div.event div.event-body div.details label {
+ color: #555;
+}
+
+div.debug-container div.event div.event-body div.details {
+ background-color: #eee;
+ padding: 2px;
+ color:#000;
+ font-size: .9em;
+}
+
+div.debug-container div.event div.event-body div.details div.details-frame {
+ border: 1px solid #fff;
+ padding: 2px
+}
+
+div.dotted-white {
+ border-bottom: 1px dotted #fff;
+ height: 1px;
+ line-height: 1px;
+}
+
+div.debug-container div.event div.event-body img {
+
+}
+
+div.debug-container div.event div.children {
+ padding: 0 0 0 20px;
+}
+
+div.debug-container div.event div.children div.event-header {
+ background: url(/simple-portal/images/debug/arrow-elbow.gif) no-repeat top left
+}
+
+div.debug-container div.event div.error {
+ background: url(/simple-portal/images/debug/alert-small.gif) no-repeat 7px 3px
+}
\ No newline at end of file
Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/demo4.jsp
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/demo4.jsp 2008-03-20 22:07:52 UTC (rev 10358)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/demo4.jsp 2008-03-21 02:36:35 UTC (rev 10359)
@@ -5,7 +5,8 @@
<%@ page isELIgnored="false" %>
<%@ include file="/layouts/header.jsp" %>
-
+<link rel="stylesheet" href="${pageContext.request.contextPath}/css/debugger.css" type="text/css"/>
+<script type="text/javascript" src="${pageContext.request.contextPath}/js/debugger.js"></script>
<portal:page>
<xportal:2columns>
Added: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/images/debug/alert-small.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/images/debug/alert-small.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/images/debug/arrow-elbow.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/images/debug/arrow-elbow.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/images/debug/arrow.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/images/debug/arrow.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/js/debugger.js
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/js/debugger.js (rev 0)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/js/debugger.js 2008-03-21 02:36:35 UTC (rev 10359)
@@ -0,0 +1,43 @@
+function showDetails(element,target) {
+ try{
+ element.style.backgroundColor = '#ffffdd';
+ $(target).style.display = '';
+ }catch(e){
+
+ }
+}
+
+function hideDetails(element,target) {
+ try{
+ element.style.backgroundColor = '#fff';
+ $(target).style.display = 'none';
+ //Effect.BlindUp(target);
+ //return true;
+ }catch(e){
+
+ }
+}
+
+function showAllDetails() {
+ var targets = document.getElementsByClassName('details');
+ for (var i=0; i < targets.length; i++){
+ try{
+ targets[i].style.display = '';
+ targets[i].onmouseover = '';
+ }catch(e){
+// alert(e);
+ }
+ }
+}
+
+window.onload = function(){
+
+ var targets = document.getElementsByClassName('details');
+ for (var i=0; i < targets.length; i++){
+ try{
+ targets[i].style.display = 'none';
+ }catch(e){
+// alert(e);
+ }
+ }
+};
\ No newline at end of file
16 years, 2 months
- 1
- 0
JBoss Portal SVN: r10358 - modules/common/trunk.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-03-20 18:07:52 -0400 (Thu, 20 Mar 2008)
New Revision: 10358
Modified:
modules/common/trunk/releaseLibs.sh
Log:
Added reminder to update component-info.xml.
Modified: modules/common/trunk/releaseLibs.sh
===================================================================
--- modules/common/trunk/releaseLibs.sh 2008-03-20 22:06:57 UTC (rev 10357)
+++ modules/common/trunk/releaseLibs.sh 2008-03-20 22:07:52 UTC (rev 10358)
@@ -12,7 +12,7 @@
if [[ $1 == "repos" ]]; then
loc=$repos
- echo "Releasing to repository"
+ echo "Releasing to repository. Don't forget to update component-info.xml with revision number."
elif [[ $1 == "usage" ]]; then
echo "Usage shown, nothing was done"
exit 0
16 years, 2 months
- 1
- 0
JBoss Portal SVN: r10357 - modules/portlet/trunk.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-03-20 18:06:57 -0400 (Thu, 20 Mar 2008)
New Revision: 10357
Modified:
modules/portlet/trunk/releaseLibs.sh
Log:
Added reminder to update component-info.xml.
Modified: modules/portlet/trunk/releaseLibs.sh
===================================================================
--- modules/portlet/trunk/releaseLibs.sh 2008-03-20 21:54:39 UTC (rev 10356)
+++ modules/portlet/trunk/releaseLibs.sh 2008-03-20 22:06:57 UTC (rev 10357)
@@ -12,7 +12,7 @@
if [[ $1 == "repos" ]]; then
loc=$repos
- echo "Releasing to repository"
+ echo "Releasing to repository. Don't forget to update component-info.xml with revision number."
elif [[ $1 == "usage" ]]; then
echo "Usage shown, nothing was done"
exit 0
16 years, 2 months
- 1
- 0
JBoss Portal SVN: r10356 - in branches/JBoss_Portal_Branch_2_7: portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/metadata and 4 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-03-20 17:54:39 -0400 (Thu, 20 Mar 2008)
New Revision: 10356
Modified:
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/metadata/JBossApplicationMetaData.java
branches/JBoss_Portal_Branch_2_7/wsrp/build.xml
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPPortletInvocationContext.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml
Log:
- Fixed a bug in WSRPPortletInvocationContext: hidden NPE due to auto-boxing...
- Added missing information on portlet invocation in RequestProcessor.
- Test re-wiring.
- More generification.
- All WSRP tests now run and pass pending update of portlet and common module in thirdparty.
Modified: branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java 2008-03-20 21:42:07 UTC (rev 10355)
+++ branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java 2008-03-20 21:54:39 UTC (rev 10356)
@@ -106,18 +106,18 @@
// Merge or provide defaults
JBossApplicationMetaData standardJBossAppMD = factory.getStandardJBossApplicationMetaData();
- log.debug("Found standard jboss app meta data");
-
if (standardJBossAppMD != null)
{
- JBossPortletMetaData defaultJBossPortletMD = (JBossPortletMetaData)standardJBossAppMD.getPortlets().get("DefaultPortlet");
- log.debug("Found default jboss portlet meta data");
+ log.debug("Found standard jboss app meta data");
+
+ JBossPortletMetaData defaultJBossPortletMD = standardJBossAppMD.getPortlets().get("DefaultPortlet");
if (defaultJBossPortletMD != null)
{
+ log.debug("Found default jboss portlet meta data");
for (PortletMetaData portletMD : portletAppMD.getPortlets().values())
{
String name = portletMD.getPortletName();
- JBossPortletMetaData jbossPortletMD = (JBossPortletMetaData)jbossAppMD.getPortlets().get(name);
+ JBossPortletMetaData jbossPortletMD = jbossAppMD.getPortlets().get(name);
if (jbossPortletMD != null)
{
log.debug("Merging default jboss portlet meta data for " + name);
@@ -131,7 +131,7 @@
else
{
log.debug("Using default jboss portlet meta data for " + name);
- jbossAppMD.getPortlets().put(name, defaultJBossPortletMD.clone());
+ jbossAppMD.getPortlets().put(name, (JBossPortletMetaData)defaultJBossPortletMD.clone());
}
}
}
Modified: branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/metadata/JBossApplicationMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/metadata/JBossApplicationMetaData.java 2008-03-20 21:42:07 UTC (rev 10355)
+++ branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/metadata/JBossApplicationMetaData.java 2008-03-20 21:54:39 UTC (rev 10356)
@@ -36,14 +36,14 @@
protected Boolean remotable;
/** . */
- protected Map portlets;
+ protected Map<String, JBossPortletMetaData> portlets;
public JBossApplicationMetaData()
{
- portlets = new LinkedHashMap();
+ portlets = new LinkedHashMap<String, JBossPortletMetaData>();
}
- public Map getPortlets()
+ public Map<String, JBossPortletMetaData> getPortlets()
{
return portlets;
}
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/build.xml 2008-03-20 21:42:07 UTC (rev 10355)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/build.xml 2008-03-20 21:54:39 UTC (rev 10356)
@@ -25,15 +25,29 @@
<!-- $Id$ -->
-<!--+======================================================================+--><!--| JBoss Portal (The OpenSource Portal) Build File |--><!--| |--><!--| Distributable under LGPL license. |--><!--| See terms of license at http://www.gnu.org. |--><!--| |--><!--| This file has been designed to work with the 'tools' module and |--><!--| Buildmagic extentions. |--><!--+======================================================================+-->
+<!--+======================================================================+-->
+<!--| JBoss Portal (The Open Source Portal) Build File |-->
+<!--| |-->
+<!--| Distributable under LGPL license. |-->
+<!--| See terms of license at http://www.gnu.org. |-->
+<!--| |-->
+<!--| This file has been designed to work with the 'tools' module and |-->
+<!--| Buildmagic extentions. |-->
+<!--+======================================================================+-->
<project default="main" name="WSRP for JBoss Portal" xmlns:server="http://jboss.org/ns/test/ant/server">
- <!--| Include the common build elements. |--><!--| |--><!--| This defines several different targets, properties and paths. |--><!--| It also sets up the basic extention tasks amoung other things. |--><!--+====================================================================+-->
+ <!--| Include the common build elements. |-->
+ <!--| |-->
+ <!--| This defines several different targets, properties and paths. |-->
+ <!--| It also sets up the basic extention tasks amoung other things. |-->
+ <!--+====================================================================+-->
&buildmagic; &modules; &defaults; &tools; &targets;
- <!-- ================================================================== --><!-- Initialization --><!-- ================================================================== -->
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
<!--
| Initialize the build system. Must depend on '_buildmagic:init'.
@@ -58,7 +72,12 @@
<!-- Add module specific elements here -->
</target>
- <!--+====================================================================+--><!--| Configuration |--><!--| |--><!--| This target is invoked by the Buildmagic initialization logic |--><!--| and should contain module specific configuration elements. |--><!--+====================================================================+-->
+ <!--+====================================================================+-->
+ <!--| Configuration |-->
+ <!--| |-->
+ <!--| This target is invoked by the Buildmagic initialization logic |-->
+ <!--| and should contain module specific configuration elements. |-->
+ <!--+====================================================================+-->
<target name="configure" unless="configure.disable">
@@ -137,7 +156,9 @@
<path refid="jboss.portal-faces.classpath"/>
</path>
- <!--+=======================================+--><!--| Override any default properties here. |--><!--+=======================================+-->
+ <!--+=======================================+-->
+ <!--| Override any default properties here. |-->
+ <!--+=======================================+-->
<!-- Classes generated from WSDL are in a non-standard location so need to override properties -->
<property name="build.gen" value="${module.source}"/>
@@ -163,7 +184,9 @@
<call target="configure-explode"/>
<call target="configure-jbossaop"/>
- <!--+=======================================+--><!--| Define module specific elements here. |--><!--+=======================================+-->
+ <!--+=======================================+-->
+ <!--| Define module specific elements here. |-->
+ <!--+=======================================+-->
<property name="javadoc.private" value="true"/>
<property name="javadoc.protected" value="false"/>
@@ -193,7 +216,13 @@
<taskdef name="explode" classname="org.jboss.portal.common.ant.Explode" classpathref="explode.task.classpath"/>
</target>
- <!--+====================================================================+--><!--| Compile |--><!--| |--><!--| This target should depend on other compile-* targets for each |--><!--| different type of compile that needs to be performed, short of |--><!--| documentation compiles. |--><!--+====================================================================+-->
+ <!--+====================================================================+-->
+ <!--| Compile |-->
+ <!--| |-->
+ <!--| This target should depend on other compile-* targets for each |-->
+ <!--| different type of compile that needs to be performed, short of |-->
+ <!--| documentation compiles. |-->
+ <!--+====================================================================+-->
<target name="compile" description="Compile all source files."
depends="_default:compile-classes,_default:compile-etc">
@@ -232,7 +261,13 @@
<property name="compile.disable" value="true"/>
</target>
- <!--+====================================================================+--><!--| Generate Output |--><!--| |--><!--| Generates the target output for this module. Target output is |--><!--| the output which is meant to be released or used by external |--><!--| modules. |--><!--+====================================================================+-->
+ <!--+====================================================================+-->
+ <!--| Generate Output |-->
+ <!--| |-->
+ <!--| Generates the target output for this module. Target output is |-->
+ <!--| the output which is meant to be released or used by external |-->
+ <!--| modules. |-->
+ <!--+====================================================================+-->
<target name="output" description="Generate WSRP Service archive." depends="compile">
<mkdir dir="${build.lib}"/>
@@ -278,7 +313,9 @@
<explode file="${build.lib}/portal-wsrp.sar" todir="${build.lib}" name="portal-wsrp-exploded.sar"/>
</target>
- <!-- ================================================================== --><!-- Cleaning --><!-- ================================================================== -->
+ <!-- ================================================================== -->
+ <!-- Cleaning -->
+ <!-- ================================================================== -->
<!-- Clean up all build output -->
<target name="clean" depends="_default:clean">
@@ -286,20 +323,28 @@
<!-- Add module specific elements here. -->
</target>
- <!--+====================================================================+--><!--| Documents |--><!--| |--><!--| Generate all documentation for this module. |--><!--+====================================================================+-->
+ <!--+====================================================================+-->
+ <!--| Documents |-->
+ <!--| |-->
+ <!--| Generate all documentation for this module. |-->
+ <!--+====================================================================+-->
<target name="docs" depends="_default:docs">
<!-- Add module specific elements here. -->
</target>
- <!-- ================================================================== --><!-- Misc. --><!-- ================================================================== -->
+ <!-- ================================================================== -->
+ <!-- Misc. -->
+ <!-- ================================================================== -->
<target name="main" depends="most"/>
<target name="all" depends="_default:all, explode"/>
<target name="most" depends="_default:most"/>
<target name="help" depends="_default:help"/>
- <!-- ================================================================== --><!-- Deployment --><!-- ================================================================== -->
+ <!-- ================================================================== -->
+ <!-- Deployment -->
+ <!-- ================================================================== -->
<!-- Deployment of test agent -->
<target name="agent-deploy" depends="init">
@@ -347,7 +392,9 @@
<undeploy file="${build.lib.test}/test-wsrp-consumer.sar" config="default"/>
</target>
- <!-- ================================================================== --><!-- Tests --><!-- ================================================================== -->
+ <!-- ================================================================== -->
+ <!-- Tests -->
+ <!-- ================================================================== -->
<target name="package-deployment-test" description="Generates the deployment test artifacts" depends="compile">
<jar jarfile="${build.lib.test}/test-deployment-lib.jar">
@@ -432,8 +479,7 @@
<fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-portal-lib.jar"/>
<fileset dir="${jboss.portal-api.root}/lib" includes="portal-api-lib.jar"/>
<fileset dir="${jboss.portal/modules/portlet.lib}"
- includes="portal-portlet-lib.jar,portal-portlet-federation-lib.jar,portal-portlet-jsr168api-lib.jar"/>
- <!-- , portal-portlet-test-lib.jar -->
+ includes="portal-portlet-lib.jar,portal-portlet-federation-lib.jar"/>
<fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-lib.jar"/>
<fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/>
<fileset dir="${jboss.portal-portlet-server.root}/lib" includes="portal-portlet-server-lib.jar"/>
@@ -489,7 +535,8 @@
<fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-portal-lib.jar"/>
<fileset dir="${jboss.portal-api.root}/lib" includes="portal-api-lib.jar"/>
<fileset dir="${jboss.portal/modules/portlet.lib}"
- includes="portal-portlet-lib.jar,portal-portlet-federation-lib.jar,portal-portlet-jsr168api-lib.jar"/>
+ includes="portal-portlet-lib.jar,portal-portlet-federation-lib.jar"/>
+ <fileset dir="${portlet.portlet.lib}" includes="portlet-api.jar"/>
<fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/>
<fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-lib.jar"/>
<fileset dir="${jboss.portal-portlet-server.root}/lib" includes="portal-portlet-server-lib.jar"/>
@@ -500,6 +547,7 @@
<fileset dir="${jboss.portal-security.root}/lib" includes="portal-security-lib.jar"/>
<fileset dir="${jboss.portal-server.lib}" includes="portal-server-test-framework-lib.jar"/>
<fileset dir="${jboss.portal-core.lib}" includes="portal-core-lib.jar"/>
+ <fileset dir="${apache.fileupload.lib}" includes="commons-fileupload.jar"/>
</copy>
<jar jarfile="${build.lib.test}/test-wsrp-producer.sar">
@@ -572,7 +620,9 @@
package-protocolv1-producer-test, package-producer-configuration-test" description="Packages all the test-related artifacts. Does NOT compile classes so this should be done before
calling this task."/>
- <!-- ================================================================== --><!-- Tests --><!-- ================================================================== -->
+ <!-- ================================================================== -->
+ <!-- Tests -->
+ <!-- ================================================================== -->
<target name="clean-test">
<!-- remove generated test xml files -->
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java 2008-03-20 21:42:07 UTC (rev 10355)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java 2008-03-20 21:54:39 UTC (rev 10356)
@@ -291,7 +291,7 @@
private void createMetaInfo(PortletDescription portletDescription)
{
- final Map metaInfos = new HashMap();
+ final Map<String, org.jboss.portal.common.i18n.LocalizedString> metaInfos = new HashMap<String, org.jboss.portal.common.i18n.LocalizedString>();
metaInfos.put(MetaInfo.DESCRIPTION, getPortalLocalizedStringOrNullFrom(portletDescription.getDescription()));
metaInfos.put(MetaInfo.DISPLAY_NAME, getPortalLocalizedStringOrNullFrom(portletDescription.getDisplayName()));
metaInfos.put(MetaInfo.SHORT_TITLE, getPortalLocalizedStringOrNullFrom(portletDescription.getShortTitle()));
@@ -345,24 +345,24 @@
mimeType = MediaType.create(markupType.getMimeType());
String[] modeNames = markupType.getModes();
- modes = new HashSet(modeNames.length);
- for (int i = 0; i < modeNames.length; i++)
+ modes = new HashSet<ModeInfo>(modeNames.length);
+ for (String modeName : modeNames)
{
- modes.add(new BasicModeInfo(WSRPUtils.getJSR168PortletModeFromWSRPName(modeNames[i])));
+ modes.add(new BasicModeInfo(WSRPUtils.getJSR168PortletModeFromWSRPName(modeName)));
}
String[] windStateNames = markupType.getWindowStates();
- windowStates = new HashSet(windStateNames.length);
- for (int i = 0; i < windStateNames.length; i++)
+ windowStates = new HashSet<WindowStateInfo>(windStateNames.length);
+ for (String windStateName : windStateNames)
{
- windowStates.add(new BasicWindowStateInfo(WSRPUtils.getJSR168WindowStateFromWSRPName(windStateNames[i])));
+ windowStates.add(new BasicWindowStateInfo(WSRPUtils.getJSR168WindowStateFromWSRPName(windStateName)));
}
String[] localeNames = markupType.getLocales();
if (localeNames != null)
{
int localeNumber = localeNames.length;
- locales = new HashSet(localeNumber);
+ locales = new HashSet<Locale>(localeNumber);
for (int i = 0; i < localeNumber; i++)
{
Locale locale = WSRPUtils.getLocale(localeNames[i]);
@@ -371,14 +371,14 @@
}
else
{
- locales = Collections.EMPTY_SET;
+ locales = Collections.emptySet();
}
}
MediaType mimeType;
- Set modes;
- Set windowStates;
- Set locales;
+ Set<ModeInfo> modes;
+ Set<WindowStateInfo> windowStates;
+ Set<Locale> locales;
}
class BasicWindowStateInfo implements WindowStateInfo
@@ -433,21 +433,21 @@
private class WSRPCapabilitiesInfo implements CapabilitiesInfo
{
- private Map mediaTypes;
- private Set modes;
- private Set windowStates;
- private Set locales;
+ private Map<MediaType, MediaTypeInfo> mediaTypes;
+ private Set<ModeInfo> modes;
+ private Set<WindowStateInfo> windowStates;
+ private Set<Locale> locales;
private WSRPCapabilitiesInfo()
{
}
- private void setMediaTypes(Map mediaTypes)
+ private void setMediaTypes(Map<MediaType, MediaTypeInfo> mediaTypes)
{
this.mediaTypes = mediaTypes;
}
- public WSRPCapabilitiesInfo(Map mediaTypes, Set modes, Set windowStates, Set locales)
+ public WSRPCapabilitiesInfo(Map<MediaType, MediaTypeInfo> mediaTypes, Set<ModeInfo> modes, Set windowStates, Set locales)
{
this.mediaTypes = mediaTypes;
this.modes = modes;
@@ -455,60 +455,60 @@
this.locales = locales;
}
- public Set getMediaTypes()
+ public Set<MediaType> getMediaTypes()
{
return mediaTypes.keySet();
}
- public Set getAllModes()
+ public Set<ModeInfo> getAllModes()
{
return modes;
}
- public Set getModes(MediaType mediaType)
+ public Set<ModeInfo> getModes(MediaType mediaType)
{
- MediaTypeInfo mimeTypeInfo = (MediaTypeInfo)mediaTypes.get(mediaType);
+ MediaTypeInfo mimeTypeInfo = mediaTypes.get(mediaType);
if (mimeTypeInfo == null)
{
- return Collections.EMPTY_SET;
+ return Collections.emptySet();
}
return Collections.unmodifiableSet(mimeTypeInfo.modes);
}
- public Set getAllWindowStates()
+ public Set<WindowStateInfo> getAllWindowStates()
{
return windowStates;
}
- public Set getWindowStates(MediaType mediaType)
+ public Set<WindowStateInfo> getWindowStates(MediaType mediaType)
{
- MediaTypeInfo mimeTypeInfo = (MediaTypeInfo)mediaTypes.get(mediaType);
+ MediaTypeInfo mimeTypeInfo = mediaTypes.get(mediaType);
if (mimeTypeInfo == null)
{
- return Collections.EMPTY_SET;
+ return Collections.emptySet();
}
return Collections.unmodifiableSet(mimeTypeInfo.windowStates);
}
- public Set getAllLocales()
+ public Set<Locale> getAllLocales()
{
return locales;
}
- public Set getLocales(MediaType mediaType)
+ public Set<Locale> getLocales(MediaType mediaType)
{
- MediaTypeInfo mimeTypeInfo = (MediaTypeInfo)mediaTypes.get(mediaType);
+ MediaTypeInfo mimeTypeInfo = mediaTypes.get(mediaType);
if (mimeTypeInfo == null)
{
- return Collections.EMPTY_SET;
+ return Collections.emptySet();
}
return Collections.unmodifiableSet(mimeTypeInfo.locales);
}
- private void addModes(Set modes)
+ private void addModes(Set<ModeInfo> modes)
{
if (modes != null)
{
@@ -517,7 +517,7 @@
{
if (this.modes == null)
{
- this.modes = new HashSet(size);
+ this.modes = new HashSet<ModeInfo>(size);
}
this.modes.addAll(modes);
@@ -525,7 +525,7 @@
}
}
- private void addWindowStates(Set windowStates)
+ private void addWindowStates(Set<WindowStateInfo> windowStates)
{
if (windowStates != null)
{
@@ -534,7 +534,7 @@
{
if (this.windowStates == null)
{
- this.windowStates = new HashSet(size);
+ this.windowStates = new HashSet<WindowStateInfo>(size);
}
this.windowStates.addAll(windowStates);
@@ -542,7 +542,7 @@
}
}
- private void addLocales(Set locales)
+ private void addLocales(Set<Locale> locales)
{
if (locales != null)
{
@@ -551,7 +551,7 @@
{
if (this.locales == null)
{
- this.locales = new HashSet(size);
+ this.locales = new HashSet<Locale>(size);
}
this.locales.addAll(locales);
@@ -577,21 +577,21 @@
static class WSRPPreferencesInfo implements PreferencesInfo
{
- private Map preferences;
+ private Map<String, PreferenceInfo> preferences;
- public WSRPPreferencesInfo(Map preferences)
+ public WSRPPreferencesInfo(Map<String, PreferenceInfo> preferences)
{
this.preferences = preferences;
}
- public Set getKeys()
+ public Set<String> getKeys()
{
return Collections.unmodifiableSet(preferences.keySet());
}
public PreferenceInfo getPreference(String key) throws IllegalArgumentException
{
- return (PreferenceInfo)preferences.get(key);
+ return preferences.get(key);
}
}
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java 2008-03-20 21:42:07 UTC (rev 10355)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java 2008-03-20 21:54:39 UTC (rev 10356)
@@ -59,7 +59,6 @@
import org.jboss.portal.wsrp.core.UnsupportedModeFault;
import org.jboss.portal.wsrp.core.UnsupportedWindowStateFault;
-import javax.activation.MimeTypeParseException;
import java.security.Principal;
import java.util.Arrays;
import java.util.Collections;
@@ -152,7 +151,12 @@
// prepare the invocation
WSRPPortletInvocationContext context = new WSRPPortletInvocationContext(streamInfo, securityContext, portalContext, userContext, instanceContext, windowContext);
PortletInvocation invocation = initInvocation(context);
+
invocation.setTarget(portlet.getContext());
+ invocation.setWindowState(WSRPUtils.getJSR168WindowStateFromWSRPName(markupRequest.getWindowState()));
+ invocation.setMode(WSRPUtils.getJSR168PortletModeFromWSRPName(markupRequest.getMode()));
+ invocation.setNavigationalState(navigationalState);
+
context.contextualize(invocation);
setInvocation(invocation);
}
@@ -278,11 +282,11 @@
{
List possibleList = Arrays.asList(possibleValues);
- for (int i = 0; i < preferredValues.length; i++)
+ for (String preferredValue : preferredValues)
{
- if (possibleList.contains(preferredValues[i]))
+ if (possibleList.contains(preferredValue))
{
- return preferredValues[i];
+ return preferredValue;
}
}
}
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java 2008-03-20 21:42:07 UTC (rev 10355)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java 2008-03-20 21:54:39 UTC (rev 10356)
@@ -199,7 +199,7 @@
Iterator<MediaType> mediaTypes = allMediaTypes.iterator();
for (int i = 0; mediaTypes.hasNext(); i++)
{
- MediaType mimeType = (MediaType)mediaTypes.next();
+ MediaType mimeType = mediaTypes.next();
markupTypes[i] = new MarkupType(
mimeType.getValue(),
getModeNamesFrom(capInfo.getModes(mimeType)),
@@ -263,7 +263,7 @@
return desc;
}
- private String[] getLocaleNamesFrom(Collection locales)
+ private String[] getLocaleNamesFrom(Collection<Locale> locales)
{
if (locales == null || locales.isEmpty())
{
@@ -272,36 +272,32 @@
String[] localeNames = new String[locales.size()];
int i = 0;
- for (Object locale : locales)
+ for (Locale locale : locales)
{
- localeNames[i++] = WSRPUtils.toString((Locale)locale);
+ localeNames[i++] = WSRPUtils.toString(locale);
}
return localeNames;
}
- private String[] getWindowStateNamesFrom(Collection windowStates)
+ private String[] getWindowStateNamesFrom(Collection<WindowStateInfo> windowStates)
{
String[] result = new String[windowStates.size()];
int i = 0;
- for (Iterator windowsStatesIt = windowStates.iterator(); windowsStatesIt.hasNext(); i++)
+ for (WindowStateInfo windowStateInfo : windowStates)
{
- WindowStateInfo windowStateInfo = (WindowStateInfo)windowsStatesIt.next();
- result[i] = WSRPUtils.convertJSR168WindowStateNameToWSRPName(windowStateInfo.getWindowStateName());
+ result[i++] = WSRPUtils.convertJSR168WindowStateNameToWSRPName(windowStateInfo.getWindowStateName());
}
-
return result;
}
- private String[] getModeNamesFrom(Collection modes)
+ private String[] getModeNamesFrom(Collection<ModeInfo> modes)
{
String[] result = new String[modes.size()];
int i = 0;
- for (Iterator modesIt = modes.iterator(); modesIt.hasNext(); i++)
+ for (ModeInfo modeInfo : modes)
{
- ModeInfo modeInfo = (ModeInfo)modesIt.next();
- result[i] = WSRPUtils.convertJSR168PortletModeNameToWSRPName(modeInfo.getModeName());
+ result[i++] = WSRPUtils.convertJSR168PortletModeNameToWSRPName(modeInfo.getModeName());
}
-
return result;
}
}
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPPortletInvocationContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPPortletInvocationContext.java 2008-03-20 21:42:07 UTC (rev 10355)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPPortletInvocationContext.java 2008-03-20 21:54:39 UTC (rev 10356)
@@ -162,7 +162,9 @@
{
PortletURL portletURL = (PortletURL)containerURL;
- return WSRPPortletURL.create(portletURL, urlFormat.getWantSecure()).toString();
+ Boolean wantSecureBool = urlFormat.getWantSecure();
+ boolean wantSecure = (wantSecureBool != null ? wantSecureBool : false);
+ return WSRPPortletURL.create(portletURL, wantSecure).toString();
}
else if (containerURL instanceof ResourceURL)
{
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java 2008-03-20 21:42:07 UTC (rev 10355)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java 2008-03-20 21:54:39 UTC (rev 10356)
@@ -81,6 +81,7 @@
import org.jboss.portal.wsrp.producer.config.ProducerRegistrationRequirements;
import java.rmi.RemoteException;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -417,14 +418,19 @@
{
log.debug("Retrieving remotable portlets");
Set<Portlet> allPortlets = invoker.getPortlets();
- Set<Portlet> remotablePortlets = new HashSet<Portlet>(allPortlets.size());
- for (Portlet portlet : allPortlets)
+ int portletNumber = allPortlets.size();
+ Set<Portlet> remotablePortlets = Collections.emptySet();
+ if (portletNumber > 0)
{
- log.debug("Found portlet: " + portlet.getContext());
- if (isRemotable(portlet))
+ remotablePortlets = new HashSet<Portlet>(portletNumber);
+ for (Portlet portlet : allPortlets)
{
- remotablePortlets.add(portlet);
- log.debug("Adding remotable portlet to set: " + portlet.getContext());
+ log.debug("Found portlet: " + portlet.getContext());
+ if (isRemotable(portlet))
+ {
+ remotablePortlets.add(portlet);
+ log.debug("Adding remotable portlet to set: " + portlet.getContext());
+ }
}
}
return remotablePortlets;
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml 2008-03-20 21:42:07 UTC (rev 10355)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml 2008-03-20 21:54:39 UTC (rev 10356)
@@ -46,6 +46,9 @@
<depends optional-attribute-name="CoreInfoBuilderFactory" proxy-type="attribute">
portal:service=InfoBuilderFactory,type=Core
</depends>
+ <depends optional-attribute-name="PortletContainerInvoker" proxy-type="attribute">
+ portal:service=PortletInvoker,type=Container
+ </depends>
<!--<depends optional-attribute-name="WebAppRegistry" proxy-type="attribute">portal:service=WebAppRegistry</depends>-->
<depends optional-attribute-name="Config" proxy-type="attribute">portal:service=ServerConfig</depends>
</mbean>
@@ -109,7 +112,7 @@
</mbean>
<!-- The portlet container invoker -->
- <mbean code="org.jboss.portal.portlet.container.PortletContainerInvoker"
+ <mbean code="org.jboss.portal.portlet.container.ContainerPortletInvoker"
name="portal:service=PortletInvoker,type=Container" xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
16 years, 2 months
- 1
- 0
JBoss Portal SVN: r10355 - modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-20 17:42:07 -0400 (Thu, 20 Mar 2008)
New Revision: 10355
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java
Log:
better logging ?
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java 2008-03-20 17:51:02 UTC (rev 10354)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java 2008-03-20 21:42:07 UTC (rev 10355)
@@ -89,10 +89,7 @@
}
catch (IllegalArgumentException e)
{
- e.printStackTrace();
-
- //
- log.debug("'" + contentType + "' is not a valid MIME type: ignoring!");
+ log.debug("'" + contentType + "' is not a valid MIME type: ignoring!", e);
}
}
@@ -104,10 +101,7 @@
}
catch (IllegalArgumentException e)
{
- e.printStackTrace();
-
- //
- log.debug("'" + contentType + "' is not a valid MIME type: ignoring!");
+ log.debug("'" + contentType + "' is not a valid MIME type: ignoring!", e);
}
}
16 years, 2 months
- 1
- 0
JBoss Portal SVN: r10354 - in branches/JBoss_Portal_Branch_2_7/core: src/main/org/jboss/portal/core/impl/portlet/info and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-03-20 13:51:02 -0400 (Thu, 20 Mar 2008)
New Revision: 10354
Modified:
branches/JBoss_Portal_Branch_2_7/core/build.xml
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/portlet/info/CoreInfoBuilder.java
Log:
- Use container name as there might not be a JBossPortletMetaData to get the name from (plus it should be the same name anyway).
Modified: branches/JBoss_Portal_Branch_2_7/core/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/build.xml 2008-03-20 17:39:47 UTC (rev 10353)
+++ branches/JBoss_Portal_Branch_2_7/core/build.xml 2008-03-20 17:51:02 UTC (rev 10354)
@@ -123,7 +123,7 @@
<pathelement location="${source.etc}/sun-jsf/jsf-example.jar"/>
<!-- jbpm integration -->
<path refid="jbpm.jaronly.classpath"/>
- <path refid="sun.jaxb.classpath"/>
+ <path refid="sun.jaxb.classpath"/>
</path>
<!-- Configure modules -->
@@ -168,7 +168,7 @@
<path id="aop.classpath">
<pathelement path="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/>
- <pathelement path="${jboss.aop.lib}/jboss-aop.jar"/>
+ <pathelement path="${jboss.aop.lib}/jboss-aop.jar"/>
<path refid="javassist.javassist.classpath"/>
<path refid="oswego.concurrent.classpath"/>
<path refid="trove.trove.classpath"/>
@@ -189,10 +189,10 @@
<pathelement location="${project.tools}/lib/explode.jar"/>
<path refid="apache.ant.classpath"/>
</path>
- <taskdef
- name="explode"
- classname="org.jboss.portal.common.ant.Explode"
- classpathref="explode.task.classpath"/>
+ <taskdef
+ name="explode"
+ classname="org.jboss.portal.common.ant.Explode"
+ classpathref="explode.task.classpath"/>
</target>
<target name="configure-jbossaop">
@@ -328,6 +328,7 @@
<include name="portal-portlet-management-lib.jar"/>
<include name="portal-portlet-bridge-lib.jar"/>
</fileset>
+ <fileset dir="${portlet.portlet.lib}" includes="portlet-api.jar"/>
<fileset dir="${jboss.portal/modules/identity.root}/lib" includes="portal-identity-lib.jar"/>
<fileset dir="${jboss.portal/modules/identity.root}/lib" includes="portal-identity-sso-lib.jar"/>
<fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-lib.jar"/>
@@ -346,7 +347,6 @@
<fileset dir="${tagsoup.tagsoup.lib}" includes="tagsoup.jar"/>
<fileset dir="${jboss/backport.concurrent.lib}" includes="jboss-backport-concurrent.jar"/>
<fileset dir="${jbpm.jaronly.lib}" includes="jbpm.jar,jbpm-identity.jar"/>
- <fileset dir="${portlet.portlet.lib}" includes="portlet-api.jar"/>
</copy>
<copy todir="${build.resources}/jboss-portal/lib" failonerror="false">
@@ -372,41 +372,41 @@
<!-- Build the jboss-portal-ha.sar -->
<target name="output-ha" depends="artifacts">
- <copy todir="${build.resources}/jboss-portal-ha.sar">
- <fileset dir="${build.resources}/jboss-portal" excludes="**/*.xml"/>
- </copy>
+ <copy todir="${build.resources}/jboss-portal-ha.sar">
+ <fileset dir="${build.resources}/jboss-portal" excludes="**/*.xml"/>
+ </copy>
- <copy todir="${build.resources}/jboss-portal-ha.sar">
- <filterset>
- <filtersfile file="../build/etc/clustered.properties"/>
- </filterset>
- <fileset dir="${build.resources}/jboss-portal" includes="**/*.xml"/>
- </copy>
+ <copy todir="${build.resources}/jboss-portal-ha.sar">
+ <filterset>
+ <filtersfile file="../build/etc/clustered.properties"/>
+ </filterset>
+ <fileset dir="${build.resources}/jboss-portal" includes="**/*.xml"/>
+ </copy>
- <implode
- dir="${build.resources}/jboss-portal-ha.sar"
- tofile="${build.lib}/jboss-portal-ha.sar"/>
+ <implode
+ dir="${build.resources}/jboss-portal-ha.sar"
+ tofile="${build.lib}/jboss-portal-ha.sar"/>
- </target>
+ </target>
<!-- Build the jboss-portal.sar -->
<target name="output" depends="artifacts">
- <!-- Build configurations -->
+ <!-- Build configurations -->
<copy todir="${build.resources}/jboss-portal.sar">
- <fileset dir="${build.resources}/jboss-portal" excludes="**/*.xml"/>
- </copy>
+ <fileset dir="${build.resources}/jboss-portal" excludes="**/*.xml"/>
+ </copy>
- <copy todir="${build.resources}/jboss-portal.sar">
- <filterset>
- <filtersfile file="../build/etc/single.properties"/>
- </filterset>
- <fileset dir="${build.resources}/jboss-portal" includes="**/*.xml"/>
- </copy>
+ <copy todir="${build.resources}/jboss-portal.sar">
+ <filterset>
+ <filtersfile file="../build/etc/single.properties"/>
+ </filterset>
+ <fileset dir="${build.resources}/jboss-portal" includes="**/*.xml"/>
+ </copy>
<!-- Build archives -->
<implode
dir="${build.resources}/jboss-portal.sar"
tofile="${build.lib}/jboss-portal.sar"/>
- </target>
+ </target>
<!-- create artifacts for running the portlet tests (except TCK) target output should have already been executed -->
<target name="package-tests" depends="init">
@@ -522,8 +522,8 @@
<target name="deploy-ha"
description="Deploy high availability."
depends="output-ha">
- <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
- <copy file="${build.lib}/jboss-portal-ha.sar" todir="${jboss.home}/server/${portal-ha.deploy.dir}"/>
+ <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
+ <copy file="${build.lib}/jboss-portal-ha.sar" todir="${jboss.home}/server/${portal-ha.deploy.dir}"/>
</target>
<!--
@@ -539,8 +539,8 @@
<target name="undeploy-ha"
description="Undeploy."
depends="init">
- <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
- <delete file="${jboss.home}/server/${portal-ha.deploy.dir}/jboss-portal-ha.sar"/>
+ <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
+ <delete file="${jboss.home}/server/${portal-ha.deploy.dir}/jboss-portal-ha.sar"/>
</target>
<target name="tests" depends="init, _buildmagic:configure:deployment">
@@ -551,10 +551,10 @@
<execute-tests>
<x-sysproperty>
-<!--
- <jvmarg value="-Xdebug"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>
--->
+ <!--
+ <jvmarg value="-Xdebug"/>
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>
+ -->
<sysproperty
key="jboss.aop.path"
@@ -638,7 +638,7 @@
<zest todir="${test.reports}" name="org.jboss.portal.test.core.state.RegistrationPersistenceManagerTestCase"
outfile="TEST-RegistrationPersistenceManagerTestCase">
</zest>
-
+
<test todir="${test.reports}"
name="org.jboss.portal.test.core.model.portal.PortalObjectPermissionTestCase"/>
<test todir="${test.reports}"
@@ -697,7 +697,7 @@
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="build.resources" value="${build.resources}"/>
- <classpath>
+ <classpath>
<path refid="apache.xerces.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
<pathelement location="${build.lib}/portal-core-lib.jar"/>
@@ -743,32 +743,32 @@
Some convenience build targets to help deployment during development
-->
<target name="deploy-explode" depends="output,explode">
- <require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <copy todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar" overwrite="true">
- <fileset dir="${build.lib}/jboss-portal-exploded.sar"/>
- </copy>
- </target>
- <target name="explode-ha" depends="init">
- <explode
- file="${build.lib}/jboss-portal-ha.sar"
- todir="${build.lib}"
- name="jboss-portal-ha-exploded.sar"
- />
- </target>
- <target name="deploy-ha-explode" description="Deploy high availability." depends="output-ha,explode-ha">
- <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
- <copy todir="${jboss.home}/server/${portal-ha.deploy.dir}/jboss-portal-ha.sar" overwrite="true">
- <fileset dir="${build.lib}/jboss-portal-ha-exploded.sar"/>
- </copy>
- </target>
+ <require file="${jboss.home}/server/${portal.deploy.dir}"/>
+ <copy todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar" overwrite="true">
+ <fileset dir="${build.lib}/jboss-portal-exploded.sar"/>
+ </copy>
+ </target>
+ <target name="explode-ha" depends="init">
+ <explode
+ file="${build.lib}/jboss-portal-ha.sar"
+ todir="${build.lib}"
+ name="jboss-portal-ha-exploded.sar"
+ />
+ </target>
+ <target name="deploy-ha-explode" description="Deploy high availability." depends="output-ha,explode-ha">
+ <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
+ <copy todir="${jboss.home}/server/${portal-ha.deploy.dir}/jboss-portal-ha.sar" overwrite="true">
+ <fileset dir="${build.lib}/jboss-portal-ha-exploded.sar"/>
+ </copy>
+ </target>
- <target name="deploy-ha-explode-dev" description="Deploy high availability." depends="output-ha,explode-ha">
- <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
- <copy todir="${jboss.home}/server/${portal-ha.deploy.dir}/jboss-portal-ha.sar" overwrite="true">
- <fileset dir="${build.lib}/jboss-portal-ha-exploded.sar"/>
- </copy>
- <copy todir="${jboss.home}/server/ports-02/deploy/jboss-portal-ha.sar" overwrite="true">
- <fileset dir="${build.lib}/jboss-portal-ha-exploded.sar"/>
- </copy>
- </target>
+ <target name="deploy-ha-explode-dev" description="Deploy high availability." depends="output-ha,explode-ha">
+ <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
+ <copy todir="${jboss.home}/server/${portal-ha.deploy.dir}/jboss-portal-ha.sar" overwrite="true">
+ <fileset dir="${build.lib}/jboss-portal-ha-exploded.sar"/>
+ </copy>
+ <copy todir="${jboss.home}/server/ports-02/deploy/jboss-portal-ha.sar" overwrite="true">
+ <fileset dir="${build.lib}/jboss-portal-ha-exploded.sar"/>
+ </copy>
+ </target>
</project>
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/portlet/info/CoreInfoBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/portlet/info/CoreInfoBuilder.java 2008-03-20 17:39:47 UTC (rev 10353)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/portlet/info/CoreInfoBuilder.java 2008-03-20 17:51:02 UTC (rev 10354)
@@ -95,35 +95,36 @@
//
for (ContainerPortletInfo containerInfo : builder.getPortlets())
{
- org.jboss.portal.portlet.deployment.jboss.metadata.JBossPortletMetaData jbPortletMD = (org.jboss.portal.portlet.deployment.jboss.metadata.JBossPortletMetaData)jbossApplicationMetaData.getPortlets().get(containerInfo.getName());
+ String name = containerInfo.getName();
+ org.jboss.portal.portlet.deployment.jboss.metadata.JBossPortletMetaData jbPortletMD = jbossApplicationMetaData.getPortlets().get(name);
if (jbPortletMD instanceof JBossPortletMetaData)
{
JBossPortletMetaData jbossPortletMD = (JBossPortletMetaData)jbPortletMD;
-
+
AjaxMetaData ajaxMD = jbossPortletMD.getAjax();
if (ajaxMD != null)
{
containerInfo.setAttachment(AjaxInfo.class, new AjaxInfoImpl(ajaxMD));
}
-
+
HeaderContentMetaData headerContentMD = jbossPortletMD.getHeaderContent();
if (headerContentMD != null)
{
containerInfo.setAttachment(MarkupHeaderInfo.class, new MarkupHeaderInfoImpl(headerContentMD));
}
-
+
PortletInfoMetaData portletInfoMD = jbossPortletMD.getPortletInfo();
if (portletInfoMD != null)
{
containerInfo.setAttachment(PortletInfoInfo.class, new PortletInfoInfoImpl(new PortletApplicationContextImpl(builderContext.getWebApp()), portletInfoMD));
}
-
+
Transactions.Type txType = jbossPortletMD.getTxType();
if (txType != null)
{
containerInfo.setAttachment(TransactionInfo.class, new TransactionInfoImpl(jbossPortletMD.getTxType()));
}
-
+
Boolean distributed = jbossPortletMD.getDistributed();
if (distributed != null)
{
@@ -131,7 +132,7 @@
}
}
- portlets.put(jbPortletMD.getName(), containerInfo);
+ portlets.put(name, containerInfo);
}
}
16 years, 2 months
- 1
- 0
JBoss Portal SVN: r10353 - modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-03-20 13:39:47 -0400 (Thu, 20 Mar 2008)
New Revision: 10353
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerModeInfo.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerWindowStateInfo.java
Log:
- Added Locale.ENGLISH to supported locales by default.
- Added equals and hashCode methods so that ModeInfo and WindowStateInfo are not added several times in ContainerCapabilitiesInfo.
- This should be tested but the tests are not currently run...
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java 2008-03-20 17:07:39 UTC (rev 10352)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java 2008-03-20 17:39:47 UTC (rev 10353)
@@ -22,17 +22,18 @@
******************************************************************************/
package org.jboss.portal.portlet.impl.info;
+import org.apache.log4j.Logger;
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
+import org.jboss.portal.common.net.media.MediaType;
import org.jboss.portal.common.net.media.MediaTypeMapImpl;
-import org.jboss.portal.common.net.media.MediaType;
import org.jboss.portal.portlet.info.CapabilitiesInfo;
import org.jboss.portal.portlet.info.ModeInfo;
import org.jboss.portal.portlet.info.WindowStateInfo;
import java.util.HashSet;
+import java.util.Locale;
import java.util.Set;
-import java.util.Locale;
/**
* This object holds the content type and mode capabilities.
@@ -45,6 +46,7 @@
*/
public class ContainerCapabilitiesInfo implements CapabilitiesInfo
{
+ private final static Logger log = Logger.getLogger(ContainerCapabilitiesInfo.class);
/** . */
private final MediaTypeMapImpl<ModeInfo> supportedModes;
@@ -68,6 +70,8 @@
//
this.supportedLocales = new HashSet<Locale>();
+ this.supportedLocales.add(Locale.ENGLISH);
+
this.supportedModes = supportedModes;
this.supportedWindowStates = supportedWindowStates;
}
@@ -88,7 +92,7 @@
e.printStackTrace();
//
- System.out.println("'" + contentType + "' is not a valid MIME type: ignoring!");
+ log.debug("'" + contentType + "' is not a valid MIME type: ignoring!");
}
}
@@ -103,7 +107,7 @@
e.printStackTrace();
//
- System.out.println("'" + contentType + "' is not a valid MIME type: ignoring!");
+ log.debug("'" + contentType + "' is not a valid MIME type: ignoring!");
}
}
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerModeInfo.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerModeInfo.java 2008-03-20 17:07:39 UTC (rev 10352)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerModeInfo.java 2008-03-20 17:39:47 UTC (rev 10353)
@@ -43,11 +43,32 @@
/** . */
private final Mode mode;
+ public boolean equals(Object o)
+ {
+ if (this == o)
+ {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass())
+ {
+ return false;
+ }
+
+ ContainerModeInfo that = (ContainerModeInfo)o;
+
+ return mode.equals(that.mode);
+ }
+
+ public int hashCode()
+ {
+ return mode.hashCode();
+ }
+
public ContainerModeInfo(Mode mode)
{
if (mode == null)
{
- throw new IllegalArgumentException();
+ throw new IllegalArgumentException("Specified mode cannot be null!");
}
this.mode = mode;
}
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerWindowStateInfo.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerWindowStateInfo.java 2008-03-20 17:07:39 UTC (rev 10352)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerWindowStateInfo.java 2008-03-20 17:39:47 UTC (rev 10353)
@@ -43,11 +43,33 @@
/** . */
private final WindowState windowState;
+ public boolean equals(Object o)
+ {
+ if (this == o)
+ {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass())
+ {
+ return false;
+ }
+
+ ContainerWindowStateInfo that = (ContainerWindowStateInfo)o;
+
+ return windowState.equals(that.windowState);
+
+ }
+
+ public int hashCode()
+ {
+ return windowState.hashCode();
+ }
+
public ContainerWindowStateInfo(WindowState windowState)
{
if (windowState == null)
{
- throw new IllegalArgumentException();
+ throw new IllegalArgumentException("Specified window state cannot be null!");
}
this.windowState = windowState;
}
16 years, 2 months
- 1
- 0
JBoss Portal SVN: r10352 - modules/identity/trunk/identity.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-03-20 13:07:39 -0400 (Thu, 20 Mar 2008)
New Revision: 10352
Modified:
modules/identity/trunk/identity/build.xml
Log:
bobo
Modified: modules/identity/trunk/identity/build.xml
===================================================================
--- modules/identity/trunk/identity/build.xml 2008-03-20 14:32:45 UTC (rev 10351)
+++ modules/identity/trunk/identity/build.xml 2008-03-20 17:07:39 UTC (rev 10352)
@@ -10,23 +10,30 @@
<!--<echo message="test classpath: ${test_classpath}"/>-->
<!--<echo message="plugin classpath: ${plugin_classpath}"/>-->
- <mkdir dir="target/jboss-unit"/>
+ <property name="target" value="${basedir}/target"/>
+ <property name="jboss-unit" value="${target}/jboss-unit"/>
+
+
+ <mkdir dir="${jboss-unit}"/>
+
+
+
<ant>
<target name="deploy-opends"/>
</ant>
- <ant>
- <target name="cargo.jboss-4.2.start"/>
- </ant>
+ <antcall target="cargo.jboss-4.2.start">
+ <param name="test.jboss-4.2.tempdir" value="${target}/cargo-tmp/4_2"/>
+ </antcall>
<ant>
<target name="jboss-unit"/>
</ant>
- <ant>
- <target name="cargo.jboss-4.2.stop"/>
- </ant>
+ <antcall target="cargo.jboss-4.2.stop">
+ <param name="test.jboss-4.2.tempdir" value="${target}/cargo-tmp/4_2"/>
+ </antcall>
<ant>
<target name="undeploy-opends"/>
@@ -75,7 +82,7 @@
<fileset dir="./src/test/resources/opends"/>
</copy>
- <delete dir="target/jboss-unit/tmp" failonerror="false" deleteonexit="true" quiet="true"/>
+ <delete dir="${jboss-unit}/tmp" failonerror="false" deleteonexit="true" quiet="true"/>
</target>
@@ -115,7 +122,7 @@
<sharedClasspath>
<!-- Empty but need to be present because of a bug in our patch for cargo-->
</sharedClasspath>
- <configuration>
+ <configuration home="${test.jboss-4.2.tempdir}">
<property name="cargo.servlet.port" value="8080"/>
<property name="cargo.logging" value="high"/>
</configuration>
@@ -130,7 +137,7 @@
home="${JBOSS_HOME}"
log="${cargo.log.dir}/cargo.identity.shutdown.log"
action="stop">
- <configuration>
+ <configuration home="${test.jboss-4.2.tempdir}">
<property name="cargo.rmi.port" value="1099"/>
</configuration>
</cargo>
16 years, 2 months
- 1
- 0
JBoss Portal SVN: r10351 - in modules/common/trunk/common/src: test/java/org/jboss/portal/test/common/reflect and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-20 10:32:45 -0400 (Thu, 20 Mar 2008)
New Revision: 10351
Modified:
modules/common/trunk/common/src/main/java/org/jboss/portal/common/reflect/Reflection.java
modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/reflect/ReflectionTestCase.java
Log:
added a safe cast util method
Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/reflect/Reflection.java
===================================================================
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/reflect/Reflection.java 2008-03-20 14:29:00 UTC (rev 10350)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/reflect/Reflection.java 2008-03-20 14:32:45 UTC (rev 10351)
@@ -146,9 +146,14 @@
* @param value the value to cast
* @param type the type to downcast
* @return the casted value or null
+ * @throws IllegalArgumentException if the type argument is null
*/
- public static <T> T safeCast(Object value, Class<T> type)
+ public static <T> T safeCast(Object value, Class<T> type) throws IllegalArgumentException
{
+ if (type == null)
+ {
+ throw new IllegalArgumentException("No null type accepted");
+ }
if (value == null)
{
return null;
Modified: modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/reflect/ReflectionTestCase.java
===================================================================
--- modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/reflect/ReflectionTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
+++ modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/reflect/ReflectionTestCase.java 2008-03-20 14:32:45 UTC (rev 10351)
@@ -102,6 +102,26 @@
ArrayList list = new ArrayList();
assertSame(list, Reflection.safeCast(list, List.class));
assertSame(list, Reflection.safeCast(list, AbstractList.class));
+
+ //
+ try
+ {
+ Reflection.safeCast(null, null);
+ fail();
+ }
+ catch (IllegalArgumentException ignore)
+ {
+ }
+
+ //
+ try
+ {
+ Reflection.safeCast("foo", null);
+ fail();
+ }
+ catch (IllegalArgumentException ignore)
+ {
+ }
}
}
16 years, 2 months
- 1
- 0
JBoss Portal SVN: r10350 - in modules/portlet/trunk/portlet/src/test/java/org/jboss/portal: test/portlet/jsr168/api/actionresponse and 13 other directories.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-03-20 10:29:00 -0400 (Thu, 20 Mar 2008)
New Revision: 10350
Modified:
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionrequest/AttributeTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ConstantsTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ParameterTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionrequest/PropertyTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionresponse/EncodeURLTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionresponse/PropertyTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionresponse/RenderParameterTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalInfoTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PropertyTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portalcontext/SupportedPortletModesTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portalcontext/SupportedWindowStatesTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletconfig/InitParameterNamesTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletconfig/InitParameterTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletContextTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletNameTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/AttributeTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/DispatcherTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/InitParameterTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/MimeTypeTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextNameTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ResourcePathsTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ResourceTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/VersionTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletmode/ConstructorTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletmode/EqualsTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletmode/HashCodeTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletmode/ModesTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ReadOnlyTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ResetNullKeyThrowsNPETestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ValueTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ZeroLengthArrayValueTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/AttributeNamesTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/ConstantsTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/CreationTimeTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/GetAttributeTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/InvalidateTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/NewTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/RemoveAttributeTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/SetAttributeTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/DecodeAttributeNameTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/DecodeScopeTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portleturl/ParameterTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderrequest/AttributeTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderrequest/ConstantsTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderrequest/ParameterTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderrequest/PropertyTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderresponse/ConstantsTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderresponse/ContentTypeTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderresponse/EncodeURLTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderresponse/PropertyTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/windowstate/ConstructorTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/windowstate/EqualsTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/windowstate/HashCodeTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/windowstate/StatesTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/api/event/SetEventWithNullNameThrowsIAETestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java
Log:
- annotate all existing API tests
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionrequest/AttributeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionrequest/AttributeTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionrequest/AttributeTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -29,6 +29,7 @@
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -46,7 +47,11 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.API286_PORTLET_REQUEST_16,
+ Assertion.API286_PORTLET_REQUEST_51,
+ Assertion.API286_PORTLET_REQUEST_52
+ })
public class AttributeTestCase
{
public AttributeTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ConstantsTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ConstantsTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ConstantsTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -28,6 +28,7 @@
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertEquals;
@@ -44,7 +45,13 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.API286_PORTLET_REQUEST_15,
+ Assertion.API286_PORTLET_REQUEST_3,
+ Assertion.API286_PORTLET_REQUEST_8,
+ Assertion.API286_PORTLET_REQUEST_5,
+ Assertion.API286_PORTLET_REQUEST_6
+ })
public class ConstantsTestCase
{
public ConstantsTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ParameterTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ParameterTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ParameterTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
@@ -45,7 +46,10 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.API286_PORTLET_REQUEST_23,
+ Assertion.API286_PORTLET_REQUEST_26
+ })
public class ParameterTestCase
{
public ParameterTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionrequest/PropertyTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionrequest/PropertyTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionrequest/PropertyTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -29,6 +29,7 @@
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -46,7 +47,10 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.API286_PORTLET_REQUEST_32,
+ Assertion.API286_PORTLET_REQUEST_33
+ })
public class PropertyTestCase
{
public PropertyTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionresponse/EncodeURLTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionresponse/EncodeURLTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionresponse/EncodeURLTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
@@ -43,7 +44,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.API286_PORTLET_RESPONSE_3
+ })
public class EncodeURLTestCase
{
public EncodeURLTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionresponse/PropertyTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionresponse/PropertyTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionresponse/PropertyTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
@@ -43,7 +44,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.API286_BASE_URL_6
+ })
public class PropertyTestCase
{
public PropertyTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionresponse/RenderParameterTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionresponse/RenderParameterTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/actionresponse/RenderParameterTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -29,6 +29,7 @@
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -46,7 +47,10 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.API286_STATE_AWARE_RESPONSE_7,
+ Assertion.API286_STATE_AWARE_RESPONSE_8
+ })
public class RenderParameterTestCase
{
public RenderParameterTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalInfoTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalInfoTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalInfoTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -28,6 +28,7 @@
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertTrue;
@@ -40,7 +41,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTAL_CONTEXT_2})
public class PortalInfoTestCase
{
public PortalInfoTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PropertyTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PropertyTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PropertyTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
@@ -39,7 +40,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTAL_CONTEXT_3})
public class PropertyTestCase
{
public PropertyTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portalcontext/SupportedPortletModesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portalcontext/SupportedPortletModesTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portalcontext/SupportedPortletModesTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
@@ -43,7 +44,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTAL_CONTEXT_5})
public class SupportedPortletModesTestCase
{
public SupportedPortletModesTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portalcontext/SupportedWindowStatesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portalcontext/SupportedWindowStatesTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portalcontext/SupportedWindowStatesTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
@@ -43,7 +44,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTAL_CONTEXT_6})
public class SupportedWindowStatesTestCase
{
public SupportedWindowStatesTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletconfig/InitParameterNamesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletconfig/InitParameterNamesTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletconfig/InitParameterNamesTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -31,6 +31,7 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestContext;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertNotNull;
@@ -49,7 +50,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTLET_CONFIG_4})
public class InitParameterNamesTestCase
{
public InitParameterNamesTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletconfig/InitParameterTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletconfig/InitParameterTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletconfig/InitParameterTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -25,6 +25,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP2;
@@ -45,7 +46,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTLET_CONFIG_3})
public class InitParameterTestCase
{
public InitParameterTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletContextTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletContextTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletContextTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -29,6 +29,7 @@
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertNotNull;
@@ -43,7 +44,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTLET_CONFIG_5})
public class PortletContextTestCase
{
public PortletContextTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletNameTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletNameTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletNameTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
@@ -42,7 +43,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTLET_CONFIG_6})
public class PortletNameTestCase
{
public PortletNameTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/AttributeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/AttributeTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/AttributeTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
@@ -40,7 +41,10 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.API286_PORTLET_CONTEXT_1,
+ Assertion.API286_PORTLET_CONTEXT_17,
+ Assertion.API286_PORTLET_CONTEXT_18})
public class AttributeTestCase
{
public AttributeTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/DispatcherTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/DispatcherTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/DispatcherTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -25,6 +25,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
@@ -40,7 +41,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTLET_CONTEXT_9})
public class DispatcherTestCase
{
public DispatcherTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/InitParameterTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/InitParameterTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/InitParameterTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -29,6 +29,7 @@
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertNull;
@@ -42,7 +43,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTLET_CONTEXT_4})
public class InitParameterTestCase
{
public InitParameterTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/MimeTypeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/MimeTypeTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/MimeTypeTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -25,6 +25,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
@@ -41,7 +42,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTLET_CONTEXT_7})
public class MimeTypeTestCase
{
public MimeTypeTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextNameTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextNameTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextNameTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
@@ -40,7 +41,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTLET_CONTEXT_10})
public class PortletContextNameTestCase
{
public PortletContextNameTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ResourcePathsTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ResourcePathsTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ResourcePathsTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -29,6 +29,7 @@
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertNull;
@@ -43,7 +44,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase({})
+(a)TestCase({Assertion.API286_PORTLET_CONTEXT_15})
public class ResourcePathsTestCase
{
public ResourcePathsTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ResourceTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ResourceTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ResourceTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
@@ -42,7 +43,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTLET_CONTEXT_13})
public class ResourceTestCase
{
public ResourceTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
@@ -41,7 +42,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTLET_CONTEXT_16})
public class ServerInfoTestCase
{
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/VersionTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/VersionTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletcontext/VersionTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -26,6 +26,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
import org.jboss.portal.unit.TestConstants;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
@@ -41,7 +42,10 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.API286_PORTLET_CONTEXT_8,
+ Assertion.API286_PORTLET_CONTEXT_6
+ })
public class VersionTestCase
{
public VersionTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletmode/ConstructorTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletmode/ConstructorTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletmode/ConstructorTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -28,6 +28,7 @@
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertEquals;
@@ -41,7 +42,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTLET_MODE_7})
public class ConstructorTestCase
{
public ConstructorTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletmode/EqualsTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletmode/EqualsTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletmode/EqualsTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -25,6 +25,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
@@ -41,7 +42,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTLET_MODE_4})
public class EqualsTestCase
{
public EqualsTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletmode/HashCodeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletmode/HashCodeTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletmode/HashCodeTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
@@ -41,7 +42,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTLET_MODE_5})
public class HashCodeTestCase
{
public HashCodeTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletmode/ModesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletmode/ModesTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletmode/ModesTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -28,6 +28,7 @@
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertEquals;
@@ -41,7 +42,11 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.API286_PORTLET_MODE_1,
+ Assertion.API286_PORTLET_MODE_2,
+ Assertion.API286_PORTLET_MODE_3
+ })
public class ModesTestCase
{
public ModesTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ReadOnlyTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ReadOnlyTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ReadOnlyTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
@@ -39,7 +40,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTLET_PREFERENCES_5})
public class ReadOnlyTestCase
{
public ReadOnlyTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ResetNullKeyThrowsNPETestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ResetNullKeyThrowsNPETestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ResetNullKeyThrowsNPETestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -28,6 +28,7 @@
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.fail;
@@ -41,7 +42,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTLET_PREFERENCES_6})
public class ResetNullKeyThrowsNPETestCase
{
public ResetNullKeyThrowsNPETestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ValueTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ValueTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ValueTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -25,6 +25,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
@@ -46,7 +47,12 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.API286_PORTLET_PREFERENCES_3,
+ Assertion.API286_PORTLET_PREFERENCES_4,
+ Assertion.API286_PORTLET_PREFERENCES_7,
+ Assertion.API286_PORTLET_PREFERENCES_8
+ })
public class ValueTestCase
{
public ValueTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ZeroLengthArrayValueTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ZeroLengthArrayValueTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ZeroLengthArrayValueTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP2;
@@ -48,7 +49,10 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.API286_PORTLET_PREFERENCES_3,
+ Assertion.API286_PORTLET_PREFERENCES_4
+ })
public class ZeroLengthArrayValueTestCase
{
public ZeroLengthArrayValueTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/AttributeNamesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/AttributeNamesTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/AttributeNamesTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -28,6 +28,7 @@
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.fail;
@@ -41,7 +42,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTLET_SESSION_5})
public class AttributeNamesTestCase
{
public AttributeNamesTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/ConstantsTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/ConstantsTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/ConstantsTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -28,6 +28,7 @@
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertEquals;
@@ -41,7 +42,10 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.API286_PORTLET_SESSION_1,
+ Assertion.API286_PORTLET_SESSION_2
+ })
public class ConstantsTestCase
{
public ConstantsTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/CreationTimeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/CreationTimeTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/CreationTimeTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -28,6 +28,7 @@
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.fail;
@@ -41,7 +42,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTLET_SESSION_6})
public class CreationTimeTestCase
{
public CreationTimeTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/GetAttributeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/GetAttributeTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/GetAttributeTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -28,6 +28,7 @@
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.fail;
@@ -41,7 +42,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTLET_SESSION_3})
public class GetAttributeTestCase
{
public GetAttributeTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/InvalidateTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/InvalidateTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/InvalidateTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -28,6 +28,7 @@
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.fail;
@@ -41,7 +42,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTLET_SESSION_11})
public class InvalidateTestCase
{
public InvalidateTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/NewTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/NewTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/NewTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -25,6 +25,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
@@ -41,7 +42,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTLET_SESSION_12})
public class NewTestCase
{
public NewTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/RemoveAttributeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/RemoveAttributeTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/RemoveAttributeTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -28,6 +28,7 @@
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.fail;
@@ -41,7 +42,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTLET_SESSION_13})
public class RemoveAttributeTestCase
{
public RemoveAttributeTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/SetAttributeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/SetAttributeTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsession/SetAttributeTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
@@ -40,7 +41,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTLET_SESSION_14})
public class SetAttributeTestCase
{
public SetAttributeTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/DecodeAttributeNameTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/DecodeAttributeNameTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/DecodeAttributeNameTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
@@ -40,7 +41,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTLET_SESSION_UTIL_1})
public class DecodeAttributeNameTestCase
{
public DecodeAttributeNameTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/DecodeScopeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/DecodeScopeTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/DecodeScopeTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
@@ -41,7 +42,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_PORTLET_SESSION_UTIL_2})
public class DecodeScopeTestCase
{
public DecodeScopeTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portleturl/ParameterTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portleturl/ParameterTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/portleturl/ParameterTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -28,6 +28,7 @@
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.fail;
@@ -43,7 +44,10 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.API286_BASE_URL_1,
+ Assertion.API286_BASE_URL_8
+ })
public class ParameterTestCase
{
public ParameterTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderrequest/AttributeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderrequest/AttributeTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderrequest/AttributeTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -28,6 +28,7 @@
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.fail;
@@ -40,7 +41,11 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.API286_PORTLET_REQUEST_16,
+ Assertion.API286_PORTLET_REQUEST_51,
+ Assertion.API286_PORTLET_REQUEST_52
+ })
public class AttributeTestCase
{
public AttributeTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderrequest/ConstantsTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderrequest/ConstantsTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderrequest/ConstantsTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
@@ -39,7 +40,13 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.API286_PORTLET_REQUEST_15,
+ Assertion.API286_PORTLET_REQUEST_3,
+ Assertion.API286_PORTLET_REQUEST_8,
+ Assertion.API286_PORTLET_REQUEST_5,
+ Assertion.API286_PORTLET_REQUEST_6
+ })
public class ConstantsTestCase
{
public ConstantsTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderrequest/ParameterTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderrequest/ParameterTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderrequest/ParameterTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
@@ -39,7 +40,10 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.API286_PORTLET_REQUEST_23,
+ Assertion.API286_PORTLET_REQUEST_26
+ })
public class ParameterTestCase
{
public ParameterTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderrequest/PropertyTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderrequest/PropertyTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderrequest/PropertyTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
@@ -39,7 +40,10 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.API286_PORTLET_REQUEST_32,
+ Assertion.API286_PORTLET_REQUEST_33
+ })
public class PropertyTestCase
{
public PropertyTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderresponse/ConstantsTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderresponse/ConstantsTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderresponse/ConstantsTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
@@ -39,7 +40,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.API286_MIME_RESPONSE_3
+ })
public class ConstantsTestCase
{
public ConstantsTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderresponse/ContentTypeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderresponse/ContentTypeTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderresponse/ContentTypeTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
@@ -39,7 +40,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.API286_MIME_RESPONSE_23
+ })
public class ContentTypeTestCase
{
public ContentTypeTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderresponse/EncodeURLTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderresponse/EncodeURLTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderresponse/EncodeURLTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
@@ -39,7 +40,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.API286_PORTLET_RESPONSE_3
+ })
public class EncodeURLTestCase
{
public EncodeURLTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderresponse/PropertyTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderresponse/PropertyTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/renderresponse/PropertyTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -28,6 +28,7 @@
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.fail;
@@ -40,7 +41,10 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.API286_PORTLET_RESPONSE_1,
+ Assertion.API286_PORTLET_RESPONSE_5
+ })
public class PropertyTestCase
{
public PropertyTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/windowstate/ConstructorTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/windowstate/ConstructorTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/windowstate/ConstructorTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
@@ -40,7 +41,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_WINDOW_STATE_1})
public class ConstructorTestCase
{
public ConstructorTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/windowstate/EqualsTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/windowstate/EqualsTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/windowstate/EqualsTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
@@ -40,7 +41,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_WINDOW_STATE_5})
public class EqualsTestCase
{
public EqualsTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/windowstate/HashCodeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/windowstate/HashCodeTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/windowstate/HashCodeTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
@@ -41,7 +42,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+(a)TestCase({Assertion.API286_WINDOW_STATE_6})
public class HashCodeTestCase
{
public HashCodeTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/windowstate/StatesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/windowstate/StatesTestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/api/windowstate/StatesTestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
@@ -40,7 +41,12 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.API286_WINDOW_STATE_2,
+ Assertion.API286_WINDOW_STATE_3,
+ Assertion.API286_WINDOW_STATE_4,
+ Assertion.API286_WINDOW_STATE_7
+ })
public class StatesTestCase
{
public StatesTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/api/event/SetEventWithNullNameThrowsIAETestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/api/event/SetEventWithNullNameThrowsIAETestCase.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/api/event/SetEventWithNullNameThrowsIAETestCase.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -50,7 +50,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-@TestCase
+@TestCase({
+ Assertion.API286_STATE_AWARE_RESPONSE_5
+ })
public class SetEventWithNullNameThrowsIAETestCase
{
public SetEventWithNullNameThrowsIAETestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java 2008-03-20 14:20:47 UTC (rev 10349)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java 2008-03-20 14:29:00 UTC (rev 10350)
@@ -1439,6 +1439,7 @@
API286_BASE_URL_5(new API(BaseURL.class), "write()"),
API286_BASE_URL_6(new API(BaseURL.class), "addProperty()"),
API286_BASE_URL_7(new API(BaseURL.class), "setProperty()"),
+ API286_BASE_URL_8(new API(BaseURL.class), "setParameters()"),
API286_CACHE_CONTROL(new API(CacheControl.class), ""),
@@ -1454,34 +1455,175 @@
API286_GENERIC_PORTLET(new API(GenericPortlet.class), ""),
- API286_MIME_RESPONSE(new API(MimeResponse.class), ""),
+ API286_MIME_RESPONSE_1(new API(MimeResponse.class), "CACHE_SCOPE"),
+ API286_MIME_RESPONSE_2(new API(MimeResponse.class), "ETAG"),
+ API286_MIME_RESPONSE_3(new API(MimeResponse.class), "EXPIRIATION_CACHE"),
+ API286_MIME_RESPONSE_4(new API(MimeResponse.class), "MARKUP_HEAD_ELEMENT"),
+ API286_MIME_RESPONSE_5(new API(MimeResponse.class), "NAMESPACED_RESPONSE"),
+ API286_MIME_RESPONSE_6(new API(MimeResponse.class), "PRIVATE_SCOPE"),
+ API286_MIME_RESPONSE_7(new API(MimeResponse.class), "PUBLIC_SCOPE"),
+ API286_MIME_RESPONSE_8(new API(MimeResponse.class), "USE_CACHED_CONTENT"),
+ API286_MIME_RESPONSE_9(new API(MimeResponse.class), "createActionURL()"),
+ API286_MIME_RESPONSE_10(new API(MimeResponse.class), "createRenderURL()"),
+ API286_MIME_RESPONSE_11(new API(MimeResponse.class), "flushBuffer()"),
+ API286_MIME_RESPONSE_12(new API(MimeResponse.class), "getBufferSize()"),
+ API286_MIME_RESPONSE_13(new API(MimeResponse.class), "getCacheControl()"),
+ API286_MIME_RESPONSE_14(new API(MimeResponse.class), "getCharacterEncoding()"),
+ API286_MIME_RESPONSE_15(new API(MimeResponse.class), "getContentType()"),
+ API286_MIME_RESPONSE_16(new API(MimeResponse.class), "getLocale()"),
+ API286_MIME_RESPONSE_17(new API(MimeResponse.class), "getPortletOutputStream()"),
+ API286_MIME_RESPONSE_18(new API(MimeResponse.class), "getWriter()"),
+ API286_MIME_RESPONSE_19(new API(MimeResponse.class), "isCommited()"),
+ API286_MIME_RESPONSE_20(new API(MimeResponse.class), "reset()"),
+ API286_MIME_RESPONSE_21(new API(MimeResponse.class), "resetBuffer()"),
+ API286_MIME_RESPONSE_22(new API(MimeResponse.class), "setBufferSize()"),
+ API286_MIME_RESPONSE_23(new API(MimeResponse.class), "setContentType()"),
- API286_PORTAL_CONTEXT(new API(PortalContext.class), ""),
+ API286_PORTAL_CONTEXT_1(new API(PortalContext.class), "MARKUP_HEAD_ELEMENT_SUPPORT"),
+ API286_PORTAL_CONTEXT_2(new API(PortalContext.class), "getPortalInfo()"),
+ API286_PORTAL_CONTEXT_3(new API(PortalContext.class), "getProperty()"),
+ API286_PORTAL_CONTEXT_4(new API(PortalContext.class), "getPropertyNames()"),
+ API286_PORTAL_CONTEXT_5(new API(PortalContext.class), "getSupportedPortletModes()"),
+ API286_PORTAL_CONTEXT_6(new API(PortalContext.class), "getSupportedWindowStates()"),
+
+ API286_PORTLET_CONTEXT_1(new API(PortalContext.class), "getAttribute()"),
+ API286_PORTLET_CONTEXT_2(new API(PortalContext.class), "getAttributeNames()"),
+ API286_PORTLET_CONTEXT_3(new API(PortalContext.class), "getContainerRuntimeOptions()"),
+ API286_PORTLET_CONTEXT_4(new API(PortalContext.class), "getInitParameter()"),
+ API286_PORTLET_CONTEXT_5(new API(PortalContext.class), "getInitParameterNames()"),
+ API286_PORTLET_CONTEXT_6(new API(PortalContext.class), "getMajorVersion()"),
+ API286_PORTLET_CONTEXT_7(new API(PortalContext.class), "getMimeType()"),
+ API286_PORTLET_CONTEXT_8(new API(PortalContext.class), "getMinorVersion()"),
+ API286_PORTLET_CONTEXT_9(new API(PortalContext.class), "getNamedDispatcher()"),
+ API286_PORTLET_CONTEXT_10(new API(PortalContext.class), "getPortletContextName()"),
+ API286_PORTLET_CONTEXT_11(new API(PortalContext.class), "getRealPath()"),
+ API286_PORTLET_CONTEXT_12(new API(PortalContext.class), "getRequestDispatcher()"),
+ API286_PORTLET_CONTEXT_13(new API(PortalContext.class), "getResource()"),
+ API286_PORTLET_CONTEXT_14(new API(PortalContext.class), "getResourceAsStream()"),
+ API286_PORTLET_CONTEXT_15(new API(PortalContext.class), "getResourcePaths()"),
+ API286_PORTLET_CONTEXT_16(new API(PortalContext.class), "getServerInfo()"),
+ API286_PORTLET_CONTEXT_17(new API(PortalContext.class), "removeAttribute()"),
+ API286_PORTLET_CONTEXT_18(new API(PortalContext.class), "setAttribute()"),
+
API286_PORTLET(new API(Portlet.class), ""),
- API286_PORTLET_CONFIG(new API(PortletConfig.class), ""),
+ API286_PORTLET_CONFIG_1(new API(PortletConfig.class), "getContainerRuntimeOptions()"),
+ API286_PORTLET_CONFIG_2(new API(PortletConfig.class), "getDefaultNamespace()"),
+ API286_PORTLET_CONFIG_3(new API(PortletConfig.class), "getInitParameter()"),
+ API286_PORTLET_CONFIG_4(new API(PortletConfig.class), "getInitParameterNames()"),
+ API286_PORTLET_CONFIG_5(new API(PortletConfig.class), "getPortletContext()"),
+ API286_PORTLET_CONFIG_6(new API(PortletConfig.class), "getPortletName()"),
+ API286_PORTLET_CONFIG_7(new API(PortletConfig.class), "getProcessingEventQNames()"),
+ API286_PORTLET_CONFIG_8(new API(PortletConfig.class), "getPublicRenderParameterNames()"),
+ API286_PORTLET_CONFIG_9(new API(PortletConfig.class), "getPublishingEventQNames()"),
+ API286_PORTLET_CONFIG_10(new API(PortletConfig.class), "getResourceBundle()"),
+ API286_PORTLET_CONFIG_11(new API(PortletConfig.class), "getSupportedLocales()"),
API286_PORTLET_EXCEPTION(new API(PortletException.class), ""),
- API286_PORTLET_MODE(new API(PortletMode.class), ""),
+ API286_PORTLET_MODE_1(new API(PortletMode.class), "EDIT"),
+ API286_PORTLET_MODE_2(new API(PortletMode.class), "HELP"),
+ API286_PORTLET_MODE_3(new API(PortletMode.class), "VIEW"),
+ API286_PORTLET_MODE_4(new API(PortletMode.class), "equals()"),
+ API286_PORTLET_MODE_5(new API(PortletMode.class), "hashCode()"),
+ API286_PORTLET_MODE_6(new API(PortletMode.class), "toString()"),
+ API286_PORTLET_MODE_7(new API(PortletMode.class), "PortletMode()"),
API286_PORTLET_MODE_EXCEPTION(new API(PortletModeException.class), ""),
- API286_PORTLET_PREFERENCES(new API(PortletPreferences.class), ""),
+ API286_PORTLET_PREFERENCES_1(new API(PortletPreferences.class), "getMap()"),
+ API286_PORTLET_PREFERENCES_2(new API(PortletPreferences.class), "getNames()"),
+ API286_PORTLET_PREFERENCES_3(new API(PortletPreferences.class), "getValue()"),
+ API286_PORTLET_PREFERENCES_4(new API(PortletPreferences.class), "getValues()"),
+ API286_PORTLET_PREFERENCES_5(new API(PortletPreferences.class), "isReadOnly()"),
+ API286_PORTLET_PREFERENCES_6(new API(PortletPreferences.class), "reset()"),
+ API286_PORTLET_PREFERENCES_7(new API(PortletPreferences.class), "setValue()"),
+ API286_PORTLET_PREFERENCES_8(new API(PortletPreferences.class), "setValues()"),
+ API286_PORTLET_PREFERENCES_9(new API(PortletPreferences.class), "store()"),
- API286_PORTLET_REQUEST(new API(PortletRequest.class), ""),
-
+ API286_PORTLET_REQUEST_1(new API(PortletRequest.class), "ACTION_PHASE"),
+ API286_PORTLET_REQUEST_2(new API(PortletRequest.class), "ACTION_SCOPE_ID"),
+ API286_PORTLET_REQUEST_3(new API(PortletRequest.class), "BASIC_AUTH"),
+ API286_PORTLET_REQUEST_4(new API(PortletRequest.class), "CCPP_PROFILE"),
+ API286_PORTLET_REQUEST_5(new API(PortletRequest.class), "CLIENT_CERT_AUTH"),
+ API286_PORTLET_REQUEST_6(new API(PortletRequest.class), "DIGEST_AUTH"),
+ API286_PORTLET_REQUEST_7(new API(PortletRequest.class), "EVENT_PHASE"),
+ API286_PORTLET_REQUEST_8(new API(PortletRequest.class), "FORM_AUTH"),
+ API286_PORTLET_REQUEST_9(new API(PortletRequest.class), "LIFECYCLE_PHASE"),
+ API286_PORTLET_REQUEST_10(new API(PortletRequest.class), "RENDER_HEADERS"),
+ API286_PORTLET_REQUEST_11(new API(PortletRequest.class), "RENDER_MARKUP"),
+ API286_PORTLET_REQUEST_12(new API(PortletRequest.class), "RENDER_PART"),
+ API286_PORTLET_REQUEST_13(new API(PortletRequest.class), "RENDER_PHASE"),
+ API286_PORTLET_REQUEST_14(new API(PortletRequest.class), "RESOURCE_PHASE"),
+ API286_PORTLET_REQUEST_15(new API(PortletRequest.class), "USER_INFO"),
+ API286_PORTLET_REQUEST_16(new API(PortletRequest.class), "getAttribute()"),
+ API286_PORTLET_REQUEST_17(new API(PortletRequest.class), "getAttributeNames()"),
+ API286_PORTLET_REQUEST_18(new API(PortletRequest.class), "getAuthType()"),
+ API286_PORTLET_REQUEST_19(new API(PortletRequest.class), "getContextPath()"),
+ API286_PORTLET_REQUEST_20(new API(PortletRequest.class), "getCookies()"),
+ API286_PORTLET_REQUEST_21(new API(PortletRequest.class), "getLocale()"),
+ API286_PORTLET_REQUEST_22(new API(PortletRequest.class), "getLocales()"),
+ API286_PORTLET_REQUEST_23(new API(PortletRequest.class), "getParameter()"),
+ API286_PORTLET_REQUEST_24(new API(PortletRequest.class), "getParameterMap()"),
+ API286_PORTLET_REQUEST_25(new API(PortletRequest.class), "getParameterNames()"),
+ API286_PORTLET_REQUEST_26(new API(PortletRequest.class), "getParameterValues()"),
+ API286_PORTLET_REQUEST_27(new API(PortletRequest.class), "getPortalContext()"),
+ API286_PORTLET_REQUEST_28(new API(PortletRequest.class), "getPortletMode()"),
+ API286_PORTLET_REQUEST_29(new API(PortletRequest.class), "getPortletSession()"),
+ API286_PORTLET_REQUEST_30(new API(PortletRequest.class), "getPreferences()"),
+ API286_PORTLET_REQUEST_31(new API(PortletRequest.class), "getPrivateParameterMap()"),
+ API286_PORTLET_REQUEST_32(new API(PortletRequest.class), "getProperties()"),
+ API286_PORTLET_REQUEST_33(new API(PortletRequest.class), "getProperty()"),
+ API286_PORTLET_REQUEST_34(new API(PortletRequest.class), "getPropertyNames()"),
+ API286_PORTLET_REQUEST_35(new API(PortletRequest.class), "getPublicParameterMap()"),
+ API286_PORTLET_REQUEST_36(new API(PortletRequest.class), "getRemoteUser()"),
+ API286_PORTLET_REQUEST_37(new API(PortletRequest.class), "getRequestedSessionId()"),
+ API286_PORTLET_REQUEST_38(new API(PortletRequest.class), "getResponseContentType()"),
+ API286_PORTLET_REQUEST_39(new API(PortletRequest.class), "getResponseContentTypes()"),
+ API286_PORTLET_REQUEST_40(new API(PortletRequest.class), "getScheme()"),
+ API286_PORTLET_REQUEST_41(new API(PortletRequest.class), "getServerName()"),
+ API286_PORTLET_REQUEST_42(new API(PortletRequest.class), "getServerPort()"),
+ API286_PORTLET_REQUEST_43(new API(PortletRequest.class), "getUserPrincipal()"),
+ API286_PORTLET_REQUEST_44(new API(PortletRequest.class), "getWindowID()"),
+ API286_PORTLET_REQUEST_45(new API(PortletRequest.class), "getWindowState()"),
+ API286_PORTLET_REQUEST_46(new API(PortletRequest.class), "isPortletModeAllowed()"),
+ API286_PORTLET_REQUEST_47(new API(PortletRequest.class), "isRequestedSessionIdValid()"),
+ API286_PORTLET_REQUEST_48(new API(PortletRequest.class), "isSecure()"),
+ API286_PORTLET_REQUEST_49(new API(PortletRequest.class), "isUserInRole()"),
+ API286_PORTLET_REQUEST_50(new API(PortletRequest.class), "isWindowStateAllowed()"),
+ API286_PORTLET_REQUEST_51(new API(PortletRequest.class), "removeAttribute()"),
+ API286_PORTLET_REQUEST_52(new API(PortletRequest.class), "setAttribute"),
+
API286_PORTLET_REQUEST_DISPATCHER(new API(PortletRequestDispatcher.class), ""),
- API286_PORTLET_RESPONSE(new API(PortletResponse.class), ""),
-
+ API286_PORTLET_RESPONSE_1(new API(PortletResponse.class), "addProperty()"),
+ API286_PORTLET_RESPONSE_2(new API(PortletResponse.class), "createElement()"),
+ API286_PORTLET_RESPONSE_3(new API(PortletResponse.class), "encodeURL()"),
+ API286_PORTLET_RESPONSE_4(new API(PortletResponse.class), "getNamespace()"),
+ API286_PORTLET_RESPONSE_5(new API(PortletResponse.class), "setProperty()"),
+
API286_PORTLET_SECURITY_EXCEPTION(new API(PortletSecurityException.class), ""),
- API286_PORTLET_SESSION(new API(PortletSession.class), ""),
+ API286_PORTLET_SESSION_1(new API(PortletSession.class), "APPLICATION_SCOPE"),
+ API286_PORTLET_SESSION_2(new API(PortletSession.class), "PORTLET_SCOPE"),
+ API286_PORTLET_SESSION_3(new API(PortletSession.class), "getAttribute()"),
+ API286_PORTLET_SESSION_4(new API(PortletSession.class), "getAttributeMap()"),
+ API286_PORTLET_SESSION_5(new API(PortletSession.class), "getAttributeNames()"),
+ API286_PORTLET_SESSION_6(new API(PortletSession.class), "getCreationTime()"),
+ API286_PORTLET_SESSION_7(new API(PortletSession.class), "getId()"),
+ API286_PORTLET_SESSION_8(new API(PortletSession.class), "getLastAccessedTime()"),
+ API286_PORTLET_SESSION_9(new API(PortletSession.class), "getMaxInactiveInterval()"),
+ API286_PORTLET_SESSION_10(new API(PortletSession.class), "getPortletContext()"),
+ API286_PORTLET_SESSION_11(new API(PortletSession.class), "invalidate()"),
+ API286_PORTLET_SESSION_12(new API(PortletSession.class), "isNew()"),
+ API286_PORTLET_SESSION_13(new API(PortletSession.class), "removeAttribute()"),
+ API286_PORTLET_SESSION_14(new API(PortletSession.class), "setAttribute()"),
+ API286_PORTLET_SESSION_15(new API(PortletSession.class), "setMaxInactiveInterval()"),
+
+ API286_PORTLET_SESSION_UTIL_1(new API(PortletSessionUtil.class), "decodeAttributeName()"),
+ API286_PORTLET_SESSION_UTIL_2(new API(PortletSessionUtil.class), "decodeScope()"),
- API286_PORTLET_SESSION_UTIL(new API(PortletSessionUtil.class), ""),
-
API286_PORTLET_URL(new API(PortletURL.class), ""),
API286_PORTLET_URL_GENERATION_LISTENER(new API(PortletURLGenerationListener.class), ""),
@@ -1492,11 +1634,15 @@
API286_PROCESS_EVENT(new API(ProcessEvent.class), ""),
+ API286_P3P_USER_INFOS(new API(PortletRequest.P3PUserInfos.class), ""),
+
API286_RENDER_MODE(new API(RenderMode.class), ""),
- API286_RENDER_REQUEST(new API(RenderRequest.class), ""),
+ API286_RENDER_REQUEST_1(new API(RenderRequest.class), "ETAG"),
- API286_RENDER_RESPONSE(new API(RenderResponse.class), ""),
+ API286_RENDER_RESPONSE_1(new API(RenderResponse.class), "setContentType()"),
+ API286_RENDER_RESPONSE_2(new API(RenderResponse.class), "setNextPossiblePortletModes()"),
+ API286_RENDER_RESPONSE_3(new API(RenderResponse.class), "setTitle()"),
API286_RESOURCE_REQUEST(new API(ResourceRequest.class), ""),
@@ -1506,11 +1652,25 @@
API286_RESOURCE_URL(new API(ResourceURL.class), ""),
- API286_STATE_AWARE_RESPONSE(new API(StateAwareResponse.class), ""),
+ API286_STATE_AWARE_RESPONSE_1(new API(StateAwareResponse.class), "getPortletMode()"),
+ API286_STATE_AWARE_RESPONSE_2(new API(StateAwareResponse.class), "getRenderParameterMap()"),
+ API286_STATE_AWARE_RESPONSE_3(new API(StateAwareResponse.class), "getWindowState()"),
+ API286_STATE_AWARE_RESPONSE_4(new API(StateAwareResponse.class), "removePublicRenderParameter()"),
+ API286_STATE_AWARE_RESPONSE_5(new API(StateAwareResponse.class), "setEvent()"),
+ API286_STATE_AWARE_RESPONSE_6(new API(StateAwareResponse.class), "setPortletMode()"),
+ API286_STATE_AWARE_RESPONSE_7(new API(StateAwareResponse.class), "setRenderParameter()"),
+ API286_STATE_AWARE_RESPONSE_8(new API(StateAwareResponse.class), "setRenderParameters()"),
+ API286_STATE_AWARE_RESPONSE_9(new API(StateAwareResponse.class), "setWindowState()"),
+
+ API286_WINDOW_STATE_1(new API(WindowState.class), "WindowState()"),
+ API286_WINDOW_STATE_2(new API(WindowState.class), "MAXIMIZED"),
+ API286_WINDOW_STATE_3(new API(WindowState.class), "MINIMIZED"),
+ API286_WINDOW_STATE_4(new API(WindowState.class), "NORMAL"),
+ API286_WINDOW_STATE_5(new API(WindowState.class), "equals()"),
+ API286_WINDOW_STATE_6(new API(WindowState.class), "hashCode()"),
+ API286_WINDOW_STATE_7(new API(WindowState.class), "toString()"),
- API286_WINDOW_STATE(new API(WindowState.class), ""),
-
// Portlet Filter
API286_ACTION_FILTER(new API(ActionFilter.class), ""),
16 years, 2 months
- 1
- 0