Author: julien(a)jboss.com Date: 2008-06-13 07:12:25 -0400 (Fri, 13 Jun 2008) New Revision: 11029 Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java modules/portlet/trunk/test/src/test/build.xml Log: - avoid to use covariant return type in PortletRequestImpl - update build.xml to correctly build the tck artifacts Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java 2008-06-13 11:02:18 UTC (rev 11028) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java 2008-06-13 11:12:25 UTC (rev 11029) @@ -55,6 +55,7 @@ import javax.portlet.PreferencesValidator; import javax.portlet.RenderRequest; import javax.portlet.WindowState; +import javax.portlet.PortletSession; import javax.servlet.http.HttpSession; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequestWrapper; @@ -405,12 +406,12 @@ // - public PortletSessionImpl getPortletSession() + public PortletSession getPortletSession() { return getPortletSession(true); } - public PortletSessionImpl getPortletSession(boolean create) + public PortletSession getPortletSession(boolean create) { // Dereference an existing session if it is not valid if (psession != null && !psession.isValid()) Modified: modules/portlet/trunk/test/src/test/build.xml =================================================================== --- modules/portlet/trunk/test/src/test/build.xml 2008-06-13 11:02:18 UTC (rev 11028) +++ modules/portlet/trunk/test/src/test/build.xml 2008-06-13 11:12:25 UTC (rev 11029) @@ -16,8 +16,8 @@ <antcall target="package-tests"/> - <antcall target="tests.call.single"/> - <antcall target="tests.call.all"/> + <!--<antcall target="tests.call.single"/>--> + <!--<antcall target="tests.call.all"/>--> </target> @@ -448,7 +448,6 @@ org.jboss.ws.integration.jboss42.DeployerInterceptorJSE.isWebserviceDeployment(DeployerInterceptorJSE.java:84) --> - <cargo containerId="jboss42x" home="${test.jboss-4.2.home}" @@ -638,13 +637,10 @@ <property name="tck-jboss" value="${tck}/jboss42"/> <property name="tck-tomcat" value="${tck}/tomcat6"/> - <mkdir dir="${tck}"/> <mkdir dir="${tck-jboss}"/> <mkdir dir="${tck-tomcat}"/> - <!--<mkdir dir="${tck}/tomcat6"/>--> - <jar jarfile="${target}/portlet-test-lib.jar"> <fileset dir="${target}/classes" excludes="org/jboss/portal/portlet/portal/samples/**"/> </jar> @@ -656,26 +652,10 @@ <fileset dir="${target}/test-classes/jboss-4.2/portlet-tck-war"/> </copy> -<!-- <copy todir="${tck-jboss}/portlet-tck-war/WEB-INF/lib" flatten="true"> - - <fileset dir="${target}" includes="portlet-test-lib.jar"/> - <path refid="mc.portal-common"/> - <path refid="mc.portal-portlet-controller"/> - <path refid="mc.portal-portlet-mc"/> - <path refid="mc.jboss-remoting"/> - <path refid="mc.portal-test-generic"/> - <path refid="mc.trove"/> - <path refid="mc.javassist"/> - <path refid="mc.jboss_common_core"/> - <path refid="mc.jboss_vfs"/> - <path refid="mc.jboss_xb"/> - <path refid="mc.jboss_aop"/> - <path refid="mc.jboss_microcontainer"/> - - + <fileset dir="${test.temp.lib}" includes="portlet-test-lib.jar"/> + <path refid="jboss-4.2"/> </copy> ---> <mkdir dir="${tck-jboss}/tck-portal"/> @@ -683,23 +663,9 @@ <fileset dir="${tck-jboss}/portlet-tck-war"/> </jar> -<!-- <copy todir="${tck-jboss}/tck-portal" flatten="true"> - - <path location="${dependency.portal-common.jar}"/> - <path location="${dependency.portal-common-portal.jar}"/> - <path location="${dependency.portal-portlet.jar}"/> - <path location="${dependency.portal-web.jar}"/> - <path location="${dependency.jsr168api.jar}"/> - <path location="${dependency.ccpp.jar}"/> - <path location="${dependency.jaxb.jar}"/> - - <path location="${dependency.jboss-unit.jar}"/> - <path location="${dependency.jboss-unit-remote.jar}"/> - <path location="${dependency.portal-test.jar}"/> - + <path refid="jboss-4.2-shared"/> </copy> ---> <!--TOMCAT--> @@ -710,26 +676,10 @@ <fileset dir="${target}/test-classes/tomcat-6.0/portlet-tck-war"/> </copy> -<!-- <copy todir="${tck-tomcat}/portlet-tck-war/WEB-INF/lib" flatten="true"> - <fileset dir="${target}" includes="portlet-test-lib.jar"/> - <path refid="mc.portal-common"/> - <path refid="mc.portal-portlet-controller"/> - <path refid="mc.portal-portlet-mc"/> - <path refid="mc.jboss-remoting"/> - <path refid="mc.portal-test-generic"/> - <path refid="mc.trove"/> - <path refid="mc.xerces"/> - <path refid="mc.javassist"/> - <path refid="mc.jboss_common_core"/> - <path refid="mc.jboss_vfs"/> - <path refid="mc.jboss_xb"/> - <path refid="mc.jboss_aop"/> - <path refid="mc.jboss_microcontainer"/> - + <path refid="tomcat-6.0"/> </copy> ---> <mkdir dir="${tck-tomcat}/tck-portal"/> @@ -737,27 +687,9 @@ <fileset dir="${tck-tomcat}/portlet-tck-war"/> </jar> -<!-- <copy todir="${tck-tomcat}/tck-portal" flatten="true"> - - <path location="${dependency.log4j.jar}"/> - <path location="${dependency.concurrent.jar}"/> - <path location="${dependency.activation.jar}"/> - <path location="${dependency.jaxb.jar}"/> - <path refid="mc.jboss_common_logging_spi"/> - <path refid="mc.jboss_common_logging_jdk"/> - <path location="${dependency.portal-common.jar}"/> - <path location="${dependency.portal-common-portal.jar}"/> - <path location="${dependency.portal-portlet.jar}"/> - <path location="${dependency.portal-web.jar}"/> - <path location="${dependency.jsr168api.jar}"/> - <path location="${dependency.ccpp.jar}"/> - <path location="${dependency.jboss-unit.jar}"/> - <path location="${dependency.jboss-unit-remote.jar}"/> - <path location="${dependency.portal-test.jar}"/> - + <path refid="tomcat-6.0-shared"/> </copy> ---> <delete file="${target}/portlet-test-lib.jar"/>