You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/08/18 09:42:37 UTC
svn commit: r1618554 [24/38] - in
/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./
applications/accounting/config/
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/accounting/src/org/ofbiz/accounting/invoice/ appli...
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/calendar/month.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/calendar/month.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/calendar/month.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/calendar/month.ftl Mon Aug 18 07:42:27 2014
@@ -21,7 +21,7 @@ under the License.
<#if periods?has_content>
<#-- Allow containing screens to specify the URL for creating a new event -->
- <#if !newCalEventUrl?exists>
+ <#if !newCalEventUrl??>
<#assign newCalEventUrl = parameters._LAST_VIEW_NAME_>
</#if>
<table cellspacing="0" class="basic-table calendar">
@@ -39,12 +39,12 @@ under the License.
<#if indexMod7 = 0>
<tr>
<td class="label" ${styleTd}>
- <a href='<@o...@ofbizUrl>'>${uiLabelMap.CommonWeek} ${period.start?date?string("w")}</a>
+ <a href='<@o...@ofbizUrl>'>${uiLabelMap.CommonWeek} ${period.start?date?string("w")}</a>
</td>
</#if>
<td ${styleTd} <#if currentPeriod> class="current-period"<#else><#if (period.calendarEntries?size > 0)> class="active-period"</#if></#if>>
- <span class="h1"><a href='<@o...@ofbizUrl>'>${period.start?date?string("d")?cap_first}</a></span>
- <a class="add-new" href='<@ofbizUrl>${newCalEventUrl}?period=month&form=edit&start=${parameters.start?if_exists}&parentTypeId=${parentTypeId?if_exists}&currentStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${urlParam?if_exists}${addlParam?if_exists}</...@ofbizUrl>'>${uiLabelMap.CommonAddNew}</a>
+ <span class="h1"><a href='<@o...@ofbizUrl>'>${period.start?date?string("d")?cap_first}</a></span>
+ <a class="add-new" href='<@ofbizUrl>${newCalEventUrl}?period=month&form=edit&start=${parameters.start!}&parentTypeId=${parentTypeId!}&currentStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${urlParam!}${addlParam!}</...@ofbizUrl>'>${uiLabelMap.CommonAddNew}</a>
<br class="clear"/>
<#assign maxNumberOfPersons = 0/>
@@ -71,16 +71,16 @@ under the License.
</#if>
<#if parameters.hideEvents?default("") != "Y">
<#list period.calendarEntries as calEntry>
- <#if calEntry.workEffort.actualStartDate?exists>
+ <#if calEntry.workEffort.actualStartDate??>
<#assign startDate = calEntry.workEffort.actualStartDate>
<#else>
- <#assign startDate = calEntry.workEffort.estimatedStartDate?if_exists>
+ <#assign startDate = calEntry.workEffort.estimatedStartDate!>
</#if>
- <#if calEntry.workEffort.actualCompletionDate?exists>
+ <#if calEntry.workEffort.actualCompletionDate??>
<#assign completionDate = calEntry.workEffort.actualCompletionDate>
<#else>
- <#assign completionDate = calEntry.workEffort.estimatedCompletionDate?if_exists>
+ <#assign completionDate = calEntry.workEffort.estimatedCompletionDate!>
</#if>
<#if !completionDate?has_content && calEntry.workEffort.actualMilliSeconds?has_content>
@@ -114,8 +114,8 @@ under the License.
<td valign="top">
<table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
- <td nowrap="nowrap" class="monthdaynumber"><a href='<@ofbizUrl>day?start=${period.start.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#...@ofbizUrl>' class="monthdaynumber">${period.start?date?string("d")?cap_first}</a></td>
- <td align="right"><a href='<@ofbizUrl>EditWorkEffort?workEffortTypeId=EVENT&currentStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${addlParam?if_exists}</...@ofbizUrl>' class="add">${uiLabelMap.CommonAddNew}</a> </td>
+ <td nowrap="nowrap" class="monthdaynumber"><a href='<@ofbizUrl>day?start=${period.start.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#...@ofbizUrl>' class="monthdaynumber">${period.start?date?string("d")?cap_first}</a></td>
+ <td align="right"><a href='<@ofbizUrl>EditWorkEffort?workEffortTypeId=EVENT&currentStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${addlParam!}</...@ofbizUrl>' class="add">${uiLabelMap.CommonAddNew}</a> </td>
</tr>
</table>
<#list period.calendarEntries as calEntry>
@@ -132,7 +132,7 @@ under the License.
${calEntry.workEffort.estimatedStartDate?time?string.short}-${calEntry.workEffort.estimatedCompletionDate?time?string.short}
</#if>
<br />
- <a href="<@o...@ofbizUrl>" class="event">${calEntry.workEffort.workEffortName?default("Undefined")}</a>
+ <a href="<@o...@ofbizUrl>" class="event">${calEntry.workEffort.workEffortName?default("Undefined")}</a>
</td>
</tr>
</table>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl Mon Aug 18 07:42:27 2014
@@ -33,10 +33,10 @@ under the License.
<#list workEfforts as calendarEntry>
<#assign workEffort = calendarEntry.workEffort>
<tr<#if alt_row> class="alternate-row"</#if>>
- <td><#if workEffort.actualStartDate?exists>${workEffort.actualStartDate}<#else>${workEffort.estimatedStartDate}</#if></td>
- <td><#if workEffort.actualCompletionDate?exists>${workEffort.actualCompletionDate}<#else>${workEffort.estimatedCompletionDate}</#if></td>
+ <td><#if workEffort.actualStartDate??>${workEffort.actualStartDate}<#else>${workEffort.estimatedStartDate}</#if></td>
+ <td><#if workEffort.actualCompletionDate??>${workEffort.actualCompletionDate}<#else>${workEffort.estimatedCompletionDate}</#if></td>
<td>${workEffort.getRelatedOne("WorkEffortType", false).get("description",locale)}</td>
- <td class="button-col"><a href="<@o...@ofbizUrl>">${workEffort.workEffortName}</a></td>
+ <td class="button-col"><a href="<@o...@ofbizUrl>">${workEffort.workEffortName}</a></td>
</tr>
<#assign alt_row = !alt_row>
</#list>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/calendar/week.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/calendar/week.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/calendar/week.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/calendar/week.ftl Mon Aug 18 07:42:27 2014
@@ -18,7 +18,7 @@ under the License.
-->
<#if periods?has_content>
<#-- Allow containing screens to specify the URL for creating a new event -->
- <#if !newCalEventUrl?exists>
+ <#if !newCalEventUrl??>
<#assign newCalEventUrl = parameters._LAST_VIEW_NAME_>
</#if>
<#if (maxConcurrentEntries < 2)>
@@ -36,20 +36,20 @@ under the License.
<#if (nowTimestamp >= period.start) && (nowTimestamp <= period.end)><#assign currentPeriod = true/></#if>
<tr<#if currentPeriod> class="current-period"<#else><#if (period.calendarEntries?size > 0)> class="active-period"</#if></#if>>
<td class="centered" width="1%">
- <a href="<@o...@ofbizUrl>">${period.start?date?string("EEEE")?cap_first} ${period.start?date?string.short}</a><br />
- <a href="<@ofbizUrl>${newCalEventUrl}?period=week&form=edit&start=${parameters.start?if_exists}&parentTypeId=${parentTypeId?if_exists}&currentStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${addlParam?if_exists}${urlParam?if_exists}</...@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
+ <a href="<@o...@ofbizUrl>">${period.start?date?string("EEEE")?cap_first} ${period.start?date?string.short}</a><br />
+ <a href="<@ofbizUrl>${newCalEventUrl}?period=week&form=edit&start=${parameters.start!}&parentTypeId=${parentTypeId!}&currentStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${addlParam!}${urlParam!}</...@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
</td>
<#list period.calendarEntries as calEntry>
- <#if calEntry.workEffort.actualStartDate?exists>
+ <#if calEntry.workEffort.actualStartDate??>
<#assign startDate = calEntry.workEffort.actualStartDate>
<#else>
- <#assign startDate = calEntry.workEffort.estimatedStartDate?if_exists>
+ <#assign startDate = calEntry.workEffort.estimatedStartDate!>
</#if>
- <#if calEntry.workEffort.actualCompletionDate?exists>
+ <#if calEntry.workEffort.actualCompletionDate??>
<#assign completionDate = calEntry.workEffort.actualCompletionDate>
<#else>
- <#assign completionDate = calEntry.workEffort.estimatedCompletionDate?if_exists>
+ <#assign completionDate = calEntry.workEffort.estimatedCompletionDate!>
</#if>
<#if !completionDate?has_content && calEntry.workEffort.actualMilliSeconds?has_content>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl Mon Aug 18 07:42:27 2014
@@ -28,7 +28,7 @@ under the License.
<td align="right" valign="middle" class="label">${uiLabelMap.WorkEffortKeywords}</td>
<td valign="middle">
<div>
- <input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING?if_exists}"/>
+ <input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING!}"/>
${uiLabelMap.CommonAny}<input type="radio" name="SEARCH_OPERATOR" value="OR" <#if searchOperator == "OR">checked="checked"</#if>/>
${uiLabelMap.CommonAll}<input type="radio" name="SEARCH_OPERATOR" value="AND" <#if searchOperator == "AND">checked="checked"</#if>/>
</div>
@@ -38,7 +38,7 @@ under the License.
<td align="right" valign="middle" class="label">${uiLabelMap.WorkEffortReviews}</td>
<td valign="middle">
<div>
- <input type="text" name="SEARCH_STRING_REVIEW_TEXT" size="40" value="${requestParameters.SEARCH_STRING_REVIEW_TEXT?if_exists}"/>
+ <input type="text" name="SEARCH_STRING_REVIEW_TEXT" size="40" value="${requestParameters.SEARCH_STRING_REVIEW_TEXT!}"/>
</div>
</td>
</tr>
@@ -46,7 +46,7 @@ under the License.
<td align="right" valign="middle" class="label">${uiLabelMap.FormFieldTitle_workEffortId}</td>
<td valign="middle">
<div>
- <@htmlTemplate.lookupField value="${requestParameters.SEARCH_WORK_EFFORT_ID?if_exists}" formName="advToKeyWordSearchForm" name="SEARCH_WORK_EFFORT_ID" id="SEARCH_WORK_EFFORT_ID" fieldFormName="LookupWorkEffort"/>
+ <@htmlTemplate.lookupField value="${requestParameters.SEARCH_WORK_EFFORT_ID!}" formName="advToKeyWordSearchForm" name="SEARCH_WORK_EFFORT_ID" id="SEARCH_WORK_EFFORT_ID" fieldFormName="LookupWorkEffort"/>
</div>
</td>
</tr>
@@ -70,7 +70,7 @@ under the License.
<td align="right" valign="middle" class="label">${uiLabelMap.PartyPartyId}</td>
<td valign="middle">
<div>
- <@htmlTemplate.lookupField value="${requestParameters.partyId?if_exists}" formName="advToKeyWordSearchForm" name="partyId" id="partyId" fieldFormName="LookupPartyName"/>
+ <@htmlTemplate.lookupField value="${requestParameters.partyId!}" formName="advToKeyWordSearchForm" name="partyId" id="partyId" fieldFormName="LookupPartyName"/>
</div>
</td>
</tr>
@@ -91,7 +91,7 @@ under the License.
<td align="right" valign="middle" class="label">${uiLabelMap.WorkEffortProductId1}</td>
<td valign="middle">
<div>
- <@htmlTemplate.lookupField value="${requestParameters.productId_1?if_exists}" formName="advToKeyWordSearchForm" name="productId_1" id="productId_1" fieldFormName="LookupProduct"/>
+ <@htmlTemplate.lookupField value="${requestParameters.productId_1!}" formName="advToKeyWordSearchForm" name="productId_1" id="productId_1" fieldFormName="LookupProduct"/>
</div>
</td>
</tr>
@@ -99,7 +99,7 @@ under the License.
<td align="right" valign="middle" class="label">${uiLabelMap.WorkEffortProductId2}</td>
<td valign="middle">
<div>
- <@htmlTemplate.lookupField value="${requestParameters.productId_2?if_exists}" formName="advToKeyWordSearchForm" name="productId_2" id="productId_2" fieldFormName="LookupProduct"/>
+ <@htmlTemplate.lookupField value="${requestParameters.productId_2!}" formName="advToKeyWordSearchForm" name="productId_2" id="productId_2" fieldFormName="LookupProduct"/>
</div>
</td>
</tr>
@@ -109,13 +109,13 @@ under the License.
<table class="basic-table" cellspacing="0">
<tr>
<td nowrap="nowrap">
- <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.fromDate?if_exists}" size="25" maxlength="30" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.fromDate!}" size="25" maxlength="30" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<span>${uiLabelMap.CommonFrom}</span>
</td>
</tr>
<tr>
<td nowrap="nowrap">
- <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.thruDate?if_exists}" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.thruDate!}" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<span>${uiLabelMap.CommonThru}</span>
</td>
</tr>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl Mon Aug 18 07:42:27 2014
@@ -58,7 +58,7 @@ under the License.
<#assign workEffort = delegator.findOne("WorkEffort", Static["org.ofbiz.base.util.UtilMisc"].toMap("workEffortId", workEffortId), false)>
<tr>
<td>
- <a href="<@o...@ofbizUrl>" class="buttontext">${workEffortId} ${(workEffort.workEffortName)?if_exists}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${workEffortId} ${(workEffort.workEffortName)!}</a>
</td>
</tr>
</#list>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/main.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/main.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/main.ftl Mon Aug 18 07:42:27 2014
@@ -16,7 +16,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<#if (requestAttributes.uiLabelMap)?exists>
+<#if (requestAttributes.uiLabelMap)??>
<#assign uiLabelMap = requestAttributes.uiLabelMap>
</#if>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/task/mytasks.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/task/mytasks.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/task/mytasks.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/task/mytasks.ftl Mon Aug 18 07:42:27 2014
@@ -32,10 +32,10 @@ under the License.
<#assign alt_row = false>
<#list tasks as workEffort>
<tr<#if alt_row> class="alternate-row"</#if>>
- <td>${(workEffort.estimatedStartDate)?if_exists}</td>
+ <td>${(workEffort.estimatedStartDate)!}</td>
<td><a href="<@o...@ofbizUrl>">${workEffort.workEffortName}</a></td>
- <td>${workEffort.priority?if_exists}</td>
- <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))?if_exists}</td>
+ <td>${workEffort.priority!}</td>
+ <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))!}</td>
</tr>
<#assign alt_row = !alt_row>
</#list>
@@ -57,10 +57,10 @@ under the License.
<#assign alt_row = false>
<#list activities as workEffort>
<tr<#if alt_row> class="alternate-row"</#if>>
- <td>${(workEffort.estimatedStartDate)?if_exists}</td>
- <td>${workEffort.priority?if_exists}</td>
- <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))?if_exists}</td>
- <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId")), true).get("description",locale))?if_exists}</td>
+ <td>${(workEffort.estimatedStartDate)!}</td>
+ <td>${workEffort.priority!}</td>
+ <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))!}</td>
+ <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId")), true).get("description",locale))!}</td>
<#-- <td>${workEffort.partyId}</td> -->
<td>${workEffort.roleTypeId}</td>
<td><a href="<@o...@ofbizUrl>">${workEffort.workEffortName}</a></td>
@@ -87,10 +87,10 @@ under the License.
<#assign alt_row = false>
<#list roleActivities as workEffort>
<tr<#if alt_row> class="alternate-row"</#if>>
- <td>${(workEffort.estimatedStartDate)?if_exists}</td>
- <td>${workEffort.priority?if_exists}</td>
- <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))?if_exists}</td>
- <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId")), true).get("description",locale))?if_exists}</td>
+ <td>${(workEffort.estimatedStartDate)!}</td>
+ <td>${workEffort.priority!}</td>
+ <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))!}</td>
+ <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId")), true).get("description",locale))!}</td>
<#-- <td>${workEffort.partyId}</td> -->
<td>${workEffort.roleTypeId}</td>
<td><a href="<@o...@ofbizUrl>">${workEffort.workEffortName}</a></td>
@@ -117,10 +117,10 @@ under the License.
<#assign alt_row = false>
<#list groupActivities as workEffort>
<tr<#if alt_row> class="alternate-row"</#if>>
- <td>${(workEffort.estimatedStartDate)?if_exists}</td>
- <td>${workEffort.priority?if_exists}</td>
- <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))?if_exists}</td>
- <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId")), true).get("description",locale))?if_exists}</td>
+ <td>${(workEffort.estimatedStartDate)!}</td>
+ <td>${workEffort.priority!}</td>
+ <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))!}</td>
+ <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId")), true).get("description",locale))!}</td>
<td>${workEffort.groupPartyId}</td>
<#-- <td>${workEffort.roleTypeId}</td> -->
<td><a href="<@o...@ofbizUrl>">${workEffort.workEffortName}</a></td>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/workeffort/EditWorkEffortDupForm.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/workeffort/EditWorkEffortDupForm.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/workeffort/EditWorkEffortDupForm.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/workeffort/EditWorkEffortDupForm.ftl Mon Aug 18 07:42:27 2014
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
<form action="<@o...@ofbizUrl>" method="post">
- <input type="hidden" name="oldWorkEffortId" value="${workEffortId?if_exists}"/>
+ <input type="hidden" name="oldWorkEffortId" value="${workEffortId!}"/>
<div>
<span class="label">${uiLabelMap.ProductDuplicateRemoveSelectedWithNewId}</span>
<input type="text" size="20" maxlength="20" name="workEffortId"/> <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonDuplicate}!"/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl Mon Aug 18 07:42:27 2014
@@ -63,7 +63,7 @@ under the License.
<tbody>
<#list partyAssignments as wepa>
<tr>
- <td>${wepa.groupName?if_exists}${wepa.firstName?if_exists} ${wepa.lastName?if_exists}</td>
+ <td>${wepa.groupName!}${wepa.firstName!} ${wepa.lastName!}</td>
<td>${(wepa.getRelatedOne("RoleType", false).description)?default(" ")}</td>
<td>${wepa.fromDate?default(" ")}</td>
<td>${wepa.thruDate?default(" ")}</td>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/commons/commons-csv-1.0.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/commons/commons-csv-1.0.jar?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
Binary files - no diff available.
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/concurrent/ExecutionPool.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/concurrent/ExecutionPool.java?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/concurrent/ExecutionPool.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/concurrent/ExecutionPool.java Mon Aug 18 07:42:27 2014
@@ -24,10 +24,14 @@ import java.util.List;
import java.util.concurrent.DelayQueue;
import java.util.concurrent.Delayed;
import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
+import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import javolution.util.FastList;
@@ -38,7 +42,9 @@ import org.ofbiz.base.util.Debug;
@SourceMonitored
public final class ExecutionPool {
public static final String module = ExecutionPool.class.getName();
- public static final ScheduledExecutorService GLOBAL_EXECUTOR = getExecutor(null, "OFBiz-config", -1, false);
+ public static final ExecutorService GLOBAL_BATCH = getPooledExecutor(null, "OFBiz-batch", -1, Integer.MAX_VALUE, false);
+ public static final ScheduledExecutorService GLOBAL_EXECUTOR = getScheduledExecutor(null, "OFBiz-config", -1, false);
+ public static final ForkJoinPool GLOBAL_FORK_JOIN = getForkJoinPool(-1);
protected static class ExecutionPoolThreadFactory implements ThreadFactory {
private final ThreadGroup group;
@@ -63,21 +69,44 @@ public final class ExecutionPool {
return new ExecutionPoolThreadFactory(group, namePrefix);
}
- public static ScheduledExecutorService getExecutor(ThreadGroup group, String namePrefix, int threadCount, boolean preStart) {
+ public static int autoAdjustThreadCount(int threadCount) {
if (threadCount == 0) {
- threadCount = 1;
+ return 1;
} else if (threadCount < 0) {
int numCpus = Runtime.getRuntime().availableProcessors();
- threadCount = Math.abs(threadCount) * numCpus;
+ return Math.abs(threadCount) * numCpus;
+ } else {
+ return threadCount;
}
+ }
+
+ @Deprecated
+ public static ScheduledExecutorService getExecutor(ThreadGroup group, String namePrefix, int threadCount, boolean preStart) {
+ return getScheduledExecutor(group, namePrefix, threadCount, preStart);
+ }
+
+ public static ScheduledExecutorService getScheduledExecutor(ThreadGroup group, String namePrefix, int threadCount, boolean preStart) {
ThreadFactory threadFactory = createThreadFactory(group, namePrefix);
- ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(threadCount, threadFactory);
+ ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(autoAdjustThreadCount(threadCount), threadFactory);
if (preStart) {
executor.prestartAllCoreThreads();
}
return executor;
}
+ public static ExecutorService getPooledExecutor(ThreadGroup group, String namePrefix, int threadCount, int maximumPoolSize, boolean preStart) {
+ ThreadFactory threadFactory = createThreadFactory(group, namePrefix);
+ ThreadPoolExecutor executor = new ThreadPoolExecutor(autoAdjustThreadCount(threadCount), maximumPoolSize, 5, TimeUnit.SECONDS, new SynchronousQueue<Runnable>(), threadFactory);
+ if (preStart) {
+ executor.prestartAllCoreThreads();
+ }
+ return executor;
+ }
+
+ public static ForkJoinPool getForkJoinPool(int threadCount) {
+ return new ForkJoinPool(autoAdjustThreadCount(threadCount));
+ }
+
public static <F> List<F> getAllFutures(Collection<Future<F>> futureList) {
List<F> result = FastList.newInstance();
for (Future<F> future: futureList) {
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/concurrent/TTLObject.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/concurrent/TTLObject.java?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/concurrent/TTLObject.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/concurrent/TTLObject.java Mon Aug 18 07:42:27 2014
@@ -33,7 +33,7 @@ import org.ofbiz.base.util.UtilGenerics;
@SourceMonitored
public abstract class TTLObject<T> implements ObjectWrapper<T> {
- private static final ScheduledExecutorService updateExecutor = ExecutionPool.getExecutor(new ThreadGroup("TTLObject"), "TTLObject(async-update)", -2, true);
+ private static final ScheduledExecutorService updateExecutor = ExecutionPool.getScheduledExecutor(new ThreadGroup("TTLObject"), "TTLObject(async-update)", -2, true);
private static final <T> T getConfigForClass(ConcurrentHashMap<String, T> config, Class<?> c) {
Class<?> ptr = c;
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/concurrent/test/DependencyPoolTests.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/concurrent/test/DependencyPoolTests.java?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/concurrent/test/DependencyPoolTests.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/concurrent/test/DependencyPoolTests.java Mon Aug 18 07:42:27 2014
@@ -36,7 +36,7 @@ public class DependencyPoolTests extends
public void testDependencyPool() throws Exception {
// always use more threads than cpus, so that the single-cpu case can be tested
- ScheduledExecutorService executor = ExecutionPool.getExecutor(new ThreadGroup("DependencyPoolTests"), getName(), -2, true);
+ ScheduledExecutorService executor = ExecutionPool.getScheduledExecutor(new ThreadGroup("DependencyPoolTests"), getName(), -2, true);
DependencyPool<Integer, TestItem, String> pool = new DependencyPool<Integer, TestItem, String>(executor);
int itemSize = 100, depMax = 5, subMax = 3;
List<TestItem> items = new ArrayList<TestItem>(itemSize);
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/concurrent/test/TTLObjectTest.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/concurrent/test/TTLObjectTest.java?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/concurrent/test/TTLObjectTest.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/concurrent/test/TTLObjectTest.java Mon Aug 18 07:42:27 2014
@@ -53,7 +53,7 @@ public abstract class TTLObjectTest exte
@Override
protected void setUp() throws InterruptedException {
- executor = ExecutionPool.getExecutor(new ThreadGroup("TTLObjectTest"), getName(), -1, true);
+ executor = ExecutionPool.getScheduledExecutor(new ThreadGroup("TTLObjectTest"), getName(), -1, true);
}
@Override
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl Mon Aug 18 07:42:27 2014
@@ -19,9 +19,9 @@ under the License.
<table cellspacing="0" class="basic-table hover-bar">
<tr class="header-row">
- <#assign firstRecord = records[0]?if_exists/>
+ <#assign firstRecord = records[0]!/>
<#list columnNames as columnName>
- <td<#if firstRecord?exists && firstRecord[columnName]?default("")?is_number> class="align-text"</#if>>
+ <td<#if firstRecord?? && firstRecord[columnName]?default("")?is_number> class="align-text"</#if>>
${columnName}
</td>
</#list>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/ofbiz-component.xml?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/ofbiz-component.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/ofbiz-component.xml Mon Aug 18 07:42:27 2014
@@ -28,7 +28,6 @@ under the License.
<container name="catalina-container" loaders="main" class="org.ofbiz.catalina.container.CatalinaContainer">
<!-- static configuration for tomcat -->
- <property name="delegator-name" value="default"/>
<property name="use-naming" value="false"/>
<property name="debug" value="0"/>
<property name="catalina-runtime-home" value="runtime/catalina"/>
@@ -186,7 +185,6 @@ under the License.
</container>
<container name="catalina-container-test" loaders="test" class="org.ofbiz.catalina.container.CatalinaContainer">
<!-- static configuration for tomcat -->
- <property name="delegator-name" value="default"/>
<property name="use-naming" value="false"/>
<property name="debug" value="0"/>
<property name="catalina-runtime-home" value="runtime/catalina"/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java Mon Aug 18 07:42:27 2014
@@ -81,8 +81,6 @@ import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.SSLUtil;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.UtilXml;
-import org.ofbiz.entity.Delegator;
-import org.ofbiz.entity.DelegatorFactory;
import org.w3c.dom.Document;
/*
@@ -151,7 +149,6 @@ public class CatalinaContainer implement
SSLUtil.loadJsseProperties();
}
- protected Delegator delegator = null;
protected Tomcat tomcat = null;
protected Map<String, ContainerConfig.Container.Property> clusterConfig = new HashMap<String, ContainerConfig.Container.Property>();
protected Map<String, Engine> engines = new HashMap<String, Engine>();
@@ -179,7 +176,6 @@ public class CatalinaContainer implement
//int debug = ContainerConfig.getPropertyValue(cc, "debug", 0);
// grab some global context settings
- this.delegator = DelegatorFactory.getDelegator(ContainerConfig.getPropertyValue(cc, "delegator-name", "default"));
this.contextReloadable = ContainerConfig.getPropertyValue(cc, "apps-context-reloadable", false);
this.crossContext = ContainerConfig.getPropertyValue(cc, "apps-cross-context", true);
this.distribute = ContainerConfig.getPropertyValue(cc, "apps-distributable", true);
@@ -737,7 +733,7 @@ public class CatalinaContainer implement
return;
}
- ScheduledExecutorService executor = ExecutionPool.getExecutor(CATALINA_THREAD_GROUP, "catalina-startup", -1, true);
+ ScheduledExecutorService executor = ExecutionPool.getScheduledExecutor(CATALINA_THREAD_GROUP, "catalina-startup", -1, true);
try {
List<Future<Context>> futures = FastList.newInstance();
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonEntityLabels.xml?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonEntityLabels.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonEntityLabels.xml Mon Aug 18 07:42:27 2014
@@ -18965,7 +18965,7 @@
</property>
<property key="Uom.description.OTH_ea">
<value xml:lang="en">Each</value>
- <value xml:lang="fr">Chaque</value>
+ <value xml:lang="fr">Pièce/s</value>
<value xml:lang="it">Ciascuno</value>
<value xml:lang="ja">å</value>
<value xml:lang="pt_BR">Cada</value>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/entitydef/entitymodel.xml?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/entitydef/entitymodel.xml Mon Aug 18 07:42:27 2014
@@ -430,18 +430,6 @@ under the License.
<key-map field-name="uomId"/>
</relation>
</entity>
- <entity entity-name="StandardTimePeriod"
- package-name="org.ofbiz.common.period"
- title="Standard Time Period Entity">
- <field name="standardTimePeriodId" type="id-ne"></field>
- <field name="periodTypeId" type="id"></field>
- <field name="fromDate" type="date-time"></field>
- <field name="thruDate" type="date-time"></field>
- <prim-key field="standardTimePeriodId"/>
- <relation type="one" fk-name="STD_TM_PER_TYPE" rel-entity-name="PeriodType">
- <key-map field-name="periodTypeId"/>
- </relation>
- </entity>
<!-- ========================================================= -->
<!-- org.ofbiz.common.status -->
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/error.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/error.fo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/error.fo.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/error.fo.ftl Mon Aug 18 07:42:27 2014
@@ -54,7 +54,7 @@ under the License.
<fo:table-body>
<fo:table-row>
<fo:table-cell>
- <#if logoImageUrl?exists>
+ <#if logoImageUrl??>
<fo:block>
<fo:external-graphic src="${logoImageUrl}" overflow="hidden" height="40px" content-height="scale-to-fit"/>
</fo:block>
@@ -71,7 +71,7 @@ under the License.
<fo:block font-weight="bold">${uiLabelMap.CommonUsername}</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block><#if userLogin?exists>${userLogin.userLoginId?if_exists}</#if></fo:block>
+ <fo:block><#if userLogin??>${userLogin.userLoginId!}</#if></fo:block>
</fo:list-item-body>
</fo:list-item>
<fo:list-item>
@@ -79,7 +79,7 @@ under the License.
<fo:block font-weight="bold">${uiLabelMap.CommonDate}</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block>${nowTimestamp?if_exists}</fo:block>
+ <fo:block>${nowTimestamp!}</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
@@ -100,7 +100,7 @@ under the License.
${uiLabelMap.CommonFollowingErrorsOccurred}:
</fo:block>
<fo:block space-after="0.2in" color="red">
- ${errorMessage?if_exists}
+ ${errorMessage!}
</fo:block>
<fo:block id="theEnd"/>
</fo:flow>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/forgotPassword.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/forgotPassword.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/forgotPassword.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/forgotPassword.ftl Mon Aug 18 07:42:27 2014
@@ -23,7 +23,7 @@ under the License.
<h3>${uiLabelMap.CommonForgotYourPassword}?</h3>
</div>
<div class="screenlet-body">
- <form method="post" action="<@o...@ofbizUrl>" name="forgotpassword">
+ <form method="post" action="<@o...@ofbizUrl>" name="forgotpassword">
<table class="basic-table" cellspacing="0">
<tr>
<td class="label">${uiLabelMap.CommonUsername}</td>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/ViewCertificate.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/ViewCertificate.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/ViewCertificate.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/ViewCertificate.ftl Mon Aug 18 07:42:27 2014
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
-<#assign components = Static["org.ofbiz.base.component.ComponentConfig"].getAllComponents()?if_exists/>
+<#assign components = Static["org.ofbiz.base.component.ComponentConfig"].getAllComponents()!/>
<#if (requestParameters.certString?has_content)>
<#assign cert = Static["org.ofbiz.base.util.KeyStoreUtil"].pemToCert(requestParameters.certString)/>
</#if>
@@ -49,7 +49,7 @@ under the License.
<td> </td>
</tr>
<#list components as component>
- <#assign keystores = component.getKeystoreInfos()?if_exists/>
+ <#assign keystores = component.getKeystoreInfos()!/>
<#list keystores as store>
<#if (store.isTrustStore())>
<tr>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl Mon Aug 18 07:42:27 2014
@@ -16,12 +16,12 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<#if description?exists>
- <#if autocompleteOptions?exists>
+<#if description??>
+ <#if autocompleteOptions??>
<#list autocompleteOptions as autocompleteOption>
<#assign displayString = ""/>
<#list displayFieldsSet as key>
- <#assign field = autocompleteOption.get(key)?if_exists>
+ <#assign field = autocompleteOption.get(key)!>
<#if field?has_content>
<#if (key != context.returnField)>
<#assign displayString = displayString + field + " ">
@@ -35,7 +35,7 @@ under the License.
<script type="text/javascript">
var autocomp = [
<#if autocompleteOptions?has_content>
- <#if !displayReturnField?exists>
+ <#if !displayReturnField??>
<#assign displayReturnField = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties", "widget.autocompleter.displayReturnField")>
</#if>
<#list autocompleteOptions as autocompleteOption>
@@ -43,7 +43,7 @@ var autocomp = [
<#assign displayString = ""/>
<#assign returnField = ""/>
<#list displayFieldsSet as key>
- <#assign field = autocompleteOption.get(key)?if_exists>
+ <#assign field = autocompleteOption.get(key)!>
<#if field?has_content>
<#if (key == context.returnField)>
<#assign returnField = field/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/countries.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/countries.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/countries.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/countries.ftl Mon Aug 18 07:42:27 2014
@@ -18,7 +18,7 @@ under the License.
-->
<#assign countries = Static["org.ofbiz.common.CommonWorkers"].getCountryList(delegator)>
<#list countries as country>
- <#if defaultCountryGeoId?exists>
+ <#if defaultCountryGeoId??>
<option value='${country.geoId}' ${(country.geoId==defaultCountryGeoId)?string("selected=\"selected\"","")}>${country.get("geoName",locale)?default(country.geoId)}</option>
<#else>
<option value='${country.geoId}'>${country.get("geoName",locale)?default(country.geoId)}</option>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/fo/basic-header.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/fo/basic-header.fo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/fo/basic-header.fo.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/fo/basic-header.fo.ftl Mon Aug 18 07:42:27 2014
@@ -19,7 +19,7 @@ under the License.
<#escape x as x?xml>
<fo:static-content flow-name="xsl-region-before">
<fo:block font-size="${(layoutSettings.headerFontSize)?default("14pt")}" text-align="center" margin-bottom="14pt">
- ${(layoutSettings.documentTitle)?if_exists}
+ ${(layoutSettings.documentTitle)!}
</fo:block>
</fo:static-content>
</#escape>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/genericLink.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/genericLink.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/genericLink.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/genericLink.ftl Mon Aug 18 07:42:27 2014
@@ -17,17 +17,17 @@ specific language governing permissions
under the License.
-->
-<#if requestParameters?exists && genericLinkName?exists && genericLinkTarget?exists && genericLinkText?exists>
-<form name="${genericLinkName}" <#if genericLinkWindow?exists>target="${genericLinkWindow}"</#if> action="<@o...@ofbizUrl>" method="post">
-<#if (!excludeParameters?exists || excludeParameters != "N") && requestParameters?exists>
+<#if requestParameters?? && genericLinkName?? && genericLinkTarget?? && genericLinkText??>
+<form name="${genericLinkName}" <#if genericLinkWindow??>target="${genericLinkWindow}"</#if> action="<@o...@ofbizUrl>" method="post">
+<#if (!excludeParameters?? || excludeParameters != "N") && requestParameters??>
<#assign requestParameterKeys = requestParameters.keySet().iterator()>
<#list requestParameterKeys as requestParameterKey>
<#assign requestParameterValue = requestParameters.get(requestParameterKey)>
-<#if requestParameterValue?exists && requestParameterValue?has_content>
+<#if requestParameterValue?? && requestParameterValue?has_content>
<input type="hidden" name="${requestParameterKey}" value="${requestParameterValue}"/>
</#if>
</#list>
</#if>
-<a href="javascript:document.${genericLinkName}.submit();" <#if genericLinkStyle?exists>class="${genericLinkStyle}"</#if>>${genericLinkText}</a>
+<a href="javascript:document.${genericLinkName}.submit();" <#if genericLinkStyle??>class="${genericLinkStyle}"</#if>>${genericLinkText}</a>
</form>
</#if>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/helplink.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/helplink.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/helplink.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/helplink.ftl Mon Aug 18 07:42:27 2014
@@ -18,6 +18,6 @@ under the License.
-->
<#-- uncomment this to show the current screen help topic key (this is useful to cut and paste in the help link resources files
-${helpTopic?if_exists}
+${helpTopic!}
-->
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/insertDropDown.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/insertDropDown.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/insertDropDown.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/insertDropDown.ftl Mon Aug 18 07:42:27 2014
@@ -17,22 +17,22 @@ specific language governing permissions
under the License.
-->
-${StringUtil.wrapString(topLine.textBegin?if_exists)}
+${StringUtil.wrapString(topLine.textBegin!)}
<#assign listSize = topLine.dropDownList.size()>
<#if topLine.dropDownList.size() gt 1>
<form method="post" action="<@o...@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="${topLine.action}" id="${topLine.action}">
- <#if topLine.hiddenFieldList?exists>
+ <#if topLine.hiddenFieldList??>
<#list topLine.hiddenFieldList as field>
<input type="hidden" name="${field.name}" value="${field.value}"/>
</#list>
</#if>
- <select name="${topLine.selectionName?if_exists}" onchange="javascript:document.${topLine.action}.submit();">
+ <select name="${topLine.selectionName!}" onchange="javascript:document.${topLine.action}.submit();">
<#list topLine.dropDownList as option>
- <option <#if option.key == topLine.selectedKey >selected="selected"</#if> value="${option.key?if_exists}">${option.value?if_exists}</option>
+ <option <#if option.key == topLine.selectedKey >selected="selected"</#if> value="${option.key!}">${option.value!}</option>
</#list>
</select>
</form>
<#else>
- ${topLine.dropDownList[0].value?if_exists}
+ ${topLine.dropDownList[0].value!}
</#if>
-${StringUtil.wrapString(topLine.textEnd?if_exists)}
+${StringUtil.wrapString(topLine.textEnd!)}
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/lookup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/lookup.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/lookup.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/lookup.ftl Mon Aug 18 07:42:27 2014
@@ -26,7 +26,7 @@ under the License.
<html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <title>${title?if_exists}</title>
+ <title>${title!}</title>
<#-- the trick "<scr" + "ipt below is because browsers should not parse the contents of CDATA elements, but apparently they do. -->
<script language="JavaScript" type="text/javascript">//<![CDATA[
var jQueryLibLoaded = false;
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/messages.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/messages.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/messages.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/messages.ftl Mon Aug 18 07:42:27 2014
@@ -19,20 +19,20 @@ under the License.
<#escape x as x?html>
<#if requestAttributes.errorMessageList?has_content><#assign errorMessageList=requestAttributes.errorMessageList></#if>
<#if requestAttributes.eventMessageList?has_content><#assign eventMessageList=requestAttributes.eventMessageList></#if>
- <#if requestAttributes.serviceValidationException?exists><#assign serviceValidationException = requestAttributes.serviceValidationException></#if>
+ <#if requestAttributes.serviceValidationException??><#assign serviceValidationException = requestAttributes.serviceValidationException></#if>
<#if requestAttributes.uiLabelMap?has_content><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
<#if !errorMessage?has_content>
- <#assign errorMessage = requestAttributes._ERROR_MESSAGE_?if_exists>
+ <#assign errorMessage = requestAttributes._ERROR_MESSAGE_!>
</#if>
<#if !errorMessageList?has_content>
- <#assign errorMessageList = requestAttributes._ERROR_MESSAGE_LIST_?if_exists>
+ <#assign errorMessageList = requestAttributes._ERROR_MESSAGE_LIST_!>
</#if>
<#if !eventMessage?has_content>
- <#assign eventMessage = requestAttributes._EVENT_MESSAGE_?if_exists>
+ <#assign eventMessage = requestAttributes._EVENT_MESSAGE_!>
</#if>
<#if !eventMessageList?has_content>
- <#assign eventMessageList = requestAttributes._EVENT_MESSAGE_LIST_?if_exists>
+ <#assign eventMessageList = requestAttributes._EVENT_MESSAGE_LIST_!>
</#if>
<#-- display the error messages -->
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/setMultipleSelectJs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/setMultipleSelectJs.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/setMultipleSelectJs.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/setMultipleSelectJs.ftl Mon Aug 18 07:42:27 2014
@@ -16,13 +16,13 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<#if asm_multipleSelect?exists> <#-- we check only this var and suppose the others are also present -->
+<#if asm_multipleSelect??> <#-- we check only this var and suppose the others are also present -->
<script type="text/javascript">
jQuery(document).ready(function() {
- multiple = jQuery("#${asm_multipleSelect?if_exists}");
+ multiple = jQuery("#${asm_multipleSelect!}");
- <#if asm_title?exists>
- // set the dropdown "title" if exists
+ <#if asm_title??>
+ // set the dropdown "title" if??
multiple.attr('title', '${asm_title}');
</#if>
@@ -34,7 +34,7 @@ jQuery(document).ready(function() {
//, debugMode: true
});
- <#if asm_relatedField?exists> <#-- can be used without related field -->
+ <#if asm_relatedField??> <#-- can be used without related field -->
// track possible relatedField changes
// on initial focus (focus-field-name must be asm_relatedField) or if the field value changes, select related multi values.
typeValue = jQuery('#${asm_typeField}').val();
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/simple.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/simple.fo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/simple.fo.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/simple.fo.ftl Mon Aug 18 07:42:27 2014
@@ -55,7 +55,7 @@ under the License.
<fo:table-row>
<fo:table-cell>
<fo:block>
- <#if logoImageUrl?exists>
+ <#if logoImageUrl??>
<fo:external-graphic src="${logoImageUrl}" overflow="hidden" height="40px" content-height="scale-to-fit"/>
</#if>
</fo:block>
@@ -63,7 +63,7 @@ under the License.
<fo:table-cell>
<#-- The title of the report -->
<fo:block font-weight="bold" text-decoration="underline" space-after="0.03in">
- <#if titleProperty?exists>${uiLabelMap.get(titleProperty)}<#else>${title?if_exists}</#if>
+ <#if titleProperty??>${uiLabelMap.get(titleProperty)}<#else>${title!}</#if>
</fo:block>
<#-- Username and date -->
<fo:list-block provisional-distance-between-starts="1in">
@@ -72,7 +72,7 @@ under the License.
<fo:block font-weight="bold">${uiLabelMap.CommonUsername}</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block><#if userLogin?exists>${userLogin.userLoginId?if_exists}</#if></fo:block>
+ <fo:block><#if userLogin??>${userLogin.userLoginId!}</#if></fo:block>
</fo:list-item-body>
</fo:list-item>
<fo:list-item>
@@ -80,7 +80,7 @@ under the License.
<fo:block font-weight="bold">${uiLabelMap.CommonDate}</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block>${nowTimestamp?if_exists}</fo:block>
+ <fo:block>${nowTimestamp!}</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/simple.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/simple.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/simple.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/simple.ftl Mon Aug 18 07:42:27 2014
@@ -26,7 +26,7 @@ under the License.
<html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <title>${layoutSettings.companyName?if_exists}: <#if (page.titleProperty)?has_content>${uiLabelMap[page.titleProperty]}<#else>${(page.title)?if_exists}</#if></title>
+ <title>${layoutSettings.companyName!}: <#if (page.titleProperty)?has_content>${uiLabelMap[page.titleProperty]}<#else>${(page.title)!}</#if></title>
<#if layoutSettings.shortcutIcon?has_content>
<link rel="shortcut icon" href="<@o...@ofbizContentUrl>" />
</#if>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/states.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/states.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/states.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/states.ftl Mon Aug 18 07:42:27 2014
@@ -22,7 +22,7 @@ under the License.
</#list>
<#-- Here is some alternate code to get states limited to a region
-<#if requestParameters.CUSTOMER_COUNTRY?exists>
+<#if requestParameters.CUSTOMER_COUNTRY??>
<#assign stateAssocs = Static["org.ofbiz.common.CommonWorkers"].getAssociatedStateList(delegator,requestParameters.CUSTOMER_COUNTRY)>
<#else>
<#assign stateAssocs = Static["org.ofbiz.common.CommonWorkers"].getAssociatedStateList(delegator,null)>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/login.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/login.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/login.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/login.ftl Mon Aug 18 07:42:27 2014
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
-<#if requestAttributes.uiLabelMap?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
+<#if requestAttributes.uiLabelMap??><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
<#assign useMultitenant = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", "multitenant")>
<#assign username = requestParameters.USERNAME?default((sessionAttributes.autoUserLogin.userLoginId)?default(""))>
@@ -43,13 +43,13 @@ under the License.
<td><input type="password" name="PASSWORD" value="" size="20"/></td>
</tr>
<#if ("Y" == useMultitenant) >
- <#if !requestAttributes.tenantId?exists>
+ <#if !requestAttributes.tenantId??>
<tr>
<td class="label">${uiLabelMap.CommonTenantId}</td>
- <td><input type="text" name="tenantId" value="${parameters.tenantId?if_exists}" size="20"/></td>
+ <td><input type="text" name="tenantId" value="${parameters.tenantId!}" size="20"/></td>
</tr>
<#else>
- <input type="hidden" name="tenantId" value="${requestAttributes.tenantId?if_exists}"/>
+ <input type="hidden" name="tenantId" value="${requestAttributes.tenantId!}"/>
</#if>
</#if>
<tr>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/portal/listPortalPortlets.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/portal/listPortalPortlets.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/portal/listPortalPortlets.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/portal/listPortalPortlets.ftl Mon Aug 18 07:42:27 2014
@@ -40,7 +40,7 @@ under the License.
<form method="post" action="<@o...@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="createPortalPortlet_${portalPortlet.portalPortletId}"><input name="portalPortletId" value="${portalPortlet.portalPortletId}" type="hidden"/><input name="portalPageId" value="${parameters.portalPageId}" type="hidden"/><input name="columnSeqId" value="${parameters.columnSeqId}" type="hidden"/></form><a class="buttontext" href="javascript:document.createPortalPortlet_${portalPortlet.portalPortletId}.submit()">${uiLabelMap.CommonAdd}: ${portalPortlet.portletName}</a>
</div>
<div>
- ${portalPortlet.description?if_exists}
+ ${portalPortlet.description!}
</div>
<div>
${parameters.portletCategoryId}
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/portal/showPortlet.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/portal/showPortlet.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/portal/showPortlet.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/portal/showPortlet.ftl Mon Aug 18 07:42:27 2014
@@ -27,5 +27,5 @@ under the License.
</td></tr>
</table>
<#else/>
-<h2>Portlet '${parameters.portalPortletId?if_exists}' not found. You may not have the necessary seed or other data for it.</h2>
+<h2>Portlet '${parameters.portalPortletId!}' not found. You may not have the necessary seed or other data for it.</h2>
</#if>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/viewBlocked.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/viewBlocked.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/viewBlocked.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/viewBlocked.ftl Mon Aug 18 07:42:27 2014
@@ -23,7 +23,7 @@ under the License.
<h3>${uiLabelMap.CommonViewBlocked}</h3>
</div>
<div class="screenlet-body">
- ${errorMessage?if_exists}
+ ${errorMessage!}
<br />
</div>
</div>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/ofbiz-component.xml?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/ofbiz-component.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/ofbiz-component.xml Mon Aug 18 07:42:27 2014
@@ -37,4 +37,8 @@ under the License.
<entity-resource type="data" reader-name="demo" loader="main" location="data/TenantDemoData.xml"/>
<test-suite loader="main" location="testdef/entitytests.xml"/>
+
+ <container name="delegator-container" loaders="main" class="org.ofbiz.entity.DelegatorContainer">
+ <property name="preload-delegators" value="default"/>
+ </container>
</ofbiz-component>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/DelegatorFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/DelegatorFactory.java?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/DelegatorFactory.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/DelegatorFactory.java Mon Aug 18 07:42:27 2014
@@ -18,7 +18,14 @@
*/
package org.ofbiz.entity;
+import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.ScheduledExecutorService;
+
+import org.ofbiz.base.concurrent.ExecutionPool;
import org.ofbiz.base.lang.Factory;
import org.ofbiz.base.util.Debug;
@@ -27,33 +34,65 @@ import org.ofbiz.base.util.UtilObject;
/** <code>Delegator</code> factory abstract class. */
public abstract class DelegatorFactory implements Factory<Delegator, String> {
public static final String module = DelegatorFactoryImpl.class.getName();
- private static final ConcurrentHashMap<String, Delegator> delegatorCache = new ConcurrentHashMap<String, Delegator>();
+ private static final ConcurrentHashMap<String, Future<Delegator>> delegators = new ConcurrentHashMap<String, Future<Delegator>>();
+ private static final ThreadGroup DELEGATOR_THREAD_GROUP = new ThreadGroup("DelegatorFactory");
+ private static final ScheduledExecutorService executor = ExecutionPool.getScheduledExecutor(DELEGATOR_THREAD_GROUP, "delegator-startup", -1, true);
public static Delegator getDelegator(String delegatorName) {
+ Future<Delegator> future = getDelegatorFuture(delegatorName);
+ try {
+ return future.get();
+ } catch (ExecutionException e) {
+ Debug.logError(e, module);
+ return null;
+ } catch (InterruptedException e) {
+ Debug.logError(e, module);
+ return null;
+ }
+ }
+
+ public static Future<Delegator> getDelegatorFuture(String delegatorName) {
if (delegatorName == null) {
delegatorName = "default";
//Debug.logWarning(new Exception("Location where getting delegator with null name"), "Got a getGenericDelegator call with a null delegatorName, assuming default for the name.", module);
}
do {
- Delegator delegator = delegatorCache.get(delegatorName);
+ Future<Delegator> future = delegators.get(delegatorName);
+ if (future != null) {
+ //Debug.logInfo("got delegator(future(" + delegatorName + ")) from cache", module);
+ return future;
+ }
+ FutureTask<Delegator> futureTask = new FutureTask<Delegator>(new DelegatorConfigurable(delegatorName));
+ //Debug.logInfo("putting delegator(future(" + delegatorName + ")) into cache", module);
+ if (delegators.putIfAbsent(delegatorName, futureTask) != null) {
+ continue;
+ }
+ executor.submit(futureTask);
+ } while (true);
+ }
+
+ public static final class DelegatorConfigurable implements Callable<Delegator> {
+ private final String delegatorName;
+
+ public DelegatorConfigurable(String delegatorName) {
+ this.delegatorName = delegatorName;
+ }
+
+ public Delegator call() throws ClassNotFoundException {
+ try {
+ Delegator delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
- if (delegator != null) {
// setup the Entity ECA Handler
delegator.initEntityEcaHandler();
- //Debug.logInfo("got delegator(" + delegatorName + ") from cache", module);
-
+
// setup the distributed CacheClear
delegator.initDistributedCacheClear();
return delegator;
- }
- try {
- delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
} catch (ClassNotFoundException e) {
Debug.logError(e, module);
+ throw e;
}
- //Debug.logInfo("putting delegator(" + delegatorName + ") into cache", module);
- delegatorCache.putIfAbsent(delegatorName, delegator);
- } while (true);
+ }
}
}