portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r757407 [2/2] - in /portals/jetspeed-2/portal/trunk: components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/services/ components/jetspeed-portlet-factory/ components/jetspeed-portlet-factory/src/ components/jetspeed-portlet-...
Date Mon, 23 Mar 2009 15:09:24 GMT
Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/factory/PortletFilterInstance.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/factory/PortletFilterInstance.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/factory/PortletFilterInstance.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/factory/PortletInstance.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/factory/PortletInstance.java?rev=757407&r1=757406&r2=757407&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/factory/PortletInstance.java
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/factory/PortletInstance.java
Mon Mar 23 15:09:19 2009
@@ -33,4 +33,5 @@
 {
     JetspeedPortletConfig getConfig();
     Portlet getRealPortlet();
+    boolean isProxyInstance();
 }
\ No newline at end of file

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Filter.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Filter.java?rev=757407&r1=757406&r2=757407&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Filter.java
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Filter.java
Mon Mar 23 15:09:19 2009
@@ -19,8 +19,6 @@
 import java.util.List;
 import java.util.Locale;
 
-import javax.portlet.filter.PortletFilter;
-
 /**
  * 
  * @version $Id$
@@ -39,6 +37,4 @@
 	InitParam getInitParam(String paramName);
 	List<InitParam> getInitParams();
 	InitParam addInitParam(String paramName);
-	
-	PortletFilter getFilterInstance(ClassLoader loader) throws InstantiationException, IllegalAccessException,
ClassNotFoundException;
 }
\ No newline at end of file

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Listener.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Listener.java?rev=757407&r1=757406&r2=757407&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Listener.java
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Listener.java
Mon Mar 23 15:09:19 2009
@@ -19,8 +19,6 @@
 import java.util.List;
 import java.util.Locale;
 
-import javax.portlet.PortletURLGenerationListener;
-
 /**
  * 
  * @version $Id$
@@ -35,6 +33,4 @@
 	DisplayName getDisplayName(Locale locale);
     List<DisplayName> getDisplayNames();
     DisplayName addDisplayName(String lang);
-    
-    PortletURLGenerationListener getListenerInstance(ClassLoader loader) throws ClassNotFoundException,
InstantiationException, IllegalAccessException;
 }
\ No newline at end of file

Modified: portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/PortletObjectProxy.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/PortletObjectProxy.java?rev=757407&r1=757406&r2=757407&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/PortletObjectProxy.java
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/PortletObjectProxy.java
Mon Mar 23 15:09:19 2009
@@ -62,23 +62,6 @@
 public class PortletObjectProxy extends BaseObjectProxy
 {
     
-    private static ThreadLocal tlPortletObjectProxied =
-        new ThreadLocal() {
-            protected synchronized Object initialValue() {
-                return new boolean [] { false };
-            }
-        };
-    
-    public static void setPortletObjectProxied(boolean portletObjectProxied)
-    {
-        ((boolean []) tlPortletObjectProxied.get())[0] = portletObjectProxied;
-    }
-        
-    public static boolean isPortletObjectProxied()
-    {
-        return ((boolean []) tlPortletObjectProxied.get())[0];
-    }
-    
     private static Method renderMethod;
     private static Method processActionMethod;
     
@@ -320,28 +303,17 @@
         return false;
     }
        
-    private void refreshCustomConfigModePortletInstance()
+    private void refreshCustomConfigModePortletInstance() throws PortletException
     {
-        try
-        {
-            PortletRegistry registry = (PortletRegistry) Jetspeed.getComponentManager().getComponent("portletRegistry");
-            PortletFactory portletFactory = (PortletFactory) Jetspeed.getComponentManager().getComponent("portletFactory");
-            ServletContext portalAppContext = ((ServletConfig) Jetspeed.getComponentManager().getComponent("ServletConfig")).getServletContext();
-            
-            PortletDefinition portletDef = registry.getPortletDefinitionByUniqueName(this.customConfigModePortletUniqueName);
-            PortletApplication portletApp = portletDef.getApplication();
-            ServletContext portletAppContext = portalAppContext.getContext(portletApp.getContextPath());
-            
-            setPortletObjectProxied(true);
-            this.customConfigModePortletInstance = portletFactory.getPortletInstance(portletAppContext,
portletDef);
-        }
-        catch (Exception e)
-        {
-        }
-        finally
-        {
-            setPortletObjectProxied(false);
-        }
+        PortletRegistry registry = (PortletRegistry) Jetspeed.getComponentManager().getComponent("portletRegistry");
+        PortletFactory portletFactory = (PortletFactory) Jetspeed.getComponentManager().getComponent("portletFactory");
+        ServletContext portalAppContext = ((ServletConfig) Jetspeed.getComponentManager().getComponent("ServletConfig")).getServletContext();
+        
+        PortletDefinition portletDef = registry.getPortletDefinitionByUniqueName(this.customConfigModePortletUniqueName);
+        PortletApplication portletApp = portletDef.getApplication();
+        ServletContext portletAppContext = portalAppContext.getContext(portletApp.getContextPath());
+        
+        this.customConfigModePortletInstance = portletFactory.getPortletInstance(portletAppContext,
portletDef, false);
     }
     
 }

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml?rev=757407&r1=757406&r2=757407&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml
Mon Mar 23 15:09:19 2009
@@ -66,12 +66,14 @@
     
     <bean id="org.apache.pluto.container.FilterManagerService"
           class="org.apache.jetspeed.container.services.JetspeedFilterManagerService">
-      <meta key="j2:cat" value="default" />       
+      <meta key="j2:cat" value="default" />
+      <constructor-arg><ref bean="portletFactory" /></constructor-arg>
     </bean>
     
     <bean id="org.apache.pluto.container.PortletURLListenerService"
           class="org.apache.jetspeed.container.services.JetspeedPortletURLListenerService">
       <meta key="j2:cat" value="default" />       
+      <constructor-arg><ref bean="portletFactory" /></constructor-arg>
     </bean>
     
 



---------------------------------------------------------------------
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