Author: lektran
Date: Sun Oct 21 08:53:04 2012
New Revision: 1400601
URL: http://svn.apache.org/viewvc?rev=1400601&view=rev
Log:
Replaced direct access to webSiteId from the servlet context attributes with
calls to WebSiteWorker.getWebSiteId(request)
Modified:
ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementEvents.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/view/SimpleContentViewHandler.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/PubInit.groovy
Modified:
ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementEvents.java?rev=1400601&r1=1400600&r2=1400601&view=diff
==============================================================================
---
ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementEvents.java
(original)
+++
ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementEvents.java
Sun Oct 21 08:53:04 2012
@@ -46,6 +46,7 @@ import org.ofbiz.security.Security;
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.LocalDispatcher;
import org.ofbiz.service.ModelService;
+import org.ofbiz.webapp.website.WebSiteWorker;
@@ -61,7 +62,7 @@ public class ContentManagementEvents {
Security security = (Security)request.getAttribute("security");
GenericValue userLogin =
(GenericValue)session.getAttribute("userLogin");
ServletContext servletContext = session.getServletContext();
- String webSiteId = (String) servletContext.getAttribute("webSiteId");
+ String webSiteId = WebSiteWorker.getWebSiteId(request);
Delegator delegator = (Delegator)request.getAttribute("delegator");
LocalDispatcher dispatcher =
(LocalDispatcher)request.getAttribute("dispatcher");
Map<String, Object> paramMap = UtilHttp.getParameterMap(request);
@@ -157,7 +158,7 @@ public class ContentManagementEvents {
Security security = (Security)request.getAttribute("security");
GenericValue userLogin =
(GenericValue)session.getAttribute("userLogin");
ServletContext servletContext = session.getServletContext();
- String webSiteId = (String) servletContext.getAttribute("webSiteId");
+ String webSiteId = WebSiteWorker.getWebSiteId(request);
Delegator delegator = (Delegator)request.getAttribute("delegator");
LocalDispatcher dispatcher =
(LocalDispatcher)request.getAttribute("dispatcher");
Map<String, Object> paramMap = UtilHttp.getParameterMap(request);
Modified:
ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java?rev=1400601&r1=1400600&r2=1400601&view=diff
==============================================================================
---
ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java
(original)
+++
ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java
Sun Oct 21 08:53:04 2012
@@ -48,6 +48,7 @@ import org.ofbiz.service.ModelService;
import org.ofbiz.service.ServiceAuthException;
import org.ofbiz.service.ServiceUtil;
import org.ofbiz.webapp.event.CoreEvents;
+import org.ofbiz.webapp.website.WebSiteWorker;
/**
@@ -151,15 +152,12 @@ public class CompDocEvents {
String contentId = (String)paramMap.get("contentId");
Locale locale = UtilHttp.getLocale(request);
String rootDir = null;
- String webSiteId = null;
+ String webSiteId = WebSiteWorker.getWebSiteId(request);
String https = null;
if (UtilValidate.isEmpty(rootDir)) {
rootDir = servletContext.getRealPath("/");
}
- if (UtilValidate.isEmpty(webSiteId)) {
- webSiteId = (String) servletContext.getAttribute("webSiteId");
- }
if (UtilValidate.isEmpty(https)) {
https = (String) servletContext.getAttribute("https");
}
@@ -225,15 +223,12 @@ public class CompDocEvents {
String contentId = (String)paramMap.get("contentId");
Locale locale = UtilHttp.getLocale(request);
String rootDir = null;
- String webSiteId = null;
+ String webSiteId = WebSiteWorker.getWebSiteId(request);
String https = null;
if (UtilValidate.isEmpty(rootDir)) {
rootDir = servletContext.getRealPath("/");
}
- if (UtilValidate.isEmpty(webSiteId)) {
- webSiteId = (String) servletContext.getAttribute("webSiteId");
- }
if (UtilValidate.isEmpty(https)) {
https = (String) servletContext.getAttribute("https");
}
Modified:
ofbiz/trunk/applications/content/src/org/ofbiz/content/view/SimpleContentViewHandler.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/view/SimpleContentViewHandler.java?rev=1400601&r1=1400600&r2=1400601&view=diff
==============================================================================
---
ofbiz/trunk/applications/content/src/org/ofbiz/content/view/SimpleContentViewHandler.java
(original)
+++
ofbiz/trunk/applications/content/src/org/ofbiz/content/view/SimpleContentViewHandler.java
Sun Oct 21 08:53:04 2012
@@ -43,6 +43,7 @@ import org.ofbiz.entity.GenericEntityExc
import org.ofbiz.entity.GenericValue;
import org.ofbiz.webapp.view.AbstractViewHandler;
import org.ofbiz.webapp.view.ViewHandlerException;
+import org.ofbiz.webapp.website.WebSiteWorker;
/**
* Uses XSL-FO formatted templates to generate PDF views
@@ -71,15 +72,12 @@ public class SimpleContentViewHandler ex
String mimeTypeId = request.getParameter("mimeTypeId");
Locale locale = UtilHttp.getLocale(request);
String rootDir = null;
- String webSiteId = null;
+ String webSiteId = WebSiteWorker.getWebSiteId(request);
String https = null;
if (UtilValidate.isEmpty(rootDir)) {
rootDir = servletContext.getRealPath("/");
}
- if (UtilValidate.isEmpty(webSiteId)) {
- webSiteId = (String) servletContext.getAttribute("webSiteId");
- }
if (UtilValidate.isEmpty(https)) {
https = (String) servletContext.getAttribute("https");
}
Modified:
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java?rev=1400601&r1=1400600&r2=1400601&view=diff
==============================================================================
---
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java
(original)
+++
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java
Sun Oct 21 08:53:04 2012
@@ -39,6 +39,7 @@ import org.ofbiz.content.content.Content
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.service.LocalDispatcher;
+import org.ofbiz.webapp.website.WebSiteWorker;
import freemarker.core.Environment;
import freemarker.template.TemplateTransformModel;
@@ -134,7 +135,7 @@ public class RenderSubContentTransform i
// Timestamp fromDate = UtilDateTime.nowTimestamp();
ServletContext servletContext =
request.getSession().getServletContext();
String rootDir = servletContext.getRealPath("/");
- String webSiteId = (String)
servletContext.getAttribute("webSiteId");
+ String webSiteId = WebSiteWorker.getWebSiteId(request);
String https = (String) servletContext.getAttribute("https");
templateContext.put("webSiteId", webSiteId);
templateContext.put("https", https);
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java?rev=1400601&r1=1400600&r2=1400601&view=diff
==============================================================================
---
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java
(original)
+++
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java
Sun Oct 21 08:53:04 2012
@@ -53,6 +53,7 @@ import org.ofbiz.service.DispatchContext
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.LocalDispatcher;
import org.ofbiz.webapp.control.LoginWorker;
+import org.ofbiz.webapp.website.WebSiteWorker;
import org.ofbiz.widget.cache.GenericWidgetOutput;
import org.ofbiz.widget.cache.ScreenCache;
import org.ofbiz.widget.cache.WidgetContextCacheKey;
@@ -225,7 +226,7 @@ public class ScreenRenderer {
context.put("rootDir", rootDir);
}
if (UtilValidate.isEmpty(webSiteId)) {
- webSiteId = (String) servletContext.getAttribute("webSiteId");
+ webSiteId = WebSiteWorker.getWebSiteId(request);
context.put("webSiteId", webSiteId);
}
if (UtilValidate.isEmpty(https)) {
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/PubInit.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/PubInit.groovy?rev=1400601&r1=1400600&r2=1400601&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/PubInit.groovy
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/PubInit.groovy
Sun Oct 21 08:53:04 2012
@@ -31,6 +31,7 @@ import org.ofbiz.entity.*;
import org.ofbiz.security.*;
import org.ofbiz.service.*;
import org.ofbiz.entity.model.*;
+import org.ofbiz.webapp.website.WebSiteWorker;
import org.ofbiz.widget.html.*;
import org.ofbiz.widget.form.*;
import org.ofbiz.securityext.login.*;
@@ -44,7 +45,7 @@ import javax.servlet.http.*;
paramMap = UtilHttp.getParameterMap(request);
forumId = null;
servletContext = session.getServletContext();
-rootForumId = servletContext.getAttribute("webSiteId");
+rootForumId = WebSiteWorker.getWebSiteId(request);
context.rootPubId = rootForumId;
session.setAttribute("rootPubId", rootForumId);
request.setAttribute("rootPubId", rootForumId);
