svn commit: r1176461 - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1176461 - in /ofbiz/branches/jackrabbit2010
 
|
Author: sascharodekamp
Date: Tue Sep 27 16:35:29 2011 New Revision: 1176461 URL: http://svn.apache.org/viewvc?rev=1176461&view=rev Log: Update the Jackrabbit branch with the current trunk version to keep the branch up to date Modified: ofbiz/branches/jackrabbit20100709/ (props changed) ofbiz/branches/jackrabbit20100709/applications/accounting/entitydef/entitymodel.xml ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java ofbiz/branches/jackrabbit20100709/applications/order/entitydef/entitymodel_view.xml ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed) ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed) ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel_shipment.xml ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed) ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/product/ProductSearch.java ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/StoreScreens.xml ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/KeyStoreUtil.java ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml ofbiz/branches/jackrabbit20100709/framework/common/entitydef/entitymodel.xml ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl ofbiz/branches/jackrabbit20100709/framework/common/widget/HelpScreens.xml (props changed) ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/Delegator.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/GenericDelegator.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/GenericEntity.java ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java ofbiz/branches/jackrabbit20100709/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java ofbiz/branches/jackrabbit20100709/framework/jetty/src/org/ofbiz/jetty/container/JettyContainer.java ofbiz/branches/jackrabbit20100709/framework/security/data/PasswordSecurityData.xml (props changed) ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/RunningService.java ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/ServiceDispatcher.java ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java ofbiz/branches/jackrabbit20100709/framework/start/src/org/ofbiz/base/start/Start.java ofbiz/branches/jackrabbit20100709/framework/widget/templates/htmlFormMacroLibrary.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/assetmaint/entitydef/entitymodel.xml ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/lib/ (props changed) ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/OrderScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed) ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed) ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed) Propchange: ofbiz/branches/jackrabbit20100709/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 27 16:35:29 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4:951708-952957 /ofbiz/branches/jquery:952958-1044489 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:962442-1173263 +/ofbiz/trunk:962442-1176458 Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/entitydef/entitymodel.xml?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/entitydef/entitymodel.xml Tue Sep 27 16:35:29 2011 @@ -4073,8 +4073,8 @@ under the License. <!-- Extend Entity Inventory Item for relation Fix Asset --> <extend-entity entity-name="InventoryItem"> <field name="fixedAssetId" type="id"></field> - <relation type="one" fk-name="FIXED_ASSET" title="FixedAsset" rel-entity-name="InventoryItem"> - <key-map field-name="fixedAssetId" rel-field-name="inventoryItemId"/> + <relation type="one" fk-name="IYIM_FAST" title="FixedAsset" rel-entity-name="FixedAsset"> + <key-map field-name="fixedAssetId"/> </relation> </extend-entity> </entitymodel> Modified: ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java Tue Sep 27 16:35:29 2011 @@ -99,7 +99,7 @@ public class PermissionRecorder { } public void setContentPurposeOperations(List<GenericValue> opList) { - contentPurposeOperations = (GenericValue [])opList.toArray(); + contentPurposeOperations = opList.toArray(new GenericValue[opList.size()]); } public void setPrivilegeEnumId(String id) { @@ -115,7 +115,7 @@ public class PermissionRecorder { } public void setStatusTargets(List<String> opList) { - statusTargets = (String [])opList.toArray(); + statusTargets = opList.toArray(new String[opList.size()]); } public String [] getTargetOperations() { @@ -123,7 +123,7 @@ public class PermissionRecorder { } public void setTargetOperations(List<String> opList) { - targetOperations = (String [])opList.toArray(); + targetOperations = opList.toArray(new String[opList.size()]); } public void setCurrentContentId(String id) { Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java Tue Sep 27 16:35:29 2011 @@ -39,7 +39,7 @@ import org.ofbiz.service.LocalDispatcher /** - * ProductionRun Object used by the Jobshop management OFBiz comonents, + * ProductionRun Object used by the Jobshop management OFBiz components, * this object is used to find or updated an existing ProductionRun. * */ @@ -64,7 +64,7 @@ public class ProductionRun { /** * indicate if quantity or estimatedStartDate has been modified and - * estimatedCompletionDate not yet recalculated with recalculateEstimatedCompletionDate() methode. + * estimatedCompletionDate not yet recalculated with recalculateEstimatedCompletionDate() method. */ private boolean updateCompletionDate = false; /** @@ -274,7 +274,7 @@ public class ProductionRun { } } /** - * call recalculateEstimatedCompletionDate(0,estimatedStartDate), so recalculated for all the routingtask. + * call recalculateEstimatedCompletionDate(0,estimatedStartDate), so recalculated for all the routing tasks. */ public Timestamp recalculateEstimatedCompletionDate() { this.updateCompletionDate = false; @@ -382,7 +382,7 @@ public class ProductionRun { /** * clear list of all the productionRunRoutingTasks to force re-reading at the next need. - * This methode is used when the routingTasks ordering is changed. + * This method is used when the routingTasks ordering is changed. **/ public void clearRoutingTasksList() { this.productionRunRoutingTasks = null; Modified: ofbiz/branches/jackrabbit20100709/applications/order/entitydef/entitymodel_view.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/entitydef/entitymodel_view.xml?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/entitydef/entitymodel_view.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/entitydef/entitymodel_view.xml Tue Sep 27 16:35:29 2011 @@ -1716,7 +1716,9 @@ under the License. <member-entity entity-alias="OI" entity-name="OrderItem"/> <member-entity entity-alias="PR" entity-name="Product"/> <alias-all entity-alias="OI"/> - <alias-all entity-alias="PR"/> + <alias-all entity-alias="PR"> + <exclude field="comments"/> + </alias-all> <view-link entity-alias="OI" rel-entity-alias="PR"> <key-map field-name="productId"/> </view-link> @@ -1724,5 +1726,4 @@ under the License. <key-map field-name="productId"/> </relation> </view-entity> - </entitymodel> Propchange: ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 27 16:35:29 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-952957 /ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:952958-1044489 /ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264 -/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:962442-1173263 +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:962442-1176458 Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl Tue Sep 27 16:35:29 2011 @@ -16,52 +16,54 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#-- variable setup and worker calls --> -<#assign topLevelList = requestAttributes.topLevelList?if_exists> -<#assign curCategoryId = requestAttributes.curCategoryId?if_exists> - -<#-- looping macro --> -<#macro categoryList parentCategory category> - <#if parentCategory.productCategoryId != category.productCategoryId> - <#local previousCategoryId = parentCategory.productCategoryId /> - </#if> - - <#if (Static["org.ofbiz.product.category.CategoryWorker"].checkTrailItem(request, category.getString("productCategoryId"))) || (curCategoryId?exists && curCategoryId == category.productCategoryId)> - <li> - <#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists> - <a href="<@ofbizCatalogAltUrl productCategoryId=category.productCategoryId previousCategoryId=previousCategoryId!""/>" class="<#if curCategoryId?exists && curCategoryId == category.productCategoryId>buttontextdisabled<#else>linktext</#if>"> - <#if catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?exists> - ${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")} - <#elseif catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists> - ${catContentWrappers[category.productCategoryId].get("DESCRIPTION")} - <#else> - ${category.description?if_exists} - </#if> - </a> - </#if> - </li> - <#local subCatList = Static["org.ofbiz.product.category.CategoryWorker"].getRelatedCategoriesRet(request, "subCatList", category.getString("productCategoryId"), true)> - <#if subCatList?exists> - <#list subCatList as subCat> - <@categoryList parentCategory=category category=subCat/> - </#list> - </#if> - </#if> -</#macro> - <div class="breadcrumbs"> +<#assign isDefaultTheme = !layoutSettings.VT_FTR_TMPLT_LOC?contains("multiflex")> +<#if isDefaultTheme> + <a href="<@ofbizUrl>main</@ofbizUrl>" class="linktext">${uiLabelMap.CommonMain}</a> > +<#else> <ul> <li> <a href="<@ofbizUrl>main</@ofbizUrl>" class="linktext">${uiLabelMap.CommonMain}</a> </li> +</#if> <#-- Show the category branch --> - <#list topLevelList as category> - <@categoryList parentCategory=category category=category/> - </#list> + <#assign crumbs = Static["org.ofbiz.product.category.CategoryWorker"].getTrail(request)/> + <#list crumbs as crumb> + <#if catContentWrappers?exists && catContentWrappers[crumb]?exists> + <#if !isDefaultTheme> + <li> + <a href="<@ofbizCatalogUrl currentCategoryId=crumb previousCategoryId=previousCategoryId!""/>" class="<#if crumb_has_next>linktext<#else>buttontextdisabled</#if>"> + <#if catContentWrappers[crumb].get("CATEGORY_NAME")?exists> + ${catContentWrappers[crumb].get("CATEGORY_NAME")} + <#elseif catContentWrappers[crumb].get("DESCRIPTION")?exists> + ${catContentWrappers[crumb].get("DESCRIPTION")} + <#else> + ${crumb} + </#if> + </a> + </li> + <#else> + <a href="<@ofbizCatalogUrl currentCategoryId=crumb previousCategoryId=previousCategoryId!""/>" class="<#if crumb_has_next>linktext<#else>buttontextdisabled</#if>"> + <#if catContentWrappers[crumb].get("CATEGORY_NAME")?exists> + ${catContentWrappers[crumb].get("CATEGORY_NAME")} + <#elseif catContentWrappers[crumb].get("DESCRIPTION")?exists> + ${catContentWrappers[crumb].get("DESCRIPTION")} + <#else> + ${crumb} + </#if> + </a> + <#if crumb_has_next> ></#if> + </#if> + <#assign previousCategoryId = crumb /> + </#if> + </#list> <#-- Show the product, if there is one --> <#if productContentWrapper?exists> - <li>${productContentWrapper.get("PRODUCT_NAME")?if_exists}</li> + <#if isDefaultTheme> + > ${productContentWrapper.get("PRODUCT_NAME")?if_exists} + <#else> + <li>${productContentWrapper.get("PRODUCT_NAME")?if_exists}</li> + </ul> + </#if> </#if> - </ul> </div> -<br /> Modified: ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java Tue Sep 27 16:35:29 2011 @@ -1149,6 +1149,12 @@ public class CommunicationEventServices tempResults.addAll(filteredList); } catch (GenericEntityException e) { Debug.logError(e, module); + } finally { + try { + listIt.close(); + } catch (GenericEntityException e) { + Debug.logError(e, module); + } } } } Propchange: ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 27 16:35:29 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-952957 /ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:952958-1044489 /ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264 -/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:962442-1173263 +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:962442-1176458 Modified: ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml Tue Sep 27 16:35:29 2011 @@ -1975,10 +1975,34 @@ under the License. <view-entity entity-name="InventoryItemAndDetail" package-name="org.ofbiz.product.inventory"> <member-entity entity-alias="II" entity-name="InventoryItem"/> <member-entity entity-alias="IID" entity-name="InventoryItemDetail"/> - <alias-all entity-alias="II"/> - <alias-all entity-alias="IID"> - <exclude field="unitCost"/> - </alias-all> + <alias-all entity-alias="IID"/> + <alias entity-alias="II" name="inventoryItemId"/> + <alias entity-alias="II" name="inventoryItemTypeId"/> + <alias entity-alias="II" name="productId"/> + <alias entity-alias="II" name="partyId"/> + <alias entity-alias="II" name="ownerPartyId"/> + <alias entity-alias="II" name="statusId"/> + <alias entity-alias="II" name="datetimeReceived"/> + <alias entity-alias="II" name="datetimeManufactured"/> + <alias entity-alias="II" name="expireDate"/> + <alias entity-alias="II" name="facilityId"/> + <alias entity-alias="II" name="containerId"/> + <alias entity-alias="II" name="lotId"/> + <alias entity-alias="II" name="uomId"/> + <alias entity-alias="II" name="binNumber"/> + <alias entity-alias="II" name="locationSeqId"/> + <alias entity-alias="II" name="comments"/> + <alias entity-alias="II" name="quantityOnHandTotal"/> + <alias entity-alias="II" name="availableToPromiseTotal"/> + <alias entity-alias="II" name="accountingQuantityTotal"/> + <alias entity-alias="II" name="oldQuantityOnHand"/> + <alias entity-alias="II" name="oldAvailableToPromise"/> + <alias entity-alias="II" name="serialNumber"/> + <alias entity-alias="II" name="softIdentifier"/> + <alias entity-alias="II" name="activationNumber"/> + <alias entity-alias="II" name="activationValidThru"/> + <alias entity-alias="II" name="currencyUomId"/> + <alias entity-alias="II" name="inventoryItemFixedAssetId" field="fixedAssetId"/> <view-link entity-alias="II" rel-entity-alias="IID"> <key-map field-name="inventoryItemId"/> </view-link> Modified: ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel_shipment.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel_shipment.xml?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel_shipment.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel_shipment.xml Tue Sep 27 16:35:29 2011 @@ -93,9 +93,36 @@ under the License. <member-entity entity-alias="IISS" entity-name="ItemIssuance"/> <member-entity entity-alias="IITM" entity-name="InventoryItem"/> <alias-all entity-alias="IISS"/> - <alias-all entity-alias="IITM"/> + <alias entity-alias="IITM" name="inventoryItemId"/> + <alias entity-alias="IITM" name="inventoryItemTypeId"/> + <alias entity-alias="IITM" name="productId"/> + <alias entity-alias="IITM" name="partyId"/> + <alias entity-alias="IITM" name="ownerPartyId"/> + <alias entity-alias="IITM" name="statusId"/> + <alias entity-alias="IITM" name="datetimeReceived"/> + <alias entity-alias="IITM" name="datetimeManufactured"/> + <alias entity-alias="IITM" name="expireDate"/> + <alias entity-alias="IITM" name="facilityId"/> + <alias entity-alias="IITM" name="containerId"/> + <alias entity-alias="IITM" name="lotId"/> + <alias entity-alias="IITM" name="uomId"/> + <alias entity-alias="IITM" name="binNumber"/> + <alias entity-alias="IITM" name="locationSeqId"/> + <alias entity-alias="IITM" name="comments"/> + <alias entity-alias="IITM" name="quantityOnHandTotal"/> + <alias entity-alias="IITM" name="availableToPromiseTotal"/> + <alias entity-alias="IITM" name="accountingQuantityTotal"/> + <alias entity-alias="IITM" name="oldQuantityOnHand"/> + <alias entity-alias="IITM" name="oldAvailableToPromise"/> + <alias entity-alias="IITM" name="serialNumber"/> + <alias entity-alias="IITM" name="softIdentifier"/> + <alias entity-alias="IITM" name="activationNumber"/> + <alias entity-alias="IITM" name="activationValidThru"/> + <alias entity-alias="IITM" name="unitCost"/> + <alias entity-alias="IITM" name="currencyUomId"/> + <alias entity-alias="IITM" name="inventoryItemFixedAssetId" field="fixedAssetId"/> <view-link entity-alias="IISS" rel-entity-alias="IITM"> - <key-map field-name="inventoryItemId"/> + <key-map field-name="inventoryItemId"/> </view-link> </view-entity> <entity entity-name="ItemIssuanceRole" Propchange: ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/test/InventoryTests.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 27 16:35:29 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-952957 /ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:952958-1044489 /ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264 -/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:962442-1173263 +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:962442-1176458 Modified: ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/product/ProductSearch.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/product/ProductSearch.java?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/product/ProductSearch.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/product/ProductSearch.java Tue Sep 27 16:35:29 2011 @@ -1310,7 +1310,7 @@ public class ProductSearch { @Override public boolean equals(Object obj) { ProductSearchConstraint psc = (ProductSearchConstraint) obj; - if (psc instanceof FeatureConstraint) { + if (psc instanceof FeatureSetConstraint) { FeatureSetConstraint that = (FeatureSetConstraint) psc; if (this.productFeatureIdSet == null) { if (that.productFeatureIdSet != null) { Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/StoreScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/StoreScreens.xml?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/StoreScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/StoreScreens.xml Tue Sep 27 16:35:29 2011 @@ -193,8 +193,10 @@ under the License. <set field="headerItem" value="store"/> <set field="tabButtonItem" value="EditProductStoreWebSites"/> <set field="labelTitleProperty" value="ProductProductStoreWebSites"/> + <set field="productStoreId" from-field="parameters.viewProductStoreId"/> + <set field="productStoreId" from-field="parameters.productStoreId" default-value="${productStoreId}"/> <entity-condition entity-name="WebSite" list="storeWebSites"> - <condition-expr field-name="productStoreId" from-field="parameters.productStoreId"/> + <condition-expr field-name="productStoreId" from-field="productStoreId"/> <order-by field-name="siteName"/> </entity-condition> <entity-condition entity-name="WebSite" list="webSites"> Modified: ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/KeyStoreUtil.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/KeyStoreUtil.java?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/KeyStoreUtil.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/KeyStoreUtil.java Tue Sep 27 16:35:29 2011 @@ -176,7 +176,7 @@ public class KeyStoreUtil { certs[0] = cert; } else { Debug.log("Certificate chain length : " + certCol.size(), module); - certs = (Certificate[]) certCol.toArray(); + certs = certCol.toArray(new Certificate[certCol.size()]); } ks.setKeyEntry(alias, pk, keyPass.toCharArray(), certs); Modified: ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml Tue Sep 27 16:35:29 2011 @@ -222,6 +222,7 @@ </property> <property key="CommonAddAColumnToThisPortalPage"> <value xml:lang="en">Add a new column to this portal</value> + <value xml:lang="fr">Ajouter une nouvelle colonne àce portail</value> <value xml:lang="it">Aggiunge una nuova colonna a questa pagina</value> <value xml:lang="pt_BR">Adicionar uma nova coluna neste portal</value> </property> @@ -2161,16 +2162,19 @@ </property> <property key="CommonDeleteColumn"> <value xml:lang="en">Delete Column</value> + <value xml:lang="fr">Supprimer la colonne</value> <value xml:lang="it">Elimina colonna</value> <value xml:lang="pt_BR">Excluir Coluna</value> </property> <property key="CommonDeleteThisColumn"> <value xml:lang="en">Delete this column</value> + <value xml:lang="fr">Supprimer cette colonne</value> <value xml:lang="it">Elimina questa colonna</value> <value xml:lang="pt_BR">Apagar esta coluna</value> </property> <property key="CommonDeleteThisPortlet"> <value xml:lang="en">Delete this portlet</value> + <value xml:lang="fr">Supprimer cette portlet</value> <value xml:lang="it">Elimina questo portlet</value> <value xml:lang="pt_BR">Excluir este portlet</value> </property> @@ -5203,6 +5207,7 @@ </property> <property key="CommonNewPortalPage"> <value xml:lang="en">New Portal Page</value> + <value xml:lang="fr">Nouvelle page portail</value> <value xml:lang="it">Nuova pagina portale</value> <value xml:lang="pt_BR">Nova página do Portal</value> </property> @@ -5416,6 +5421,7 @@ </property> <property key="CommonNoPortalPageDataFound"> <value xml:lang="en">No portal page data found. You may not have the necessary seed or other data for it.</value> + <value xml:lang="fr">Aucune donnée pour la page portail. Vous n'avez peut être pas chargé les données nécesaires.</value> <value xml:lang="it">Dati portal page non trovati.</value> <value xml:lang="pt_BR">Não há dados da página do portal encontrados. Você pode não ter a semente ou outros dados necessários para isso.</value> </property> Modified: ofbiz/branches/jackrabbit20100709/framework/common/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/entitydef/entitymodel.xml?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/entitydef/entitymodel.xml Tue Sep 27 16:35:29 2011 @@ -267,8 +267,7 @@ under the License. <key-map field-name="geoIdTo" rel-field-name="geoId"/> </view-link> <view-link entity-alias="GA" rel-entity-alias="GWS"> - <key-map field-name="geoId" rel-field-name="geoId"/> - <key-map field-name="geoAssocTypeId"/> + <key-map field-name="geoId"/> </view-link> </view-entity> <entity entity-name="GeoAssocType" package-name="org.ofbiz.common.geo" Modified: ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl Tue Sep 27 16:35:29 2011 @@ -48,7 +48,7 @@ under the License. <#if (key == context.returnField)> <#assign returnField = field/> <#else> - <#assign displayString = displayString + field + " "> + <#assign displayString = displayString + StringUtil.wrapString(field) + " "> </#if> </#if> </#list> Propchange: ofbiz/branches/jackrabbit20100709/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 27 16:35:29 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/framework/common/widget/HelpScreens.xml:951708-952957 /ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml:952958-1044489 /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264 -/ofbiz/trunk/framework/common/widget/HelpScreens.xml:962442-1173263 +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:962442-1176458 Modified: ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/Delegator.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/Delegator.java?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/Delegator.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/Delegator.java Tue Sep 27 16:35:29 2011 @@ -603,7 +603,7 @@ public interface Delegator { public String getGroupHelperName(String groupName); public GenericHelperInfo getGroupHelperInfo(String entityGroupName); - + /** * Gets the instance of ModelEntity that corresponds to this delegator and * the specified entityName @@ -1208,20 +1208,7 @@ public interface Delegator { * @throws GenericEntityException */ public int storeByCondition(String entityName, Map<String, ? extends Object> fieldsToSet, EntityCondition condition, boolean doCacheClear) throws GenericEntityException; - - /** - * Enables/Disables the JMS listeners globally - * (this will not effect any dispatchers already running) - * @param enable - */ - public void enableJMS(boolean enable); - - /** - * Get Enabled/Disabled JMS listeners status - * @return boolean true is JMS listeners are enabled - */ - public boolean getEnabledJMS(); - + /** * Get use of Distributed Cache Clear mechanism status * @return boolean true if this delegator uses a Distributed Cache Clear mechanism Modified: ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/GenericDelegator.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/GenericDelegator.java?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/GenericDelegator.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/GenericDelegator.java Tue Sep 27 16:35:29 2011 @@ -320,10 +320,7 @@ public class GenericDelegator implements try { Class<?> eecahClass = loader.loadClass(entityEcaHandlerClassName); this.entityEcaHandler = UtilGenerics.cast(eecahClass.newInstance()); - boolean isJmsEnabled = getEnabledJMS(); - enableJMS(!getDelegatorInfo().useDistributedCacheClear); // To avoid duplicated JMS listeners (OFBIZ-4296) this.entityEcaHandler.setDelegator(this); - enableJMS(isJmsEnabled); } catch (ClassNotFoundException e) { Debug.logWarning(e, "EntityEcaHandler class with name " + entityEcaHandlerClassName + " was not found, Entity ECA Rules will be disabled", module); } catch (InstantiationException e) { @@ -2881,7 +2878,7 @@ public class GenericDelegator implements } // If useDistributedCacheClear is false do nothing: the distributedCacheClear member field with a null value would cause dcc code to do nothing - if (getDelegatorInfo().useDistributedCacheClear) { + if (useDistributedCacheClear()) { //time to do some tricks with manual class loading that resolves circular dependencies, like calling services ClassLoader loader = Thread.currentThread().getContextClassLoader(); // initialize the distributedCacheClear mechanism @@ -2904,20 +2901,6 @@ public class GenericDelegator implements Debug.logVerbose("Distributed Cache Clear System disabled for delegator [" + delegatorFullName + "]", module); } } - - /* (non-Javadoc) - * @see org.ofbiz.entity.Delegator#enableJMS() - */ - public void enableJMS(boolean enable) { - this.enableJMS = enable; - } - - /* (non-Javadoc) - * @see org.ofbiz.entity.Delegator#getEnableJMS() - */ - public boolean getEnabledJMS() { - return this.enableJMS; - } /* (non-Javadoc) * @see org.ofbiz.entity.Delegator#getEnableJMS() Modified: ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/GenericEntity.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/GenericEntity.java?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/GenericEntity.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/GenericEntity.java Tue Sep 27 16:35:29 2011 @@ -814,11 +814,39 @@ public class GenericEntity extends Obser keyBuffer.append('.'); keyBuffer.append(name); // finish off by adding the values of all PK fields - Iterator<ModelField> iter = modelEntity.getPksIterator(); - while (iter != null && iter.hasNext()) { - ModelField curField = iter.next(); - keyBuffer.append('.'); - keyBuffer.append(this.get(curField.getName())); + if (modelEntity instanceof ModelViewEntity){ + // retrieve pkNames of realEntity + ModelViewEntity modelViewEntiy = (ModelViewEntity) modelEntity; + List<String> pkNamesToUse = FastList.newInstance(); + // iterate on realEntity for pkField + Iterator<ModelField> iter = modelEntityToUse.getPksIterator(); + while (iter != null && iter.hasNext()) { + ModelField curField = iter.next(); + String pkName = null; + Iterator<ModelAlias> iterAlias = modelViewEntiy.getAliasesIterator(); + //search aliasName for pkField of realEntity + while (iterAlias != null && iterAlias.hasNext()) { + ModelAlias aliasField = iterAlias.next(); + if (aliasField.getField().equals(curField.getName())){ + pkName = aliasField.getName(); + break; + } + } + if (pkName == null) pkName = curField.getName(); + pkNamesToUse.add(pkName); + } + // read value with modelEntity name of pkNames + for (String pkName : pkNamesToUse) { + keyBuffer.append('.'); + keyBuffer.append(this.get(pkName)); + } + } else { + Iterator<ModelField> iter = modelEntity.getPksIterator(); + while (iter != null && iter.hasNext()) { + ModelField curField = iter.next(); + keyBuffer.append('.'); + keyBuffer.append(this.get(curField.getName())); + } } String bundleKey = keyBuffer.toString(); Modified: ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java Tue Sep 27 16:35:29 2011 @@ -25,6 +25,8 @@ import java.util.LinkedList; import java.util.List; import java.util.StringTokenizer; +import javolution.util.FastList; + import org.ofbiz.base.component.ComponentConfig; import org.ofbiz.base.config.GenericConfigException; import org.ofbiz.base.config.MainResourceHandler; @@ -176,23 +178,33 @@ public class EntityDataLoader { return urlList; } - public static <E> List<URL> getUrlByComponentList(String helperName, List<String> components, List<E> readerNames) { - String paths = getPathsString(helperName); + public static List<URL> getUrlByComponentList(String helperName, List<String> components, List<String> readerNames) { List<URL> urlList = new LinkedList<URL>(); - for (String component : components) { - urlList.addAll(getUrlList(helperName, component, readerNames)); + for (String readerName: readerNames) { + List<String> loadReaderNames = FastList.newInstance(); + loadReaderNames.add(readerName); + for (String component : components) { + urlList.addAll(getUrlList(helperName, component, loadReaderNames)); + } } return urlList; } public static List<URL> getUrlByComponentList(String helperName, List<String> components) { DatasourceInfo datasourceInfo = EntityConfigUtil.getDatasourceInfo(helperName); - List<URL> urlList = new LinkedList<URL>(); - for (String component : components) { - urlList.addAll(getUrlList(helperName, component)); + List<String> readerNames = FastList.newInstance(); + for (Object readerInfo : datasourceInfo.readDatas) { + String readerName = null; + if (readerInfo instanceof Element) { + readerName = ((Element) readerInfo).getAttribute("reader-name"); + } else { + throw new IllegalArgumentException("Reader name list does not contain String(s) or Element(s)"); + } + readerNames.add(readerName); } - return urlList; + return getUrlByComponentList(helperName, components, readerNames); } + public static int loadData(URL dataUrl, String helperName, Delegator delegator, List<Object> errorMessages) throws GenericEntityException { return loadData(dataUrl, helperName, delegator, errorMessages, -1); } Modified: ofbiz/branches/jackrabbit20100709/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java Tue Sep 27 16:35:29 2011 @@ -67,7 +67,6 @@ public class EntityDataLoadContainer imp protected String directory = null; protected List<String> files = FastList.newInstance(); protected String component = null; - protected List<String> components = FastList.newInstance(); protected boolean useDummyFks = false; protected boolean maintainTxs = false; protected boolean tryInserts = false; @@ -308,22 +307,23 @@ public class EntityDataLoadContainer imp } } // load specify components + List<String> loadComponents = FastList.newInstance(); if (UtilValidate.isNotEmpty(delegator.getDelegatorTenantId()) && "Y".equals(UtilProperties.getPropertyValue("general.properties", "multitenant"))) { try { List<EntityExpr> exprs = FastList.newInstance(); exprs.add(EntityCondition.makeCondition("rootLocation", EntityOperator.NOT_LIKE, "%hot-deploy%")); EntityCondition cond = EntityCondition.makeCondition(exprs); - List<GenericValue> components = delegator.findList("Component", cond , null, null, null, false); + List<GenericValue> components = delegator.findList("Component", cond , null, UtilMisc.toList("lastUpdatedStamp"), null, false); Debug.logInfo("===== Begin load specify components", module); if (UtilValidate.isEmpty(this.component)) { for (GenericValue component : components) { - this.components.add(component.getString("componentName")); + loadComponents.add(component.getString("componentName")); //Debug.logInfo("- loaded default component : " + component.getString("componentName"), module); } Debug.logInfo("- Loaded components by default : " + components.size() + " components", module); List<GenericValue> tenantComponents = delegator.findByAnd("TenantComponent", UtilMisc.toMap("tenantId", delegator.getDelegatorTenantId()), UtilMisc.toList("sequenceNum")); for (GenericValue tenantComponent : tenantComponents) { - this.components.add(tenantComponent.getString("componentName")); + loadComponents.add(tenantComponent.getString("componentName")); //Debug.logInfo("- loaded component by tenantId : " + tenantComponent.getString("tenantId") +", component : " + tenantComponent.getString("componentName"), module); } Debug.logInfo("- Loaded components by tenantId : " + delegator.getDelegatorTenantId() + ", " + tenantComponents.size() + " components", module); @@ -331,12 +331,12 @@ public class EntityDataLoadContainer imp List<GenericValue> tenantComponents = delegator.findByAnd("TenantComponent", UtilMisc.toMap("tenantId", delegator.getDelegatorTenantId(), "componentName", this.component), UtilMisc.toList("sequenceNum")); for (GenericValue tenantComponent : tenantComponents) { - this.components.add(tenantComponent.getString("componentName")); + loadComponents.add(tenantComponent.getString("componentName")); //Debug.logInfo("- loaded component by tenantId : " + tenantComponent.getString("tenantId") +", component : " + tenantComponent.getString("componentName"), module); } Debug.logInfo("- Loaded tenantId : " + delegator.getDelegatorTenantId() + " and component : " + this.component, module); } - Debug.logInfo("===== Loaded : " + this.components.size() + " components", module); + Debug.logInfo("===== Loaded : " + loadComponents.size() + " components", module); } catch (GenericEntityException e) { Debug.logError(e.getMessage(), module); } @@ -418,11 +418,11 @@ public class EntityDataLoadContainer imp // get the reader name URLs first List<URL> urlList = FastList.newInstance(); - if (UtilValidate.isNotEmpty(this.components)) { + if (UtilValidate.isNotEmpty(loadComponents)) { if (UtilValidate.isNotEmpty(readerNames)) { - urlList = EntityDataLoader.getUrlByComponentList(helperInfo.getHelperBaseName(), this.components, readerNames); + urlList = EntityDataLoader.getUrlByComponentList(helperInfo.getHelperBaseName(), loadComponents, readerNames); } else if (!"none".equalsIgnoreCase(this.readers)) { - urlList = EntityDataLoader.getUrlByComponentList(helperInfo.getHelperBaseName(), this.components); + urlList = EntityDataLoader.getUrlByComponentList(helperInfo.getHelperBaseName(), loadComponents); } } else { if (UtilValidate.isNotEmpty(readerNames)) { Modified: ofbiz/branches/jackrabbit20100709/framework/jetty/src/org/ofbiz/jetty/container/JettyContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/jetty/src/org/ofbiz/jetty/container/JettyContainer.java?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/jetty/src/org/ofbiz/jetty/container/JettyContainer.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/jetty/src/org/ofbiz/jetty/container/JettyContainer.java Tue Sep 27 16:35:29 2011 @@ -118,7 +118,7 @@ public class JettyContainer implements C // set the virtual hosts if (UtilValidate.isNotEmpty(virtualHosts)) { - context.setVirtualHosts((String[]) virtualHosts.toArray()); + context.setVirtualHosts(virtualHosts.toArray(new String[virtualHosts.size()])); } // set the init parameters Propchange: ofbiz/branches/jackrabbit20100709/framework/security/data/PasswordSecurityData.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 27 16:35:29 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/applications/securityext/data/PasswordSecurityData.xml:951708-952957 /ofbiz/branches/jquery/applications/securityext/data/PasswordSecurityData.xml:952958-1044489 /ofbiz/branches/multitenant20100310/applications/securityext/data/PasswordSecurityData.xml:921280-927264 -/ofbiz/trunk/framework/security/data/PasswordSecurityData.xml:962442-1173263 +/ofbiz/trunk/framework/security/data/PasswordSecurityData.xml:962442-1176458 Modified: ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/RunningService.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/RunningService.java?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/RunningService.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/RunningService.java Tue Sep 27 16:35:29 2011 @@ -71,7 +71,7 @@ public class RunningService { public boolean equals(Object o) { if (o != null && o instanceof RunningService) { RunningService x = (RunningService) o; - if (this.model.equals(x) && this.mode == x.getMode() && this.startStamp.equals(x.getStartStamp())) { + if (this.model.equals(x.getModelService()) && this.mode == x.getMode() && this.startStamp.equals(x.getStartStamp())) { return true; } } Modified: ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/ServiceDispatcher.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/ServiceDispatcher.java?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/ServiceDispatcher.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/ServiceDispatcher.java Tue Sep 27 16:35:29 2011 @@ -116,8 +116,8 @@ public class ServiceDispatcher { } // make sure we haven't disabled these features from running - if (enableJMS && this.delegator.getEnabledJMS()) { - this.jlf = new JmsListenerFactory(this); + if (enableJMS) { + this.jlf = JmsListenerFactory.getInstance(this); } if (enableSvcs) { Modified: ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java Tue Sep 27 16:35:29 2011 @@ -47,12 +47,27 @@ public class JmsListenerFactory implemen protected static Map<String, GenericMessageListener> listeners = FastMap.newInstance(); protected static Map<String, Element> servers = FastMap.newInstance(); + protected static JmsListenerFactory jlf = null; + protected ServiceDispatcher dispatcher; protected boolean firstPass = true; protected int loadable = 0; protected int connected = 0; protected Thread thread; + + public static JmsListenerFactory getInstance(ServiceDispatcher dispatcher){ + if (jlf == null) { + synchronized (JmsListenerFactory.class) { + if (jlf == null) { + jlf = new JmsListenerFactory(dispatcher); + } + } + } + + return jlf; + } + public JmsListenerFactory(ServiceDispatcher dispatcher) { this.dispatcher = dispatcher; thread = new Thread(this, this.toString()); Modified: ofbiz/branches/jackrabbit20100709/framework/start/src/org/ofbiz/base/start/Start.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/start/src/org/ofbiz/base/start/Start.java?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/start/src/org/ofbiz/base/start/Start.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/start/src/org/ofbiz/base/start/Start.java Tue Sep 27 16:35:29 2011 @@ -236,7 +236,10 @@ public class Start { } private String sendSocketCommand(String command) throws IOException, ConnectException { - Socket socket = new Socket(config.adminAddress, config.adminPort); + String response = "OFBiz Down"; + + try { + Socket socket = new Socket(config.adminAddress, config.adminPort); // send the command PrintWriter writer = new PrintWriter(socket.getOutputStream(), true); @@ -245,7 +248,7 @@ public class Start { // read the reply BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream())); - String response = reader.readLine(); + response = reader.readLine(); reader.close(); @@ -253,6 +256,9 @@ public class Start { writer.close(); socket.close(); + } catch (ConnectException e) { + System.out.println("Could not connect to " + config.adminAddress + ":" + config.adminPort); + } return response; } Modified: ofbiz/branches/jackrabbit20100709/framework/widget/templates/htmlFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/widget/templates/htmlFormMacroLibrary.ftl (original) +++ ofbiz/branches/jackrabbit20100709/framework/widget/templates/htmlFormMacroLibrary.ftl Tue Sep 27 16:35:29 2011 @@ -195,7 +195,7 @@ under the License. </select>:<select name="${timeMinutesName}" <#if classString?has_content>class="${classString}"</#if>><#rt/> <#assign values = Static["org.ofbiz.base.util.StringUtil"].toList(timeValues)> <#list values as i> - <option value="${i}"<#if minutes?has_content><#if i?number== minutes || ((minutes > i?number )&& (minutes < i?number+(step?number/2))) || ((minutes < i?number )&& (minutes > i?number-(step?number/2)))> selected="selected"</#if></#if>>${i}</option><#rt/> + <option value="${i}"<#if minutes?has_content><#if i?number== minutes ||((i?number==(60 -step?number)) && (minutes > 60 - (step?number/2))) || ((minutes > i?number )&& (minutes < i?number+(step?number/2))) || ((minutes < i?number )&& (minutes > i?number-(step?number/2)))> selected="selected"</#if></#if>>${i}</option><#rt/> </#list> </select> <#rt/> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/assetmaint/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/assetmaint/entitydef/entitymodel.xml?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/assetmaint/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/assetmaint/entitydef/entitymodel.xml Tue Sep 27 16:35:29 2011 @@ -114,9 +114,33 @@ <member-entity entity-alias="IYIM" entity-name="InventoryItem"/> <member-entity entity-alias="PT" entity-name="Product"/> <alias-all entity-alias="IMIE"/> - <alias-all entity-alias="IYIM"> - <exclude field="facilityId"/> - </alias-all> + <alias entity-alias="IYIM" name="inventoryItemId"/> + <alias entity-alias="IYIM" name="inventoryItemTypeId"/> + <alias entity-alias="IYIM" name="productId"/> + <alias entity-alias="IYIM" name="partyId"/> + <alias entity-alias="IYIM" name="ownerPartyId"/> + <alias entity-alias="IYIM" name="statusId"/> + <alias entity-alias="IYIM" name="datetimeReceived"/> + <alias entity-alias="IYIM" name="datetimeManufactured"/> + <alias entity-alias="IYIM" name="expireDate"/> + <alias entity-alias="IYIM" name="containerId"/> + <alias entity-alias="IYIM" name="lotId"/> + <alias entity-alias="IYIM" name="uomId"/> + <alias entity-alias="IYIM" name="binNumber"/> + <alias entity-alias="IYIM" name="locationSeqId"/> + <alias entity-alias="IYIM" name="comments"/> + <alias entity-alias="IYIM" name="quantityOnHandTotal"/> + <alias entity-alias="IYIM" name="availableToPromiseTotal"/> + <alias entity-alias="IYIM" name="accountingQuantityTotal"/> + <alias entity-alias="IYIM" name="oldQuantityOnHand"/> + <alias entity-alias="IYIM" name="oldAvailableToPromise"/> + <alias entity-alias="IYIM" name="serialNumber"/> + <alias entity-alias="IYIM" name="softIdentifier"/> + <alias entity-alias="IYIM" name="activationNumber"/> + <alias entity-alias="IYIM" name="activationValidThru"/> + <alias entity-alias="IYIM" name="unitCost"/> + <alias entity-alias="IYIM" name="currencyUomId"/> + <alias entity-alias="IYIM" name="inventoryItemFixedAssetId" field="fixedAssetId"/> <alias entity-alias="PT" name="productId"/> <alias entity-alias="PT" name="productTypeId"/> <alias entity-alias="PT" name="primaryProductCategoryId"/> @@ -152,9 +176,33 @@ <member-entity entity-alias="IYIM" entity-name="InventoryItem"/> <member-entity entity-alias="IMIE" entity-name="ItemIssuance"/> <alias-all entity-alias="IMIE"/> - <alias-all entity-alias="IYIM"> - <exclude field="facilityId"/> - </alias-all> + <alias entity-alias="IYIM" name="inventoryItemId"/> + <alias entity-alias="IYIM" name="inventoryItemTypeId"/> + <alias entity-alias="IYIM" name="productId"/> + <alias entity-alias="IYIM" name="partyId"/> + <alias entity-alias="IYIM" name="ownerPartyId"/> + <alias entity-alias="IYIM" name="statusId"/> + <alias entity-alias="IYIM" name="datetimeReceived"/> + <alias entity-alias="IYIM" name="datetimeManufactured"/> + <alias entity-alias="IYIM" name="expireDate"/> + <alias entity-alias="IYIM" name="containerId"/> + <alias entity-alias="IYIM" name="lotId"/> + <alias entity-alias="IYIM" name="uomId"/> + <alias entity-alias="IYIM" name="binNumber"/> + <alias entity-alias="IYIM" name="locationSeqId"/> + <alias entity-alias="IYIM" name="comments"/> + <alias entity-alias="IYIM" name="quantityOnHandTotal"/> + <alias entity-alias="IYIM" name="availableToPromiseTotal"/> + <alias entity-alias="IYIM" name="accountingQuantityTotal"/> + <alias entity-alias="IYIM" name="oldQuantityOnHand"/> + <alias entity-alias="IYIM" name="oldAvailableToPromise"/> + <alias entity-alias="IYIM" name="serialNumber"/> + <alias entity-alias="IYIM" name="softIdentifier"/> + <alias entity-alias="IYIM" name="activationNumber"/> + <alias entity-alias="IYIM" name="activationValidThru"/> + <alias entity-alias="IYIM" name="unitCost"/> + <alias entity-alias="IYIM" name="currencyUomId"/> + <alias entity-alias="IYIM" name="inventoryItemFixedAssetId" field="fixedAssetId"/> <alias entity-alias="PT" name="productId"/> <alias entity-alias="PT" name="productTypeId"/> <alias entity-alias="PT" name="primaryProductCategoryId"/> Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/lib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 27 16:35:29 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/specialpurpose/ebaystore/lib:951708-952957 /ofbiz/branches/jquery/specialpurpose/ebaystore/lib:952958-1044489 /ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264 -/ofbiz/trunk/specialpurpose/ebaystore/lib:962442-1173263 +/ofbiz/trunk/specialpurpose/ebaystore/lib:962442-1176458 Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy Tue Sep 27 16:35:29 2011 @@ -22,10 +22,16 @@ import org.ofbiz.party.contact.ContactHe if (userLogin) { party = userLogin.getRelatedOne("Party"); - person = delegator.findByPrimaryKey("Person", [partyId : party.partyId]); - context.partyId = person.partyId; - context.firstName = person.firstName; - context.lastName = person.lastName; + context.partyId = party.partyId + if ("PERSON".equals(party.partyTypeId)) { + person = delegator.findByPrimaryKey("Person", [partyId : party.partyId]); + context.firstName = person.firstName; + context.lastName = person.lastName; + } else { + group = delegator.findByPrimaryKey("PartyGroup", [partyId : party.partyId]); + context.firstName = group.groupName; + context.lastName = ""; + } contactMech = EntityUtil.getFirst(ContactHelper.getContactMech(party, "SHIPPING_LOCATION", "POSTAL_ADDRESS", false)); if (contactMech) { Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl Tue Sep 27 16:35:29 2011 @@ -25,171 +25,7 @@ under the License. <#-- ========================================================================================================================== --> <div id="cartPanel" class="screenlet"> - <h3>${uiLabelMap.EcommerceStep} 1: ${uiLabelMap.PageTitleShoppingCart}</h3> - <div id="cartSummaryPanel" style="display: none;"> - <a href="javascript:void(0);" id="openCartPanel" class="button">${uiLabelMap.EcommerceClickHereToEdit}</a> - <table id="cartSummaryPanel_cartItems" summary="This table displays the list of item added into Shopping Cart."> - <thead> - <tr> - <th id="orderItem">${uiLabelMap.OrderItem}</th> - <th id="description">${uiLabelMap.CommonDescription}</th> - <th id="unitPrice">${uiLabelMap.EcommerceUnitPrice}</th> - <th id="quantity">${uiLabelMap.OrderQuantity}</th> - <th id="adjustment">${uiLabelMap.EcommerceAdjustments}</th> - <th id="itemTotal">${uiLabelMap.EcommerceItemTotal}</th> - </tr> - </thead> - <tfoot> - <tr id="completedCartSubtotalRow"> - <th id="subTotal" scope="row" colspan="5">${uiLabelMap.CommonSubtotal}</th> - <td headers="subTotal" id="completedCartSubTotal"><@ofbizCurrency amount=shoppingCart.getSubTotal() isoCode=shoppingCart.getCurrency() /></td> - </tr> - <#assign orderAdjustmentsTotal = 0 /> - <#list shoppingCart.getAdjustments() as cartAdjustment> - <#assign orderAdjustmentsTotal = orderAdjustmentsTotal + Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(cartAdjustment, shoppingCart.getSubTotal()) /> - </#list> - <tr id="completedCartDiscountRow"> - <th id="productDiscount" scope="row" colspan="5">${uiLabelMap.ProductDiscount}</th> - <td headers="productDiscount" id="completedCartDiscount"><input type="hidden" value="${orderAdjustmentsTotal}" id="initializedCompletedCartDiscount" /><@ofbizCurrency amount=orderAdjustmentsTotal isoCode=shoppingCart.getCurrency() /></td> - </tr> - <tr> - <th id="shippingAndHandling" scope="row" colspan="5">${uiLabelMap.OrderShippingAndHandling}</th> - <td headers="shippingAndHandling" id="completedCartTotalShipping"><@ofbizCurrency amount=shoppingCart.getTotalShipping() isoCode=shoppingCart.getCurrency() /></td> - </tr> - <tr> - <th id="salesTax" scope="row" colspan="5">${uiLabelMap.OrderSalesTax}</th> - <td headers="salesTax" id="completedCartTotalSalesTax"><@ofbizCurrency amount=shoppingCart.getTotalSalesTax() isoCode=shoppingCart.getCurrency() /></td> - </tr> - <tr> - <th id="grandTotal" scope="row" colspan="5">${uiLabelMap.OrderGrandTotal}</th> - <td headers="grandTotal" id="completedCartDisplayGrandTotal"><@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency() /></td> - </tr> - </tfoot> - <tbody> - <#list shoppingCart.items() as cartLine> - <#if cartLine.getProductId()?exists> - <#if cartLine.getParentProductId()?exists> - <#assign parentProductId = cartLine.getParentProductId() /> - <#else> - <#assign parentProductId = cartLine.getProductId() /> - </#if> - <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists /> - <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "" /></#if> - </#if> - <tr id="cartItemDisplayRow_${cartLine_index}"> - <td headers="orderItem"><img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" alt = "Product Image" /></td> - <td headers="description">${cartLine.getName()?if_exists}</td> - <td headers="unitPrice" id="completedCartItemPrice_${cartLine_index}">${cartLine.getDisplayPrice()}</td> - <td headers="quantity"><span id="completedCartItemQty_${cartLine_index}">${cartLine.getQuantity()?string.number}</span></td> - <td headers="adjustment"><span id="completedCartItemAdjustment_${cartLine_index}"><@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency() /></span></td> - <td headers="itemTotal" align="right"><span id="completedCartItemSubTotal_${cartLine_index}"><@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=shoppingCart.getCurrency() /></span></td> - </tr> - </#list> - </tbody> - </table> - </div> - -<#-- ============================================================= --> - <div id="editCartPanel"> - <form id="cartForm" method="post" action="<@ofbizUrl></@ofbizUrl>"> - <fieldset> - <input type="hidden" name="removeSelected" value="false" /> - <div id="cartFormServerError" class="errorMessage"></div> - <table id="editCartPanel_cartItems"> - <thead> - <tr> - <th id="editOrderItem">${uiLabelMap.OrderItem}</th> - <th id="editDescription">${uiLabelMap.CommonDescription}</th> - <th id="editUnitPrice">${uiLabelMap.EcommerceUnitPrice}</th> - <th id="editQuantity">${uiLabelMap.OrderQuantity}</th> - <th id="editAdjustment">${uiLabelMap.EcommerceAdjustments}</th> - <th id="editItemTotal">${uiLabelMap.EcommerceItemTotal}</th> - <th id="removeItem">${uiLabelMap.FormFieldTitle_removeButton}</th> - </tr> - </thead> - <tfoot> - <tr> - <th scope="row" colspan="6">${uiLabelMap.CommonSubtotal}</th> - <td id="cartSubTotal"><@ofbizCurrency amount=shoppingCart.getSubTotal() isoCode=shoppingCart.getCurrency() /></td> - </tr> - <tr> - <th scope="row" colspan="6">${uiLabelMap.ProductDiscount}</th> - <td id="cartDiscountValue"> - <#assign orderAdjustmentsTotal = 0 /> - <#list shoppingCart.getAdjustments() as cartAdjustment> - <#assign orderAdjustmentsTotal = orderAdjustmentsTotal + Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(cartAdjustment, shoppingCart.getSubTotal()) /> - </#list> - <@ofbizCurrency amount=orderAdjustmentsTotal isoCode=shoppingCart.getCurrency() /> - </td> - </tr> - <tr> - <th scope="row" colspan="6">${uiLabelMap.OrderShippingAndHandling}</th> - <td id="cartTotalShipping"><@ofbizCurrency amount=shoppingCart.getTotalShipping() isoCode=shoppingCart.getCurrency() /></td> - </tr> - <tr> - <th scope="row" colspan="6">${uiLabelMap.OrderSalesTax}</th> - <td id="cartTotalSalesTax"><@ofbizCurrency amount=shoppingCart.getTotalSalesTax() isoCode=shoppingCart.getCurrency() /></td> - </tr> - <tr> - <th scope="row" colspan="6">${uiLabelMap.OrderGrandTotal}</th> - <td id="cartDisplayGrandTotal"><@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency() /></td> - </tr> - </tfoot> - <tbody id="updateBody"> - <#list shoppingCart.items() as cartLine> - <tr id="cartItemRow_${cartLine_index}"> - <td headers="editOrderItem"> - <#if cartLine.getProductId()?exists> - <#if cartLine.getParentProductId()?exists> - <#assign parentProductId = cartLine.getParentProductId() /> - <#else> - <#assign parentProductId = cartLine.getProductId() /> - </#if> - <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists /> - <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "" /></#if> - <#if smallImageUrl?string?has_content> - <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" alt="Product Image" /> - </#if> - </#if> - </td> - <td headers="editDescription">${cartLine.getName()?if_exists}</td> - <td headers="editUnitPrice" id="itemUnitPrice_${cartLine_index}"><@ofbizCurrency amount=cartLine.getDisplayPrice() isoCode=shoppingCart.getCurrency() /></td> - <td headers="editQuantity"> - <#if cartLine.getIsPromo()> - ${cartLine.getQuantity()?string.number} - <#else> - <input type="hidden" name="cartLineProductId" id="cartLineProductId_${cartLine_index}" value="${cartLine.getProductId()}" /> - <input type="text" name="update${cartLine_index}" id="qty_${cartLine_index}" value="${cartLine.getQuantity()?string.number}" class="required validate-number" /> - <span id="advice-required-qty_${cartLine_index}" style="display:none;" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> - <span id="advice-validate-number-qty_${cartLine_index}" style="display:none;" class="errorMessage"> (${uiLabelMap.CommonPleaseEnterValidNumberInThisField}) </span> - </#if> - </td> - <#if !cartLine.getIsPromo()> - <td headers="editAdjustment" id="addPromoCode_${cartLine_index}"><@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency() /></td> - <#else> - <td headers="editAdjustment"><@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency() /></td> - </#if> - <td headers="editItemTotal" id="displayItem_${cartLine_index}"><@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=shoppingCart.getCurrency() /></td> - <#if !cartLine.getIsPromo()> - <td><a id="removeItemLink_${cartLine_index}" href="javascript:void(0);"><img id="remove_${cartLine_index}" src="<@ofbizContentUrl>/ecommerce/images/remove.png</@ofbizContentUrl>" alt="Remove Item Image" /></a></td> - </#if> - </tr> - </#list> - </tbody> - </table> - </fieldset> - <fieldset id="productPromoCodeFields"> - <div> - <label for="productPromoCode">${uiLabelMap.EcommerceEnterPromoCode}</label> - <input id="productPromoCode" name="productPromoCode" type="text" value="" /> - </div> - </fieldset> - <fieldset> - <a href="javascript:void(0);" class="button" id="updateShoppingCart" >${uiLabelMap.EcommerceContinueToStep} 2</a> - <a style="display: none" class="button" href="javascript:void(0);" id="processingShipping">${uiLabelMap.EcommercePleaseWait}....</a> - </fieldset> - </form> - </div> + ${screens.render("component://ecommerce/widget/CartScreens.xml#UpdateCart")} </div> <#-- ========================================================================================================================== --> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/OrderScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/OrderScreens.xml?rev=1176461&r1=1176460&r2=1176461&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/OrderScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/OrderScreens.xml Tue Sep 27 16:35:29 2011 @@ -613,7 +613,6 @@ under the License. <set field="titleProperty" value="EcommerceOnePageCheckout"/> <set field="layoutSettings.javaScripts[]" value="/ecommerce/images/checkoutProcess.js" global="true"/> <set field="layoutSettings.javaScripts[]" value="/ordermgr/images/js/geoAutoCompleter.js" global="true"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/cart/ShowCart.groovy"/> <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy"/> <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy"/> <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditEmailAndTelecomNumber.groovy"/> Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 27 16:35:29 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-952957 /ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:952958-1044489 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:962442-1173263 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:962442-1176458 Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 27 16:35:29 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-952957 /ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:952958-1044489 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:962442-1173263 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:962442-1176458 Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 27 16:35:29 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-952957 /ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:952958-1044489 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:962442-1173263 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:962442-1176458 |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |