From portal-commits at lists.jboss.org Tue Feb  5 01:12:36 2008
Content-Type: multipart/mixed; boundary="===============4701563530841414615=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9764 - in
 modules/portlet/trunk/test/src:
 main/java/org/jboss/portal/portlet/test/controller2 and 2 other directories.
Date: Tue, 05 Feb 2008 01:12:30 -0500
Message-ID: <E1JMH2k-000307-LB@committer01.frg.pub.inap.atl.jboss.com>

--===============4701563530841414615==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-05 01:12:30 -0500 (Tue, 05 Feb 2008)
New Revision: 9764

Removed:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c=
ontroller/PageUpdate.java
Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c=
ontroller2/ControllerResponseRendererFactory.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/SimpleP=
ortalServlet.java
   modules/portlet/trunk/test/src/test/build.xml
Log:
- Removed extra PageUpdate class.
- Fixed deployment of simple portal.

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/controller/PageUpdate.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/PageUpdate.java	2008-02-05 04:28:33 UTC (rev 9763)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/PageUpdate.java	2008-02-05 06:12:30 UTC (rev 9764)
@@ -1,56 +0,0 @@
-/*************************************************************************=
*****
- * JBoss, a division of Red Hat                                           =
    *
- * Copyright 2006, Red Hat Middleware, LLC, and individual                =
    *
- * contributors as indicated by the @authors tag. See the                 =
    *
- * copyright.txt in the distribution for a full listing of                =
    *
- * individual contributors.                                               =
    *
- *                                                                        =
    *
- * This is free software; you can redistribute it and/or modify it        =
    *
- * under the terms of the GNU Lesser General Public License as            =
    *
- * published by the Free Software Foundation; either version 2.1 of       =
    *
- * the License, or (at your option) any later version.                    =
    *
- *                                                                        =
    *
- * This software is distributed in the hope that it will be useful,       =
    *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of         =
    *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU       =
    *
- * Lesser General Public License for more details.                        =
    *
- *                                                                        =
    *
- * You should have received a copy of the GNU Lesser General Public       =
    *
- * License along with this software; if not, write to the Free            =
    *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA     =
    *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.               =
    *
- *************************************************************************=
*****/
-package org.jboss.portal.portlet.test.controller;
-
-import org.jboss.portal.portlet.invocation.response.ResponseProperties;
-import org.jboss.portal.portlet.test.controller.response.ControllerRespons=
e;
-
-/**
- * @author <a href=3D"mailto:julien(a)jboss.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class PageUpdate extends ControllerResponse
-{
-
-   /** . */
-   private ResponseProperties properties;
-
-   /** . */
-   private PageNavigationalState pageState;
-
-   public PageUpdate(ResponseProperties properties, PageNavigationalState =
pageState)
-   {
-      this.properties =3D properties;
-      this.pageState =3D pageState;
-   }
-
-   public ResponseProperties getProperties()
-   {
-      return properties;
-   }
-
-   public PageNavigationalState getPageState()
-   {
-      return pageState;
-   }
-}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/controller2/ControllerResponseRendererFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller2/ControllerResponseRendererFactory.java	2008-02-05 04:28:33 UTC =
(rev 9763)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller2/ControllerResponseRendererFactory.java	2008-02-05 06:12:30 UTC =
(rev 9764)
@@ -23,9 +23,9 @@
 package org.jboss.portal.portlet.test.controller2;
 =

 import org.jboss.portal.portlet.test.controller.response.ControllerRespons=
e;
+import org.jboss.portal.portlet.test.controller.response.ErrorControllerRe=
sponse;
 import org.jboss.portal.portlet.test.controller.response.PageUpdate;
 import org.jboss.portal.portlet.test.controller.response.RedirectControlle=
rResponse;
-import org.jboss.portal.portlet.test.controller.response.ErrorControllerRe=
sponse;
 import org.jboss.portal.portlet.test.controller.response.ResourceControlle=
rResponse;
 =

 /**
@@ -54,6 +54,6 @@
       }
 =

       //
-      return null;
+      throw new IllegalArgumentException("Unknown response type: " + respo=
nse);
    }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/=
SimplePortalServlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/Simple=
PortalServlet.java	2008-02-05 04:28:33 UTC (rev 9763)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/Simple=
PortalServlet.java	2008-02-05 06:12:30 UTC (rev 9764)
@@ -22,11 +22,14 @@
  *************************************************************************=
*****/
 package org.jboss.portal.simple;
 =

+import org.jboss.portal.portlet.invocation.response.ResponseProperties;
+import org.jboss.portal.portlet.test.controller.PageNavigationalState;
+import org.jboss.portal.portlet.test.controller.PortletController;
 import org.jboss.portal.portlet.test.controller.response.ControllerRespons=
e;
-import org.jboss.portal.portlet.test.controller.PortletController;
-import org.jboss.portal.portlet.test.controller2.PortletControllerContextI=
mpl;
+import org.jboss.portal.portlet.test.controller.response.PageUpdate;
 import org.jboss.portal.portlet.test.controller2.ControllerResponseRendere=
r;
 import org.jboss.portal.portlet.test.controller2.ControllerResponseRendere=
rFactory;
+import org.jboss.portal.portlet.test.controller2.PortletControllerContextI=
mpl;
 =

 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -72,13 +75,26 @@
       //
       PortletController controller =3D new PortletController();
 =

-      //
-      ControllerResponse response =3D controller.process(context.getReques=
t());
+      if (context.getRequest() !=3D null)
+      {
+         //
+         ControllerResponse response =3D controller.process(context.getReq=
uest());
 =

-      //
-      ControllerResponseRenderer renderer =3D  ControllerResponseRendererF=
actory.getRenderer(response);
+         //
+         ControllerResponseRenderer renderer =3D ControllerResponseRendere=
rFactory.getRenderer(response);
 =

-      //
-      renderer.render(context);
+         //
+         renderer.render(context);
+      }
+      else
+      {
+         PageUpdate pageUpdate =3D new PageUpdate(new ResponseProperties()=
, new PageNavigationalState());
+
+         //
+         ControllerResponseRenderer renderer =3D ControllerResponseRendere=
rFactory.getRenderer(pageUpdate);
+
+         //
+         renderer.render(context);
+      }
    }
 }
\ No newline at end of file

Modified: modules/portlet/trunk/test/src/test/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/build.xml	2008-02-05 04:28:33 UTC (=
rev 9763)
+++ modules/portlet/trunk/test/src/test/build.xml	2008-02-05 06:12:30 UTC (=
rev 9764)
@@ -626,8 +626,7 @@
          home=3D"${test.tomcat-6.home}"
          log=3D"${cargo.log.dir}/cargo.${test.id}.shutdown.log"
          action=3D"stop">
-         <configuration>
-         </configuration>
+         <configuration/>
       </cargo>
    </target>
 =

@@ -639,8 +638,7 @@
       <antcall target=3D"tests.remote">
          <param name=3D"test.server.name" value=3D"RemoteTomcat_6_0"/>
       </antcall>
-      <antcall target=3D"cargo.tomcat-6.stop">
-      </antcall>
+      <antcall target=3D"cargo.tomcat-6.stop"/>
    </target>
 =

    <target name=3D"tests.tomcat-6">
@@ -653,8 +651,7 @@
    </target>
 =

    <target name=3D"tests.tomcat">
-      <antcall target=3D"tests.tomcat-6">
-      </antcall>
+      <antcall target=3D"tests.tomcat-6"/>
    </target>
 =

    <target name=3D"tests.remote">
@@ -687,11 +684,17 @@
 =

    <target name=3D"package-simple-portal" depends=3D"prepare_env">
 =

+      <delete dir=3D"${target}/simple-portal"/>
+
       <jar jarfile=3D"${target}/portlet-test-lib.jar">
          <!--<fileset dir=3D"${target}/test-classes"/>-->
          <fileset dir=3D"${target}/classes"/>
       </jar>
 =

+      <copy todir=3D"${test.temp.dir}/simple-portal-war">
+         <fileset dir=3D"src/test/resources/simple-portal-war"/>
+      </copy>
+
       <!-- simple-portal.war -->
       <copy todir=3D"${test.temp.dir}/simple-portal-war/WEB-INF/lib" flatt=
en=3D"true">
 =

@@ -730,12 +733,26 @@
 =

       </copy>
 =

-      <jar jarfile=3D"${target}/simple-portal.war">
+      <mkdir dir=3D"${target}/simple-portal"/>
+
+      <jar jarfile=3D"${target}/simple-portal/simple-portal.war">
          <fileset dir=3D"${test.temp.dir}/simple-portal-war"/>
-      </jar>     =

+      </jar>
 =

+      <copy todir=3D"${target}/simple-portal" flatten=3D"true">
+         <path>
+            <pathelement path=3D"${dependency.portal-common.jar}"/>
+            <pathelement path=3D"${dependency.portal-web.jar}"/>
+            <pathelement path=3D"${dependency.jsr168api.jar}"/>
+         </path>
+      </copy>
+
       <delete file=3D"${target}/portlet-test-lib.jar"/>
 =

    </target>
 =

+   <!--<target name=3D"package-demo-portlets" depends=3D"prepare_env">
+      <copy =

+   </target>-->
+
 </project>
\ No newline at end of file


--===============4701563530841414615==--