svn commit: [jahia] r17740 - /trunk/core/src/java/org/jahia/services/applications/ApplicationsManagerJetspeedProvider.java

[tdraier]

Author: tdraier
Date: Mon Jun 25 14:31:34 2007
New Revision: 17740

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17740&repname=
=3Djahia
Log:
allow processingcontext for creating jetspeed contexts ( backport 17324 )

Modified:
    trunk/core/src/java/org/jahia/services/applications/ApplicationsManager=
JetspeedProvider.java

Modified: trunk/core/src/java/org/jahia/services/applications/ApplicationsM=
anagerJetspeedProvider.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/applications/ApplicationsManagerJetspeedProvider.java&rev=
=3D17740&repname=3Djahia
=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=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/applications/ApplicationsManager=
JetspeedProvider.java (original)
+++ trunk/core/src/java/org/jahia/services/applications/ApplicationsManager=
JetspeedProvider.java Mon Jun 25 14:31:34 2007
@@ -43,6 +43,7 @@
 import org.jahia.services.usermanager.JahiaUserManagerService;
 import org.jahia.settings.SettingsBean;
 import org.jahia.params.ParamBean;
+import org.jahia.params.ProcessingContext;
 import org.jahia.bin.Jahia;
 =

 import javax.servlet.http.HttpServletRequest;
@@ -492,7 +493,7 @@
         PortletEntity pe =3D peAccess.newPortletEntityInstance(portletDefi=
nition);
         RequestContextComponent contextComponent =3D null;
         contextComponent =3D (RequestContextComponent)Jetspeed.getComponen=
tManager().getComponent(RequestContextComponent.class);
-        ParamBean paramBean =3D (ParamBean) Jahia.getThreadParamBean();
+        ProcessingContext paramBean =3D Jahia.getThreadParamBean();
         getRequestContext(paramBean, contextComponent);
         try {
             peAccess.storePortletEntity(pe);
@@ -507,18 +508,22 @@
         }
     }
 =

-    public static RequestContext getRequestContext(ParamBean paramBean, Re=
questContextComponent contextComponent) {
-        HttpServletRequest request =3D paramBean.getRequest();
-        HttpServletResponse response =3D paramBean.getResponse();
+    public static RequestContext getRequestContext(ProcessingContext param=
Bean, RequestContextComponent contextComponent) {
         RequestContext context;
         try {
             context =3D contextComponent.getRequestContext();
         }
         catch (IllegalStateException e) {
-            context =3D contextComponent.create(request, response, Jahia.g=
etStaticServletConfig());
+            if (paramBean instanceof ParamBean)  {
+                HttpServletRequest request =3D ((ParamBean) paramBean).get=
Request();
+                HttpServletResponse response =3D ((ParamBean) paramBean).g=
etResponse();
+                context =3D contextComponent.create(request, response, Jah=
ia.getStaticServletConfig());
+            } else {
+                context =3D contextComponent.create(null, null , Jahia.get=
StaticServletConfig());
+            }
         }
         if(context !=3D null) {
-            context.setPage(new FusionPage(Integer.toString(Jahia.getThrea=
dParamBean().getPageID())));
+            context.setPage(new FusionPage(Integer.toString(paramBean.getP=
ageID())));
             final String username =3D paramBean.getUser().getUsername();
             if(context.getSubject()=3D=3Dnull)
             context.setSubject(SecurityHelper.createSubject(username));

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list