portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r722056 - in /portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade: components/jetspeed-portal/src/test/java/org/apache/jetspeed/ components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/ components/jetspeed-p...
Date Mon, 01 Dec 2008 12:12:57 GMT
Author: woonsan
Date: Mon Dec  1 04:12:56 2008
New Revision: 722056

URL: http://svn.apache.org/viewvc?rev=722056&view=rev
Log:
Fixed to pass 'path' for creating non-named dispatchers.

Modified:
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/PortletFactoryMock.java
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/factory/PortletFactory.java

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/PortletFactoryMock.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/PortletFactoryMock.java?rev=722056&r1=722055&r2=722056&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/PortletFactoryMock.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/PortletFactoryMock.java
Mon Dec  1 04:12:56 2008
@@ -17,13 +17,15 @@
 package org.apache.jetspeed;
 
 import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
 import javax.portlet.PreferencesValidator;
+import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletContext;
 
 import org.apache.jetspeed.factory.PortletFactory;
 import org.apache.jetspeed.factory.PortletInstance;
 import org.apache.jetspeed.om.portlet.PortletApplication;
-import org.apache.pluto.om.portlet.PortletDefinition;
+import org.apache.jetspeed.om.portlet.PortletDefinition;
 
 public final class PortletFactoryMock implements PortletFactory
 {
@@ -42,4 +44,10 @@
     public static final PortletFactoryMock instance = new PortletFactoryMock();
     
     public void updatePortletConfig(PortletDefinition pd) {}
+
+    public void setPortalContext(PortalContext portalContext) {}
+    
+    public PortletRequestDispatcher createRequestDispatcher(RequestDispatcher requestDispatcher)
{ return null; }
+    
+    public PortletRequestDispatcher createRequestDispatcher(RequestDispatcher requestDispatcher,
String path) { return null; }
 }
\ No newline at end of file

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java?rev=722056&r1=722055&r2=722056&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java
Mon Dec  1 04:12:56 2008
@@ -83,7 +83,7 @@
         }
         if (rd != null)
         {
-            return factory.createRequestDispatcher(rd);
+            return factory.createRequestDispatcher(rd, path);
         }
         return null;
     }

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java?rev=722056&r1=722055&r2=722056&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java
Mon Dec  1 04:12:56 2008
@@ -374,5 +374,11 @@
     {
         // return new JetspeedRequestDispatcher(requestDispatcher);
         return new PortletRequestDispatcherImpl(requestDispatcher);
+    }
+    
+    public PortletRequestDispatcher createRequestDispatcher(RequestDispatcher requestDispatcher,
String path)
+    {
+        // return new JetspeedRequestDispatcher(requestDispatcher);
+        return new PortletRequestDispatcherImpl(requestDispatcher, path);
     }    
 }

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/factory/PortletFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/factory/PortletFactory.java?rev=722056&r1=722055&r2=722056&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/factory/PortletFactory.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/factory/PortletFactory.java
Mon Dec  1 04:12:56 2008
@@ -50,4 +50,5 @@
     PreferencesValidator getPreferencesValidator(PortletDefinition pd);
     void updatePortletConfig(PortletDefinition pd);
     PortletRequestDispatcher createRequestDispatcher(RequestDispatcher requestDispatcher);
+    PortletRequestDispatcher createRequestDispatcher(RequestDispatcher requestDispatcher,
String path);
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message