Author: deepak
Date: Sat Apr 11 08:55:35 2015
New Revision: 1672848
URL: http://svn.apache.org/r1672848
Log:
Applied fix from trunk r#1672846
============================================================
Applied patch from jira issue OFBIZ-6205 - Use EntityUtilProperties to get the
WebSiteProperties
Thanks Arun Patidar for reporting the issue and providing the patch.
Modified:
ofbiz/branches/release14.12/ (props changed)
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/OfbizUrlBuilder.java
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java
Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 11 08:55:35 2015
@@ -8,4 +8,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430
+/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846
Modified:
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/OfbizUrlBuilder.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/OfbizUrlBuilder.java?rev=1672848&r1=1672847&r2=1672848&view=diff
==============================================================================
---
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/OfbizUrlBuilder.java
(original)
+++
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/OfbizUrlBuilder.java
Sat Apr 11 08:55:35 2015
@@ -95,7 +95,7 @@ public final class OfbizUrlBuilder {
servletPath = WebAppUtil.getControlServletPath(webAppInfo);
}
if (webSiteProps == null) {
- webSiteProps = WebSiteProperties.defaults();
+ webSiteProps = WebSiteProperties.defaults(delegator);
}
return new OfbizUrlBuilder(config, webSiteProps, servletPath);
}
Modified:
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java?rev=1672848&r1=1672847&r2=1672848&view=diff
==============================================================================
---
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java
(original)
+++
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/website/WebSiteProperties.java
Sat Apr 11 08:55:35 2015
@@ -23,12 +23,11 @@ import javax.servlet.http.HttpServletReq
import org.ofbiz.base.lang.ThreadSafe;
import org.ofbiz.base.start.Start;
import org.ofbiz.base.util.Assert;
-import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.util.EntityQuery;
+import org.ofbiz.entity.util.EntityUtilProperties;
/**
* Web site properties.
@@ -41,8 +40,8 @@ public final class WebSiteProperties {
* Returns a <code>WebSiteProperties</code> instance initialized to the
settings found
* in the <code>url.properties</code> file.
*/
- public static WebSiteProperties defaults() {
- return new WebSiteProperties();
+ public static WebSiteProperties defaults(Delegator delegator) {
+ return new WebSiteProperties(delegator);
}
/**
@@ -58,13 +57,13 @@ public final class WebSiteProperties {
Assert.notNull("request", request);
WebSiteProperties webSiteProps = (WebSiteProperties)
request.getAttribute("_WEBSITE_PROPS_");
if (webSiteProps == null) {
- WebSiteProperties defaults = new WebSiteProperties();
+ Delegator delegator = (Delegator)
request.getAttribute("delegator");
+ WebSiteProperties defaults = new WebSiteProperties(delegator);
String httpPort = defaults.getHttpPort();
String httpHost = defaults.getHttpHost();
String httpsPort = defaults.getHttpsPort();
String httpsHost = defaults.getHttpsHost();
boolean enableHttps = defaults.getEnableHttps();
- Delegator delegator = (Delegator)
request.getAttribute("delegator");
if (delegator != null) {
String webSiteId = WebSiteWorker.getWebSiteId(request);
if (webSiteId != null) {
@@ -127,7 +126,7 @@ public final class WebSiteProperties {
if (!"WebSite".equals(webSiteValue.getEntityName())) {
throw new IllegalArgumentException("webSiteValue is not a WebSite
entity value");
}
- WebSiteProperties defaults = new WebSiteProperties();
+ WebSiteProperties defaults = new
WebSiteProperties(webSiteValue.getDelegator());
String httpPort = (webSiteValue.get("httpPort") != null) ?
webSiteValue.getString("httpPort") : defaults.getHttpPort();
String httpHost = (webSiteValue.get("httpHost") != null) ?
webSiteValue.getString("httpHost") : defaults.getHttpHost();
String httpsPort = (webSiteValue.get("httpsPort") != null) ?
webSiteValue.getString("httpsPort") : defaults.getHttpsPort();
@@ -152,12 +151,12 @@ public final class WebSiteProperties {
private final String httpsHost;
private final boolean enableHttps;
- private WebSiteProperties() {
- this.httpPort = UtilProperties.getPropertyValue("url.properties",
"port.http");
- this.httpHost = UtilProperties.getPropertyValue("url.properties",
"force.http.host");
- this.httpsPort = UtilProperties.getPropertyValue("url.properties",
"port.https");
- this.httpsHost = UtilProperties.getPropertyValue("url.properties",
"force.https.host");
- this.enableHttps =
UtilProperties.propertyValueEqualsIgnoreCase("url.properties",
"port.https.enabled", "Y");
+ private WebSiteProperties(Delegator delegator) {
+ this.httpPort =
EntityUtilProperties.getPropertyValue("url.properties", "port.http", delegator);
+ this.httpHost =
EntityUtilProperties.getPropertyValue("url.properties", "force.http.host",
delegator);
+ this.httpsPort =
EntityUtilProperties.getPropertyValue("url.properties", "port.https",
delegator);
+ this.httpsHost =
EntityUtilProperties.getPropertyValue("url.properties", "force.https.host",
delegator);
+ this.enableHttps =
EntityUtilProperties.propertyValueEqualsIgnoreCase("url.properties",
"port.https.enabled", "Y", delegator);
}
private WebSiteProperties(String httpPort, String httpHost, String
httpsPort, String httpsHost, boolean enableHttps) {
