You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by de...@apache.org on 2007/09/08 12:25:49 UTC

svn commit: r573811 - in /portals/pluto/branches/1.1-286-COMPATIBILITY: pluto-container/src/main/java/org/apache/pluto/core/ pluto-container/src/main/java/org/apache/pluto/internal/impl/ pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/p...

Author: dettborn
Date: Sat Sep  8 03:25:46 2007
New Revision: 573811

URL: http://svn.apache.org/viewvc?rev=573811&view=rev
Log:
Committed patch: PortletFilter_090807.patch from JIRA 371 (http://issues.apache.org/jira/browse/PLUTO-371).

Modified:
    portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/core/PortletServlet.java
    portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/MimeResponseImpl.java
    portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java
    portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/FilterDD.java
    portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java
    portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterChainImpl.java
    portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterManagerImpl.java
    portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java

Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/core/PortletServlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/core/PortletServlet.java?rev=573811&r1=573810&r2=573811&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/core/PortletServlet.java (original)
+++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/core/PortletServlet.java Sat Sep  8 03:25:46 2007
@@ -234,6 +234,7 @@
                     	(ResourceRequestImpl) portletRequest;
             	ResourceResponseImpl resourceResponse =
                     	(ResourceResponseImpl) portletResponse;
+            	filtermanager.processFilter(resourceRequest, resourceResponse, loader, portletName, portletContext,"RESOURCE_PHASE");
             	resourceServingPortlet.serveResource(resourceRequest, resourceResponse);
             }
             
@@ -243,6 +244,7 @@
                     	(ActionRequestImpl) portletRequest;
                 ActionResponseImpl actionResponse =
                     	(ActionResponseImpl) portletResponse;
+                filtermanager.processFilter(actionRequest, actionResponse, loader, portletName, portletContext,"ACTION_PHASE");
                 portlet.processAction(actionRequest, actionResponse);
             }
             
@@ -252,6 +254,7 @@
                 	(EventRequestImpl) portletRequest;
             	EventResponseImpl eventResponse =
                 	(EventResponseImpl) portletResponse;
+            	filtermanager.processFilter(eventRequest, eventResponse, loader, portletName, portletContext,"EVENT_PHASE");
             	eventPortlet.processEvent(eventRequest, eventResponse);
             }
             

Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/MimeResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/MimeResponseImpl.java?rev=573811&r1=573810&r2=573811&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/MimeResponseImpl.java (original)
+++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/MimeResponseImpl.java Sat Sep  8 03:25:46 2007
@@ -67,9 +67,13 @@
     }
     
 	@Override
-    public int getBufferSize() {
-        return getHttpServletResponse().getBufferSize();
-    }
+	public int getBufferSize() {
+		if (super.isForwarded() || super.isIncluded()){
+			return 0;
+		}
+		else
+			return 0;
+	}
     
 	public CacheControl getCacheControl() {
 		// TODO Auto-generated method stub

Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java?rev=573811&r1=573810&r2=573811&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java (original)
+++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java Sat Sep  8 03:25:46 2007
@@ -629,13 +629,17 @@
 			super.flushBuffer();
 	}
 
+	/*
+	 * The pluto implementation don't works with buffering.
+	 * @see javax.servlet.ServletResponseWrapper#getBufferSize()
+	 */
 	@Override
 	public int getBufferSize() {
 		if (super.isForwarded() || super.isIncluded()){
 			return 0;
 		}
 		else
-			return super.getBufferSize();
+			return 0;
 	}
 
 	@Override

Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/FilterDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/FilterDD.java?rev=573811&r1=573810&r2=573811&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/FilterDD.java (original)
+++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/FilterDD.java Sat Sep  8 03:25:46 2007
@@ -32,7 +32,7 @@
 	private String filterClass = null;
 	
 	@XmlElement (name = "lifecycle")
-	private String lifecycle = null;
+	private List<String> lifecycle = null;
 	
 	@XmlElement (name = "init-param")
 	private List<InitParamDD> initParam = null;
@@ -77,11 +77,11 @@
 		this.initParam = initParam;
 	}
 
-	public String getLifecycle() {
+	public List getLifecycle() {
 		return lifecycle;
 	}
 
-	public void setLifecycle(String lifecycle) {
+	public void setLifecycle(List<String> lifecycle) {
 		this.lifecycle = lifecycle;
 	}
 }

Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java?rev=573811&r1=573810&r2=573811&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java (original)
+++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java Sat Sep  8 03:25:46 2007
@@ -323,7 +323,7 @@
 			assertEquals(portletApp286.getSecurityConstraint().get(0).getPortletCollection().getPortletName().get(0), "portlet-name");
 			assertEquals(portletApp286.getEvents().get(0).getJavaClass(), "java-class");
 //			assertEquals(portletApp286.getRender().get(0).getName(), "QName");
-			assertEquals(portletApp286.getFilter().get(0).getLifecycle(), "lifecycle");
+			assertEquals(portletApp286.getFilter().get(0).getLifecycle().get(0), "lifecycle");
 			assertEquals(portletApp286.getFilterMapping().get(0).getPortletName().get(0), "portlet-name");
 			assertEquals(portletApp286.getResourceBundle(), "resource-bundle");
 			assertEquals(portletApp286.getVersion(), "2.0");

Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterChainImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterChainImpl.java?rev=573811&r1=573810&r2=573811&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterChainImpl.java (original)
+++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterChainImpl.java Sat Sep  8 03:25:46 2007
@@ -26,6 +26,8 @@
 import javax.portlet.EventResponse;
 import javax.portlet.PortletContext;
 import javax.portlet.PortletException;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 import javax.portlet.ResourceRequest;
@@ -55,6 +57,7 @@
 	ClassLoader loader;
 	String portletName;
 	PortletContext portletContext;
+	private int index = -1;
 	
 	/**
 	 * The class capsulate the PortletFilter and the parameter for the
@@ -89,8 +92,27 @@
 		 * @return true if contains, false else.
 		 */
 		public boolean isFilterForPortlet(String portletName){
-			// TODO: update for wildcards
-			return this.portletNames.contains(portletName);
+			if (portletNames == null){
+				return false;
+			}
+			for (int i = 0; i < portletNames.size();i++){
+				String name = portletNames.get(i);
+				if (name.endsWith("*")){
+					if (name.length()== 1){
+						//if only *
+						return true;
+					}
+					name = name.substring(0, name.length()-1);
+					if (portletName.length()>=name.length()){
+						if (portletName.substring(0, name.length()).equals(name))
+							return true;
+					}
+				}
+				else if(name.equals(portletName))
+					return true;
+			}
+			return false;
+//			return this.portletNames.contains(portletName);
 		}
 		
 		/**
@@ -132,26 +154,29 @@
 	 * @param portletNames
 	 * @param lifecycle
 	 */
-	public void addFilter(String className, FilterConfigImpl filterConfig, List<String> portletNames, String lifecycle){
+	public void addFilter(String className, FilterConfigImpl filterConfig, List<String> portletNames, List lifecycle){
 		PortletFilter portletFilter = new PortletFilter(className, filterConfig, portletNames);
-		if (lifecycle.equals(FilterManagerImpl.ACTION_PHASE)){
-			actionFilters.add(portletFilter);
-		}
-		else if (lifecycle.equals(FilterManagerImpl.EVENT_PHASE)){
-			eventFilters.add(portletFilter);
-		}
-
-		else if (lifecycle.equals(FilterManagerImpl.RENDER_PHASE)){
-			renderFilters.add(portletFilter);
-		}
-		else if (lifecycle.equals(FilterManagerImpl.RESOURCE_PHASE)){
-			resourceFilters.add(portletFilter);
+		for (int i = 0; i < lifecycle.size();i++){
+			if (lifecycle.get(i).equals(FilterManagerImpl.ACTION_PHASE)){
+				actionFilters.add(portletFilter);
+			}
+			else if (lifecycle.get(i).equals(FilterManagerImpl.EVENT_PHASE)){
+				eventFilters.add(portletFilter);
+			}
+			else if (lifecycle.get(i).equals(FilterManagerImpl.RENDER_PHASE)){
+				renderFilters.add(portletFilter);
+			}
+			else if (lifecycle.get(i).equals(FilterManagerImpl.RESOURCE_PHASE)){
+				resourceFilters.add(portletFilter);
+			}
 		}
 	}
 	
 	public void doFilter(ActionRequest request, ActionResponse response) throws IOException, PortletException {
 		if (actionFilters!= null){
-			for (PortletFilter filter2 : actionFilters) {
+			index++;
+			if (index < actionFilters.size()){
+				PortletFilter filter2 = actionFilters.get(index);
 				if (filter2.isFilterForPortlet(portletName)){
 					ActionFilter actionfilter;
 					try {
@@ -159,6 +184,7 @@
 						actionfilter = (ActionFilter) filter2.getFilterClass().newInstance();
 						actionfilter.init(filter2.getFilterConfig());
 						actionfilter.doFilter(request, response, this);
+						actionfilter.destroy();
 					} catch (InstantiationException e) {
 						// TODO Auto-generated catch block
 						e.printStackTrace();
@@ -170,13 +196,18 @@
 						e.printStackTrace();
 					}
 				}
+				else{
+					doFilter(request, response);
+				}
 			}
 		}
 	}
 
 	public void doFilter(EventRequest request, EventResponse response) throws IOException, PortletException {
 		if (eventFilters!= null){
-			for (PortletFilter filter2 : eventFilters) {
+			index++;
+			if (index < eventFilters.size()){
+				PortletFilter filter2 = eventFilters.get(index); 
 				if (filter2.isFilterForPortlet(portletName)){
 					EventFilter eventfilter;
 					try {
@@ -184,6 +215,7 @@
 						eventfilter = (EventFilter) filter2.getFilterClass().newInstance();
 						eventfilter.init(filter2.getFilterConfig());
 						eventfilter.doFilter(request, response, this);
+						eventfilter.destroy();
 					} catch (InstantiationException e) {
 						// TODO Auto-generated catch block
 						e.printStackTrace();
@@ -195,13 +227,18 @@
 						e.printStackTrace();
 					}
 				}
+				else{
+					doFilter(request, response);
+				}
 			}
 		}
 	}
 
 	public void doFilter(RenderRequest request, RenderResponse response) throws IOException, PortletException {
 		if (renderFilters!= null){
-			for (PortletFilter filter2 : renderFilters) {
+			index++;
+			if (index < renderFilters.size()){
+				PortletFilter filter2 = renderFilters.get(index);
 				if (filter2.isFilterForPortlet(portletName)){
 					RenderFilter renderfilter;
 					try {
@@ -209,6 +246,7 @@
 						renderfilter = (RenderFilter) filter2.getFilterClass().newInstance();
 						renderfilter.init(filter2.getFilterConfig());
 						renderfilter.doFilter(request, response, this);
+						renderfilter.destroy();
 					} catch (InstantiationException e) {
 						// TODO Auto-generated catch block
 						e.printStackTrace();
@@ -220,13 +258,18 @@
 						e.printStackTrace();
 					}
 				}
+				else{
+					doFilter(request, response);
+				}
 			}
 		}
 	}
 
 	public void doFilter(ResourceRequest request, ResourceResponse response) throws IOException, PortletException {
 		if (resourceFilters!= null){
-			for (PortletFilter filter2 : resourceFilters) {
+			index++;
+			if (index < resourceFilters.size()){
+				PortletFilter filter2 = resourceFilters.get(index);
 				if (filter2.isFilterForPortlet(portletName)){
 					ResourceFilter resourcefilter;
 					try {
@@ -234,6 +277,7 @@
 						resourcefilter = (ResourceFilter) filter2.getFilterClass().newInstance();
 						resourcefilter.init(filter2.getFilterConfig());
 						resourcefilter.doFilter(request, response, this);
+						resourcefilter.destroy();
 					} catch (InstantiationException e) {
 						// TODO Auto-generated catch block
 						e.printStackTrace();
@@ -245,6 +289,9 @@
 						e.printStackTrace();
 					}
 				}
+				else{
+					doFilter(request, response);
+				}
 			}
 		}
 	}
@@ -255,6 +302,14 @@
 	 */
 	public String getAppName() {
 		return appName;
+	}
+
+	public int getIndex() {
+		return index;
+	}
+
+	public void setIndex(int index) {
+		this.index = index;
 	}
 
 }

Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterManagerImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterManagerImpl.java?rev=573811&r1=573810&r2=573811&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterManagerImpl.java (original)
+++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterManagerImpl.java Sat Sep  8 03:25:46 2007
@@ -77,6 +77,7 @@
 				//initialize the rest of the needed data
 				filterChain2.setFilterData(loader, portletName, portletContext);
 				try {
+					filterChain2.setIndex(-1);
 					if (lifecycle.equals(ACTION_PHASE)){
 							filterChain2.doFilter((ActionRequest)req, (ActionResponse)res);	
 					}

Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java?rev=573811&r1=573810&r2=573811&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java (original)
+++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLParserImpl.java Sat Sep  8 03:25:46 2007
@@ -257,7 +257,9 @@
             
             // Encode action params in the query appended at the end of the URL.
             if (portalURL.getActionWindow() != null
-            		&& portalURL.getActionWindow().equals(param.getWindowId())) {
+            		&& portalURL.getActionWindow().equals(param.getWindowId())
+            		|| (portalURL.getResourceWindow() != null
+            				&& portalURL.getResourceWindow().equals(param.getWindowId()))) {
                 for (int i = 0; i < param.getValues().length; i++) {
                     query.append("&").append(encodeQueryParam(param.getName())).append("=")
                     		.append(encodeQueryParam(param.getValues()[i]));