svn commit: r1044245 [2/6] - in /ofbiz/branches/jquery: ./ applications/accounting/src/or
Locked
svn commit: r1044245 [2/6] - in /ofbiz/branches/jquery: ./ applications/accounting/src/or
 
|
Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java?rev=1044245&r1=1044244&r2=1044245&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java (original) +++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java Fri Dec 10 09:14:36 2010 @@ -54,16 +54,26 @@ public class WrapSubContentCacheTransfor public static final String [] saveKeyNames = {"contentId", "subContentId", "subDataResourceTypeId", "mimeTypeId", "whenMap", "locale", "wrapTemplateId", "encloseWrapText", "nullThruDatesOnly"}; /** + * @deprecated use FreeMarkerWorker.getWrappedObject() * A wrapper for the FreeMarkerWorker version. */ + @Deprecated public static Object getWrappedObject(String varName, Environment env) { return FreeMarkerWorker.getWrappedObject(varName, env); } + /** + * @deprecated use FreeMarkerWorker.getArg() + */ + @Deprecated public static String getArg(Map args, String key, Environment env) { return FreeMarkerWorker.getArg(args, key, env); } + /** + * @deprecated use FreeMarkerWorker.getArg() + */ + @Deprecated public static String getArg(Map args, String key, Map ctx) { return FreeMarkerWorker.getArg(args, key, ctx); } @@ -71,16 +81,16 @@ public class WrapSubContentCacheTransfor public Writer getWriter(final Writer out, Map args) { final StringBuilder buf = new StringBuilder(); final Environment env = Environment.getCurrentEnvironment(); - Map envContext = (Map) FreeMarkerWorker.getWrappedObject("context", env); + Map envContext = FreeMarkerWorker.getWrappedObject("context", env); final Map templateCtx; if (envContext == null) { templateCtx = FreeMarkerWorker.createEnvironmentMap(env); } else { templateCtx = envContext; } - final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env); - final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env); - final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env); + final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env); + final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env); + final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env); FreeMarkerWorker.getSiteParameters(request, templateCtx); final Map savedValuesUp = FastMap.newInstance(); FreeMarkerWorker.saveContextValues(templateCtx, upSaveKeyNames, savedValuesUp); @@ -89,7 +99,7 @@ public class WrapSubContentCacheTransfor //if (Debug.infoOn()) Debug.logInfo("in Wrap(0b), savedValuesUp ." + savedValuesUp , module); final String wrapTemplateId = (String)templateCtx.get("wrapTemplateId"); //if (Debug.infoOn()) Debug.logInfo("in WrapSubContent, wrapTemplateId(1):" + wrapTemplateId, module); - final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env); + final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env); List trail = (List)templateCtx.get("globalNodeTrail"); //if (Debug.infoOn()) Debug.logInfo("in WrapSubContent, trail(0):" + trail, ""); String contentAssocPredicateId = (String)templateCtx.get("contentAssocPredicateId"); Modified: ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java?rev=1044245&r1=1044244&r2=1044245&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java (original) +++ ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java Fri Dec 10 09:14:36 2010 @@ -358,7 +358,7 @@ public class ProductionRunServices { } catch (GenericServiceException e) { Debug.logError(e, "Problem calling the createWorkEffortAssoc service", module); } - + // clone associated objects from the routing task to the run task String routingTaskId = routingTaskAssoc.getString("workEffortIdTo"); cloneWorkEffortPartyAssignments(ctx, userLogin, routingTaskId, productionRunTaskId); @@ -451,7 +451,7 @@ public class ProductionRunServices { } } } - + /** * Make a copy of the cost calc entities that were defined on the template routing task to the new production run task. */ @@ -463,7 +463,7 @@ public class ProductionRunServices { } catch (GenericEntityException e) { Debug.logError(e.getMessage(), module); } - + if (workEffortCostCalcs != null) { for (GenericValue costCalc : workEffortCostCalcs) { Map<String, Object> createCostCalc = UtilMisc.toMap( @@ -484,7 +484,7 @@ public class ProductionRunServices { } } } - + /** * Update a Production Run. * <li> update field and after recalculate the entire ProductionRun data (routingTask and productComponent) @@ -1081,9 +1081,9 @@ public class ProductionRunServices { if (UtilValidate.isNotEmpty(routingTaskAssoc)) { routingTask = routingTaskAssoc.getRelatedOne("FromWorkEffort"); } - + // Get all the valid CostComponentCalc entries - List workEffortCostCalcs = workEffortCostCalcs = delegator.findByAnd("WorkEffortCostCalc", UtilMisc.toMap("workEffortId", productionRunTaskId)); + List workEffortCostCalcs = workEffortCostCalcs = delegator.findByAnd("WorkEffortCostCalc", UtilMisc.toMap("workEffortId", productionRunTaskId)); workEffortCostCalcs = EntityUtil.filterByDate(workEffortCostCalcs); Iterator workEffortCostCalcsIt = workEffortCostCalcs.iterator(); @@ -1125,7 +1125,7 @@ public class ProductionRunServices { dispatcher.runSync(customMethod.getString("customMethodName"), inMap); } } - + // Now get the cost information associated to the fixed asset and compute the costs GenericValue fixedAsset = workEffort.getRelatedOne("FixedAsset"); if (UtilValidate.isEmpty(fixedAsset) && UtilValidate.isNotEmpty(routingTask)) { Modified: ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl?rev=1044245&r1=1044244&r2=1044245&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl (original) +++ ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl Fri Dec 10 09:14:36 2010 @@ -322,4 +322,4 @@ function lookupBom() { ${uiLabelMap.CommonNote}: <b class="alert">${uiLabelMap.CommonRed}</b> ${uiLabelMap.ManufacturingNote1} <b style="color: red;">${uiLabelMap.CommonRed}</b>${uiLabelMap.ManufacturingNote2} <b style="color: red;">${uiLabelMap.CommonRed}</b>${uiLabelMap.ManufacturingNote3} </div> </div> -</#if> \ No newline at end of file +</#if> Modified: ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl?rev=1044245&r1=1044244&r2=1044245&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl (original) +++ ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl Fri Dec 10 09:14:36 2010 @@ -231,4 +231,4 @@ document.lookupinventory.productId.focus </td> </tr> </table> -</#if> \ No newline at end of file +</#if> Propchange: ofbiz/branches/jquery/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 10 09:14:36 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml:831210-885099,885686-886087 /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:951708-1044013 +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1044240 Modified: ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java?rev=1044245&r1=1044244&r2=1044245&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java (original) +++ ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java Fri Dec 10 09:14:36 2010 @@ -215,10 +215,10 @@ public class RequirementServices { GenericValue item = (GenericValue) iter.next(); GenericValue product = item.getRelatedOne("Product"); if (product == null) continue; - if ((!"PRODRQM_AUTO".equals(product.get("requirementMethodEnumId")) && + if ((!"PRODRQM_AUTO".equals(product.get("requirementMethodEnumId")) && !"PRODRQM_AUTO".equals(productStore.get("requirementMethodEnumId"))) || - (product.get("requirementMethodEnumId") == null && - !"PRODRQM_AUTO".equals(productStore.get("requirementMethodEnumId")))) continue; + (product.get("requirementMethodEnumId") == null && + !"PRODRQM_AUTO".equals(productStore.get("requirementMethodEnumId")))) continue; BigDecimal quantity = item.getBigDecimal("quantity"); BigDecimal cancelQuantity = item.getBigDecimal("cancelQuantity"); BigDecimal required = quantity.subtract(cancelQuantity == null ? BigDecimal.ZERO : cancelQuantity); Propchange: ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java?rev=1044245&r1=1044244&r2=1044245&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java (original) +++ ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java Fri Dec 10 09:14:36 2010 @@ -1216,7 +1216,7 @@ public class ProductPromoWorker { protected static boolean checkConditionsForItem(GenericValue productPromoActionOrCond, ShoppingCart cart, ShoppingCartItem cartItem, Delegator delegator, LocalDispatcher dispatcher, Timestamp nowTimestamp) throws GenericEntityException { GenericValue productPromoRule = productPromoActionOrCond.getRelatedOneCache("ProductPromoRule"); - + List<GenericValue> productPromoConds = delegator.findByAndCache("ProductPromoCond", UtilMisc.toMap("productPromoId", productPromoRule.get("productPromoId")), UtilMisc.toList("productPromoCondSeqId")); productPromoConds = EntityUtil.filterByAnd(productPromoConds, UtilMisc.toMap("productPromoRuleId", productPromoRule.get("productPromoRuleId"))); for (GenericValue productPromoCond: productPromoConds) { @@ -1233,26 +1233,26 @@ public class ProductPromoWorker { String operatorEnumId = productPromoCond.getString("operatorEnumId"); // don't get list price from cart because it may have tax included whereas the base price does not: BigDecimal listPrice = cartItem.getListPrice(); - Map<String, String> priceFindMap = UtilMisc.toMap("productId", cartItem.getProductId(), + Map<String, String> priceFindMap = UtilMisc.toMap("productId", cartItem.getProductId(), "productPriceTypeId", "LIST_PRICE", "productPricePurposeId", "PURCHASE"); List<GenericValue> listProductPriceList = delegator.findByAnd("ProductPrice", priceFindMap, UtilMisc.toList("-fromDate")); listProductPriceList = EntityUtil.filterByDate(listProductPriceList, true); GenericValue listProductPrice = (listProductPriceList != null && listProductPriceList.size() > 0) ? listProductPriceList.get(0): null; BigDecimal listPrice = (listProductPrice != null) ? listProductPrice.getBigDecimal("price") : null; - + if (listPrice == null) { // can't find a list price so this condition is meaningless, consider it passed return true; } - + BigDecimal basePrice = cartItem.getBasePrice(); BigDecimal amountOff = listPrice.subtract(basePrice); BigDecimal percentOff = amountOff.divide(listPrice, 2, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(100L)); - + BigDecimal condValueBigDecimal = new BigDecimal(condValue); Integer compareBase = null; - + if ("PPIP_LPMUP_AMT".equals(inputParamEnumId)) { compareBase = Integer.valueOf(amountOff.compareTo(condValueBigDecimal)); } else if ("PPIP_LPMUP_PER".equals(inputParamEnumId)) { @@ -1301,7 +1301,7 @@ public class ProductPromoWorker { if (0 == checkConditionPartyHierarchy(delegator, nowTimestamp, groupPartyId, partyIdFrom)) { return 0; } - } + } return 1; } Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy?rev=1044245&r1=1044244&r2=1044245&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy Fri Dec 10 09:14:36 2010 @@ -87,14 +87,14 @@ if ("SALES_ORDER".equals(cart.getOrderTy facilityMaps = FastList.newInstance(); facilities = delegator.findByAndCache("Facility", [ownerPartyId : companyId]); - // if facilites is null then check the PartyRelationship where there is a relationship set for Parent & Child organization. Then also fetch the value of companyId from there. + // if facilites is null then check the PartyRelationship where there is a relationship set for Parent & Child organization. Then also fetch the value of companyId from there. if (UtilValidate.isEmpty(facilities)) { partyRelationship = EntityUtil.getFirst(delegator.findList("PartyRelationship", EntityCondition.makeCondition(["roleTypeIdFrom": "PARENT_ORGANIZATION", "partyIdTo": companyId]), null, null, null, false)); if (UtilValidate.isNotEmpty(partyRelationship)) { companyId = partyRelationship.partyIdFrom; facilities = delegator.findByAndCache("Facility", [ownerPartyId : companyId]); } - } + } facilities.each { facility -> facilityMap = FastMap.newInstance(); facilityContactMechValueMaps = ContactMechWorker.getFacilityContactMechValueMaps(delegator, facility.facilityId, false, null); Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductUomDropDownOnly.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductUomDropDownOnly.groovy?rev=1044245&r1=1044244&r2=1044245&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductUomDropDownOnly.groovy (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductUomDropDownOnly.groovy Fri Dec 10 09:14:36 2010 @@ -36,4 +36,4 @@ if (product) { context.mainProducts = mainProducts; } context.product = product; -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy?rev=1044245&r1=1044244&r2=1044245&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy Fri Dec 10 09:14:36 2010 @@ -38,7 +38,7 @@ if (productId != null) { String productIdTo = product.getString("productIdTo"); prodAssocRecord = delegator.findByAnd("Product", [productId : productIdTo]); productList.add(EntityUtil.getFirst(prodAssocRecord)); - } + } } context.put("productList",productList); } Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy?rev=1044245&r1=1044244&r2=1044245&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy Fri Dec 10 09:14:36 2010 @@ -157,10 +157,10 @@ if (selPhones) { context.phone = delegator.findByPrimaryKey("TelecomNumber", [contactMechId : selPhones[0].contactMechId]); } -// Fax +// Fax faxNumbers = delegator.findByAnd("PartyContactMechPurpose", [partyId : partyId, contactMechPurposeTypeId : "FAX_NUMBER"]); faxNumbers = EntityUtil.filterByDate(faxNumbers, nowTimestamp, null, null, true); -if (faxNumbers) { +if (faxNumbers) { context.fax = delegator.findOne("TelecomNumber", [contactMechId : faxNumbers[0].contactMechId], false); } Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy?rev=1044245&r1=1044244&r2=1044245&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy Fri Dec 10 09:14:36 2010 @@ -60,7 +60,7 @@ if (orderId) { orderHeader = delegator.findByPrimaryKey("OrderHeader", [orderId : orderId]); } -if (orderHeader) { +if (orderHeader) { // note these are overridden in the OrderViewWebSecure.groovy script if run context.hasPermission = true; context.canViewInternalDetails = true; @@ -116,7 +116,7 @@ if (orderHeader) { canceledPromoOrderItem = [:]; orderItemList = orderReadHelper.getOrderItems(); - orderItemList.each { orderItem -> + orderItemList.each { orderItem -> if("Y".equals(orderItem.get("isPromo")) && "ITEM_CANCELLED".equals(orderItem.get("statusId"))) { canceledPromoOrderItem = orderItem; } @@ -441,7 +441,7 @@ if (orderItems) { // This case comes when order's shipping amount is more then or less than default percentage (defined in shipment.properties) of online UPS shipping amount. condn = EntityCondition.makeCondition([ - EntityCondition.makeCondition("primaryOrderId", EntityOperator.EQUALS, orderId), + EntityCondition.makeCondition("primaryOrderId", EntityOperator.EQUALS, orderId), EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "SHIPMENT_PICKED")], EntityOperator.AND); shipments = delegator.findList("Shipment", condn, null, null, null, false); @@ -473,7 +473,7 @@ if (orderItems) { } } } - + // get orderAdjustmentId for SHIPPING_CHARGES orderAdjustmentId = null; orderAdjustments.each { orderAdjustment -> Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/findOrders.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/findOrders.ftl?rev=1044245&r1=1044244&r2=1044245&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/findOrders.ftl (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/findOrders.ftl Fri Dec 10 09:14:36 2010 @@ -452,7 +452,7 @@ function toggleOrderIdList() { <#assign includeCountry = requestParameters.includeCountry> <option value="${includeCountry}"><#if "Y" == includeCountry>${uiLabelMap.OrderOnlyInclude}<#elseif "N" == includeCountry>${uiLabelMap.OrderDoNotInclude}</#if></option> <option value="${includeCountry}">---</option> - </#if> + </#if> <option value="Y">${uiLabelMap.OrderOnlyInclude}</option> <option value="N">${uiLabelMap.OrderDoNotInclude}</option> </select> Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/return/returnLinks.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/return/returnLinks.ftl?rev=1044245&r1=1044244&r2=1044245&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/return/returnLinks.ftl (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/return/returnLinks.ftl Fri Dec 10 09:14:36 2010 @@ -69,4 +69,4 @@ under the License. <h2>${uiLabelMap.OrderNoReturnFoundWithId} : ${requestParameters.returnId}</h2> </#if> <br /> -</#if> \ No newline at end of file +</#if> Propchange: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 10 09:14:36 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:418499-490456 /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:951708-1044013 +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1044240 Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/PartyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/PartyForms.xml?rev=1044245&r1=1044244&r2=1044245&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/widget/partymgr/PartyForms.xml (original) +++ ofbiz/branches/jquery/applications/party/widget/partymgr/PartyForms.xml Fri Dec 10 09:14:36 2010 @@ -73,7 +73,7 @@ under the License. </drop-down> </field> <field name="statusId" use-when="person==null"><hidden/></field> - <field name="statusId" use-when="person!=null"> + <field name="statusId" use-when="person!=null && leadDescription==null"> <drop-down allow-empty="false"> <entity-options description="${description}" entity-name="StatusItem"> <entity-constraint name="statusTypeId" value="PARTY_STATUS"/> @@ -81,6 +81,14 @@ under the License. </entity-options> </drop-down> </field> + <field name="statusId" use-when="person!=null && leadDescription!=null"> + <drop-down allow-empty="false"> + <entity-options description="${description}" entity-name="StatusItem"> + <entity-constraint name="statusId" operator="in" value="LEAD_ASSIGNED,PARTY_ENABLED,PARTY_DISABLED"/> + <entity-order-by field-name="sequenceId"/> + </entity-options> + </drop-down> + </field> <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field> <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"> <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"> Propchange: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 10 09:14:36 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/applications/product/script/org/ofbiz/shipment/test/FacilityTests.xml:831210-885099,885686-886087 /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:951708-1044013 +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1044240 Propchange: ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/category/OfbizCatalogUrlTransform.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl?rev=1044245&r1=1044244&r2=1044245&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl (original) +++ ofbiz/branches/jquery/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl Fri Dec 10 09:14:36 2010 @@ -88,4 +88,4 @@ under the License. </table> </form> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/find/advancedsearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/find/advancedsearch.ftl?rev=1044245&r1=1044244&r2=1044245&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/catalog/find/advancedsearch.ftl (original) +++ ofbiz/branches/jquery/applications/product/webapp/catalog/find/advancedsearch.ftl Fri Dec 10 09:14:36 2010 @@ -314,4 +314,4 @@ under the License. </table> </form> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditVirtualProductInventory.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditVirtualProductInventory.ftl?rev=1044245&r1=1044244&r2=1044245&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditVirtualProductInventory.ftl (original) +++ ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditVirtualProductInventory.ftl Fri Dec 10 09:14:36 2010 @@ -50,4 +50,4 @@ under the License. </#list> </table> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/product/ViewProductOrders.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/product/ViewProductOrders.ftl?rev=1044245&r1=1044244&r2=1044245&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/catalog/product/ViewProductOrders.ftl (original) +++ ofbiz/branches/jquery/applications/product/webapp/catalog/product/ViewProductOrders.ftl Fri Dec 10 09:14:36 2010 @@ -94,4 +94,4 @@ under the License. </#if> </table> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/branches/jquery/applications/product/webapp/facility/shipment/VerifyPick.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/shipment/VerifyPick.ftl?rev=1044245&r1=1044244&r2=1044245&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/shipment/VerifyPick.ftl (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/shipment/VerifyPick.ftl Fri Dec 10 09:14:36 2010 @@ -375,4 +375,4 @@ under the License. </#if> <#else> <h3>${uiLabelMap.ProductFacilityViewPermissionError}</h3> -</#if> \ No newline at end of file +</#if> Propchange: ofbiz/branches/jquery/applications/securityext/src/org/ofbiz/securityext/da/ServiceDaHandler.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/applications/securityext/src/org/ofbiz/securityext/test/AuthorizationTests.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: ofbiz/branches/jquery/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl?rev=1044245&r1=1044244&r2=1044245&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl (original) +++ ofbiz/branches/jquery/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl Fri Dec 10 09:14:36 2010 @@ -84,4 +84,4 @@ under the License. </table> </#if> </div> -</div> \ No newline at end of file +</div> Propchange: ofbiz/branches/jquery/debian/EncryptPassword.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/DependencyPool.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/ExecutionPool.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/GeneratedResult.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/TTLCachedObject.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/TTLObject.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/AsyncTTLObjectTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/DependencyPoolTests.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/SyncTTLObjectTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/TTLCachedObjectTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/TTLObjectTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/config/CoberturaInstrumenter.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/GenericSingletonToList.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/GenericSingletonToSet.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/JSONConverters.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/JSONResult.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/NetConverters.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/test/DateTimeTests.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/test/MiscTests.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/json/JSONWriter.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/json/test/JSONTests.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/IsEmpty.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/LockedBy.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/ObjectWrapper.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/SourceMonitored.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/test/ComparableRangeTests.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/test/GenericTestCaseBase.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/IndentingWriter.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/RMIExtendedSocketFactory.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/RMIExtendedSocketFactory.java?rev=1044245&r1=1044244&r2=1044245&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/RMIExtendedSocketFactory.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/RMIExtendedSocketFactory.java Fri Dec 10 09:14:36 2010 @@ -1,104 +1,104 @@ -/******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - *******************************************************************************/ -package org.ofbiz.base.util; - -import java.io.IOException; -import java.net.InetAddress; -import java.net.ServerSocket; -import java.net.Socket; -import java.net.UnknownHostException; -import java.rmi.server.RMISocketFactory; - -/** - * A <code>RMISocketFactory</code> implementation that creates <code>ServerSocket</code>s bound - * on a specified network interface. - */ -public class RMIExtendedSocketFactory extends RMISocketFactory { - - /** - * The network interface to bind the <code>ServerSocket</code> to. If null than bind to all interfaces. - */ - private InetAddress hostInetAddress; - - /** - * Default constructor. Bind the server sockets on all interfaces. - */ - public RMIExtendedSocketFactory() { - // leave hostInetAddress null - } - - /** - * Creates a new <code>RMIExtendedSocketFactory</code> which will create <code>ServerSocket</code>s - * bound on the specified network interface. - * - * @param inetAddress The <code>InetAddress</code> of the network interface. - */ - public RMIExtendedSocketFactory( InetAddress inetAddress ) { - this.hostInetAddress = inetAddress; - } - - /** - * Creates a new <code>RMIExtendedSocketFactory</code> which will create <code>ServerSocket</code>s - * bound on the specified network interface. - * - * @param hostIpAddress The IP address of the interface to bind the server sockets to. - * @throws UnknownHostException If an invalid IP address is provided. - */ - public RMIExtendedSocketFactory( String hostIpAddress ) throws UnknownHostException { - - // check if host length is at least equal to "0.0.0.0" - if ( hostIpAddress != null && hostIpAddress.length() >= 7 ) { - String[] octets = hostIpAddress.split( "\\." ); - - if ( octets == null || octets.length != 4 ) { - throw new UnknownHostException( "Invalid IP address: " + hostIpAddress ); - } - - byte[] ipAddr = new byte[4]; - for ( int i = 0; i < octets.length; i++ ) { - try { - ipAddr[i] = ( byte ) Integer.parseInt( octets[i] ); - } catch ( NumberFormatException nfEx ) { - throw new UnknownHostException( "Invalid IP address: " + hostIpAddress ); - } - } - - hostInetAddress = InetAddress.getByAddress( ipAddr ); - - } - - - } - - @Override - public ServerSocket createServerSocket(int port) throws IOException { - if ( hostInetAddress != null ) { - return new ServerSocket( port, 0, hostInetAddress ); - } else { - return new ServerSocket( port ); - } - } - - @Override - public Socket createSocket(String host, int port) throws IOException { - - return new Socket( host, port ); - } - -} +/******************************************************************************* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + *******************************************************************************/ +package org.ofbiz.base.util; + +import java.io.IOException; +import java.net.InetAddress; +import java.net.ServerSocket; +import java.net.Socket; +import java.net.UnknownHostException; +import java.rmi.server.RMISocketFactory; + +/** + * A <code>RMISocketFactory</code> implementation that creates <code>ServerSocket</code>s bound + * on a specified network interface. + */ +public class RMIExtendedSocketFactory extends RMISocketFactory { + + /** + * The network interface to bind the <code>ServerSocket</code> to. If null than bind to all interfaces. + */ + private InetAddress hostInetAddress; + + /** + * Default constructor. Bind the server sockets on all interfaces. + */ + public RMIExtendedSocketFactory() { + // leave hostInetAddress null + } + + /** + * Creates a new <code>RMIExtendedSocketFactory</code> which will create <code>ServerSocket</code>s + * bound on the specified network interface. + * + * @param inetAddress The <code>InetAddress</code> of the network interface. + */ + public RMIExtendedSocketFactory( InetAddress inetAddress ) { + this.hostInetAddress = inetAddress; + } + + /** + * Creates a new <code>RMIExtendedSocketFactory</code> which will create <code>ServerSocket</code>s + * bound on the specified network interface. + * + * @param hostIpAddress The IP address of the interface to bind the server sockets to. + * @throws UnknownHostException If an invalid IP address is provided. + */ + public RMIExtendedSocketFactory( String hostIpAddress ) throws UnknownHostException { + + // check if host length is at least equal to "0.0.0.0" + if ( hostIpAddress != null && hostIpAddress.length() >= 7 ) { + String[] octets = hostIpAddress.split( "\\." ); + + if ( octets == null || octets.length != 4 ) { + throw new UnknownHostException( "Invalid IP address: " + hostIpAddress ); + } + + byte[] ipAddr = new byte[4]; + for ( int i = 0; i < octets.length; i++ ) { + try { + ipAddr[i] = ( byte ) Integer.parseInt( octets[i] ); + } catch ( NumberFormatException nfEx ) { + throw new UnknownHostException( "Invalid IP address: " + hostIpAddress ); + } + } + + hostInetAddress = InetAddress.getByAddress( ipAddr ); + + } + + + } + + @Override + public ServerSocket createServerSocket(int port) throws IOException { + if ( hostInetAddress != null ) { + return new ServerSocket( port, 0, hostInetAddress ); + } else { + return new ServerSocket( port ); + } + } + + @Override + public Socket createSocket(String host, int port) throws IOException { + + return new Socket( host, port ); + } + +} Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/RMIExtendedSocketFactory.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/ReferenceCleaner.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilIO.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/cache/test/UtilCacheTests.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/GenericMap.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/GenericMapCollection.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/GenericMapEntry.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/GenericMapEntrySet.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/GenericMapKeySet.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/GenericMapSet.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/GenericMapValues.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/IteratorWrapper.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/MapContext.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/ReadOnlyMapEntry.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/test/GenericMapTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java?rev=1044245&r1=1044244&r2=1044245&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java Fri Dec 10 09:14:36 2010 @@ -157,8 +157,7 @@ public class FreeMarkerWorker { public static void renderTemplate(String templateLocation, String templateString, Map<String, Object> context, Appendable outWriter) throws TemplateException, IOException { renderTemplate(templateLocation, templateString, context, outWriter, true); } - - + /** * Renders a template contained in a String. * @param templateLocation A unique ID for this template - used for caching @@ -189,7 +188,7 @@ public class FreeMarkerWorker { /** * @deprecated, replaced by {@link #renderTemplateFromString(String templateString, String templateLocation, Map<String, Object> context, Appendable outWriter, boolean useCache)} - */ + */ @Deprecated public static Environment renderTemplateFromString(String templateString, String templateLocation, Map<String, Object> context, Appendable outWriter) throws TemplateException, IOException { Template template = cachedTemplates.get(templateLocation); @@ -325,10 +324,10 @@ public class FreeMarkerWorker { } public static Template getTemplate(String templateLocation, UtilCache<String, Template> cache, Configuration config) throws TemplateException, IOException { - Template template = (Template) cache.get(templateLocation); + Template template = cache.get(templateLocation); if (template == null) { synchronized (cache) { - template = (Template) cache.get(templateLocation); + template = cache.get(templateLocation); if (template == null) { // only make the reader if we need it, and then close it right after! Reader templateReader = makeReader(templateLocation); @@ -342,16 +341,14 @@ public class FreeMarkerWorker { } public static String getArg(Map<String, ? extends Object> args, String key, Environment env) { - Map<String, ? extends Object> templateContext = UtilGenerics.checkMap(FreeMarkerWorker.getWrappedObject("context", env)); + Map<String, ? extends Object> templateContext = FreeMarkerWorker.getWrappedObject("context", env); return getArg(args, key, templateContext); } public static String getArg(Map<String, ? extends Object> args, String key, Map<String, ? extends Object> templateContext) { //SimpleScalar s = null; - Object o = null; - String returnVal = null; - o = args.get(key); - returnVal = (String) unwrap(o); + Object o = args.get(key); + String returnVal = (String) unwrap(o); if (returnVal == null) { try { if (templateContext != null) { @@ -366,10 +363,8 @@ public class FreeMarkerWorker { public static Object getArgObject(Map<String, ? extends Object> args, String key, Map<String, ? extends Object> templateContext) { //SimpleScalar s = null; - Object o = null; - Object returnVal = null; - o = args.get(key); - returnVal = unwrap(o); + Object o = args.get(key); + Object returnVal = unwrap(o); if (returnVal == null) { try { if (templateContext != null) { @@ -382,13 +377,12 @@ public class FreeMarkerWorker { return returnVal; } - /** * Gets BeanModel from FreeMarker context and returns the object that it wraps. * @param varName the name of the variable in the FreeMarker context. * @param env the FreeMarker Environment */ - public static Object getWrappedObject(String varName, Environment env) { + public static <T> T getWrappedObject(String varName, Environment env) { Object obj = null; try { obj = env.getVariable(varName); @@ -405,7 +399,7 @@ public class FreeMarkerWorker { } catch (TemplateModelException e) { Debug.logInfo(e.getMessage(), module); } - return obj; + return UtilGenerics.<T>cast(obj); } /** @@ -424,16 +418,15 @@ public class FreeMarkerWorker { } public static Object get(SimpleHash args, String key) { - Object returnObj = null; Object o = null; try { o = args.get(key); } catch (TemplateModelException e) { Debug.logVerbose(e.getMessage(), module); - return returnObj; + return null; } - returnObj = unwrap(o); + Object returnObj = unwrap(o); if (returnObj == null) { Object ctxObj = null; @@ -686,7 +679,6 @@ public class FreeMarkerWorker { /** * OFBiz specific TemplateExceptionHandler. Sanitizes any error messages present in * the stack trace prior to printing to the output writer. - * */ static class OFBizTemplateExceptionHandler implements TemplateExceptionHandler { public void handleTemplateException(TemplateException te, Environment env, Writer out) throws TemplateException { @@ -695,7 +687,7 @@ public class FreeMarkerWorker { te.printStackTrace(pw); String stackTrace = tempWriter.toString(); - StringUtil.SimpleEncoder simpleEncoder = (SimpleEncoder) FreeMarkerWorker.getWrappedObject("simpleEncoder", env); + StringUtil.SimpleEncoder simpleEncoder = FreeMarkerWorker.getWrappedObject("simpleEncoder", env); if (simpleEncoder != null) { stackTrace = simpleEncoder.encode(stackTrace); } Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/test/IndentingWriterTests.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/test/ReferenceCleanerTests.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/test/StringUtilTests.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/test/UtilIOTests.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/test/UtilObjectTests.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/authentication/AuthHelper.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/authentication/AuthenticationComparator.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/authentication/api/Authenticator.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/authentication/api/AuthenticatorException.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/authentication/example/TestFailAuthenticator.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/common/src/org/ofbiz/common/authentication/example/TestPassAuthenticator.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 10 09:14:36 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/applications/commonext/widget/HelpScreens.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264 -/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1044013 +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1044240 Propchange: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/sql/EntityConditionPlanner.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/sql/EntityDeletePlan.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/sql/EntityInsertPlan.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/sql/EntitySelectPlan.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/sql/EntityUpdatePlan.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/sql/EntityViewPlan.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/sql/SQLUtil.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/util/CachedClassLoaderInit.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/minilang/src/org/ofbiz/minilang/method/callops/CallScript.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/security/src/org/ofbiz/security/authz/AbstractAuthorization.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/security/src/org/ofbiz/security/authz/Authorization.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/security/src/org/ofbiz/security/authz/AuthorizationFactory.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: ofbiz/branches/jquery/framework/security/src/org/ofbiz/security/authz/EntityAuthorization.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/security/src/org/ofbiz/security/authz/EntityAuthorization.java?rev=1044245&r1=1044244&r2=1044245&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/security/src/org/ofbiz/security/authz/EntityAuthorization.java (original) +++ ofbiz/branches/jquery/framework/security/src/org/ofbiz/security/authz/EntityAuthorization.java Fri Dec 10 09:14:36 2010 @@ -1,208 +1,208 @@ -/******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - *******************************************************************************/ -package org.ofbiz.security.authz; - -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpSession; - -import javolution.util.FastList; - -import org.ofbiz.base.util.Debug; -import org.ofbiz.base.util.UtilMisc; -import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.entity.Delegator; -import org.ofbiz.entity.GenericEntityException; -import org.ofbiz.entity.GenericValue; -import org.ofbiz.entity.cache.Cache; -import org.ofbiz.entity.condition.EntityCondition; -import org.ofbiz.entity.util.EntityUtil; -import org.ofbiz.security.authz.da.DynamicAccessFactory; -import org.ofbiz.security.authz.da.DynamicAccessHandler; - -public class EntityAuthorization extends AbstractAuthorization { - - private static final String module = EntityAuthorization.class.getName(); - - protected Delegator delegator; - - @Override - public List<String> getAutoGrantPermissions(String userId, String permission, Map<String, ? extends Object> context) { - if (Debug.verboseOn()) Debug.logVerbose("Running getAutoGrantPermissions()", module); - boolean checking = true; - String checkString = permission; - - while (checking) { - if (Debug.verboseOn()) Debug.logVerbose("Looking for auto-grant permissions for : " + checkString, module); - List<String> autoGrant = getPermissionAutoGrant(checkString); - if (UtilValidate.isNotEmpty(autoGrant)) { - return autoGrant; - } - if (checkString.indexOf(":") > -1) { - checkString = checkString.substring(0, checkString.lastIndexOf(":")); - } else { - checking = false; - } - } - return null; - } - - @Override - public boolean hasDynamicPermission(String userId, String permission, Map<String, ? extends Object> context) { - if (Debug.verboseOn()) Debug.logVerbose("Running hasDynamicPermission()", module); - String permissionId = permission; - boolean checking = true; - - // find the dynamic access implementation - String dynamicAccess = null; - while (checking) { - if (Debug.verboseOn()) Debug.logVerbose("Looking for dynamic access for permission -- " + permissionId, module); - dynamicAccess = getPermissionDynamicAccess(permissionId); - if (UtilValidate.isEmpty(dynamicAccess)) { - if (permissionId.indexOf(":") > -1) { - permissionId = permissionId.substring(0, permissionId.lastIndexOf(":")); - } else { - Debug.logVerbose("No sections left to check; no dynamic access implementation found", module); - checking = false; - } - } else { - if (Debug.verboseOn()) Debug.logVerbose("Dynamic access implementation found : " + dynamicAccess, module); - checking = false; - } - } - - // if one exists invoke it - if (UtilValidate.isNotEmpty(dynamicAccess)) { - // load the dynamic access handler and invoke it - if (Debug.verboseOn()) Debug.logVerbose("Loading DynamicAccessHandler for -- " + dynamicAccess, module); - DynamicAccessHandler dah = DynamicAccessFactory.getDynamicAccessHandler(delegator, dynamicAccess); - if (dah != null) { - if (Debug.verboseOn()) Debug.logVerbose("Calling DynamicAccessHandler : " + dah.getClass().getName(), module); - return dah.handleDynamicAccess(dynamicAccess, userId, permission, context); - } else { - if (Debug.verboseOn()) { - Debug.logVerbose("No DynamicAccessHandler found for pattern matching -- " + dynamicAccess, module); - } - } - } - return false; - } - - @Override - public boolean hasStaticPermission(String userId, String permission, Map<String, ? extends Object> context) { - if (Debug.verboseOn()) Debug.logVerbose("Running hasStaticPermission()", module); - Iterator<GenericValue> iterator = getUserLoginSecurityGroupByUserLoginId(userId); - GenericValue userLoginSecurityGroup = null; - - while (iterator.hasNext()) { - userLoginSecurityGroup = iterator.next(); - if (securityGroupHasPermission(userLoginSecurityGroup.getString("groupId"), permission)) { - return true; - } - } - return false; - } - - /** - * Test to see if the specified user has permission - * - * @param session HttpSession used to obtain the userId - * @param permission the raw permission string - * @param context name/value pairs used for permission lookup - * @return true if the user has permission - */ - public boolean hasPermission(HttpSession session, String permission, Map<String, ? extends Object> context) { - GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); - if (userLogin != null) { - return hasPermission(userLogin.getString("userLoginId"), permission, context); - } - return false; - } - - public void setDelegator(Delegator delegator) { - this.delegator = delegator; - } - - private Iterator<GenericValue> getUserLoginSecurityGroupByUserLoginId(String userId) { - List<GenericValue> collection; - - try { - collection = delegator.findByAnd("UserLoginSecurityGroup", UtilMisc.toMap("userLoginId", userId), null); - } catch (GenericEntityException e) { - // make an empty collection to speed up the case where a userLogin belongs to no security groups, only with no exception of course - collection = FastList.newInstance(); - Debug.logWarning(e, module); - } - - // filter each time after cache retrieval, i.e. cache will contain entire list - collection = EntityUtil.filterByDate(collection, true); - return collection.iterator(); - } - - private boolean securityGroupHasPermission(String groupId, String permission) { - GenericValue securityGroupPermissionValue = delegator.makeValue("SecurityGroupPermission", - UtilMisc.toMap("groupId", groupId, "permissionId", permission)); - - try { - return delegator.findOne(securityGroupPermissionValue.getEntityName(), securityGroupPermissionValue, false) != null; - } catch (GenericEntityException e) { - Debug.logWarning(e, module); - return false; - } - } - - private List<String> getPermissionAutoGrant(String permission) { - Cache cache = delegator.getCache(); - EntityCondition condition = EntityCondition.makeCondition(UtilMisc.toMap("permissionId", permission)); - List<String> autoGrants = cache.get("SecurityPermissionAutoGrant", condition, "EntityAuthorization.autoGrants"); - if (autoGrants == null) { - autoGrants = FastList.newInstance(); - - List<GenericValue> values = null; - try { - values = delegator.findList("SecurityPermissionAutoGrant", condition, null, null, null, true); - } catch (GenericEntityException e) { - Debug.logWarning(e, module); - } - - if (UtilValidate.isNotEmpty(values)) { - for (GenericValue v : values) { - autoGrants.add(v.getString("grantPermission")); - } - } - cache.put("SecurityPermissionAutoGrant", condition, "EntityAuthorization.autoGrants", autoGrants); - } - return autoGrants; - } - - private String getPermissionDynamicAccess(String perm) { - GenericValue permission = null; - try { - permission = delegator.findOne("SecurityPermission", UtilMisc.toMap("permissionId", perm), true); - } catch (GenericEntityException e) { - Debug.logWarning(e, module); - } - if (permission != null) { - return permission.getString("dynamicAccess"); - } - return null; - } -} +/******************************************************************************* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + *******************************************************************************/ +package org.ofbiz.security.authz; + +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpSession; + +import javolution.util.FastList; + +import org.ofbiz.base.util.Debug; +import org.ofbiz.base.util.UtilMisc; +import org.ofbiz.base.util.UtilValidate; +import org.ofbiz.entity.Delegator; +import org.ofbiz.entity.GenericEntityException; +import org.ofbiz.entity.GenericValue; +import org.ofbiz.entity.cache.Cache; +import org.ofbiz.entity.condition.EntityCondition; +import org.ofbiz.entity.util.EntityUtil; +import org.ofbiz.security.authz.da.DynamicAccessFactory; +import org.ofbiz.security.authz.da.DynamicAccessHandler; + +public class EntityAuthorization extends AbstractAuthorization { + + private static final String module = EntityAuthorization.class.getName(); + + protected Delegator delegator; + + @Override + public List<String> getAutoGrantPermissions(String userId, String permission, Map<String, ? extends Object> context) { + if (Debug.verboseOn()) Debug.logVerbose("Running getAutoGrantPermissions()", module); + boolean checking = true; + String checkString = permission; + + while (checking) { + if (Debug.verboseOn()) Debug.logVerbose("Looking for auto-grant permissions for : " + checkString, module); + List<String> autoGrant = getPermissionAutoGrant(checkString); + if (UtilValidate.isNotEmpty(autoGrant)) { + return autoGrant; + } + if (checkString.indexOf(":") > -1) { + checkString = checkString.substring(0, checkString.lastIndexOf(":")); + } else { + checking = false; + } + } + return null; + } + + @Override + public boolean hasDynamicPermission(String userId, String permission, Map<String, ? extends Object> context) { + if (Debug.verboseOn()) Debug.logVerbose("Running hasDynamicPermission()", module); + String permissionId = permission; + boolean checking = true; + + // find the dynamic access implementation + String dynamicAccess = null; + while (checking) { + if (Debug.verboseOn()) Debug.logVerbose("Looking for dynamic access for permission -- " + permissionId, module); + dynamicAccess = getPermissionDynamicAccess(permissionId); + if (UtilValidate.isEmpty(dynamicAccess)) { + if (permissionId.indexOf(":") > -1) { + permissionId = permissionId.substring(0, permissionId.lastIndexOf(":")); + } else { + Debug.logVerbose("No sections left to check; no dynamic access implementation found", module); + checking = false; + } + } else { + if (Debug.verboseOn()) Debug.logVerbose("Dynamic access implementation found : " + dynamicAccess, module); + checking = false; + } + } + + // if one exists invoke it + if (UtilValidate.isNotEmpty(dynamicAccess)) { + // load the dynamic access handler and invoke it + if (Debug.verboseOn()) Debug.logVerbose("Loading DynamicAccessHandler for -- " + dynamicAccess, module); + DynamicAccessHandler dah = DynamicAccessFactory.getDynamicAccessHandler(delegator, dynamicAccess); + if (dah != null) { + if (Debug.verboseOn()) Debug.logVerbose("Calling DynamicAccessHandler : " + dah.getClass().getName(), module); + return dah.handleDynamicAccess(dynamicAccess, userId, permission, context); + } else { + if (Debug.verboseOn()) { + Debug.logVerbose("No DynamicAccessHandler found for pattern matching -- " + dynamicAccess, module); + } + } + } + return false; + } + + @Override + public boolean hasStaticPermission(String userId, String permission, Map<String, ? extends Object> context) { + if (Debug.verboseOn()) Debug.logVerbose("Running hasStaticPermission()", module); + Iterator<GenericValue> iterator = getUserLoginSecurityGroupByUserLoginId(userId); + GenericValue userLoginSecurityGroup = null; + + while (iterator.hasNext()) { + userLoginSecurityGroup = iterator.next(); + if (securityGroupHasPermission(userLoginSecurityGroup.getString("groupId"), permission)) { + return true; + } + } + return false; + } + + /** + * Test to see if the specified user has permission + * + * @param session HttpSession used to obtain the userId + * @param permission the raw permission string + * @param context name/value pairs used for permission lookup + * @return true if the user has permission + */ + public boolean hasPermission(HttpSession session, String permission, Map<String, ? extends Object> context) { + GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); + if (userLogin != null) { + return hasPermission(userLogin.getString("userLoginId"), permission, context); + } + return false; + } + + public void setDelegator(Delegator delegator) { + this.delegator = delegator; + } + + private Iterator<GenericValue> getUserLoginSecurityGroupByUserLoginId(String userId) { + List<GenericValue> collection; + + try { + collection = delegator.findByAnd("UserLoginSecurityGroup", UtilMisc.toMap("userLoginId", userId), null); + } catch (GenericEntityException e) { + // make an empty collection to speed up the case where a userLogin belongs to no security groups, only with no exception of course + collection = FastList.newInstance(); + Debug.logWarning(e, module); + } + + // filter each time after cache retrieval, i.e. cache will contain entire list + collection = EntityUtil.filterByDate(collection, true); + return collection.iterator(); + } + + private boolean securityGroupHasPermission(String groupId, String permission) { + GenericValue securityGroupPermissionValue = delegator.makeValue("SecurityGroupPermission", + UtilMisc.toMap("groupId", groupId, "permissionId", permission)); + + try { + return delegator.findOne(securityGroupPermissionValue.getEntityName(), securityGroupPermissionValue, false) != null; + } catch (GenericEntityException e) { + Debug.logWarning(e, module); + return false; + } + } + + private List<String> getPermissionAutoGrant(String permission) { + Cache cache = delegator.getCache(); + EntityCondition condition = EntityCondition.makeCondition(UtilMisc.toMap("permissionId", permission)); + List<String> autoGrants = cache.get("SecurityPermissionAutoGrant", condition, "EntityAuthorization.autoGrants"); + if (autoGrants == null) { + autoGrants = FastList.newInstance(); + + List<GenericValue> values = null; + try { + values = delegator.findList("SecurityPermissionAutoGrant", condition, null, null, null, true); + } catch (GenericEntityException e) { + Debug.logWarning(e, module); + } + + if (UtilValidate.isNotEmpty(values)) { + for (GenericValue v : values) { + autoGrants.add(v.getString("grantPermission")); + } + } + cache.put("SecurityPermissionAutoGrant", condition, "EntityAuthorization.autoGrants", autoGrants); + } + return autoGrants; + } + + private String getPermissionDynamicAccess(String perm) { + GenericValue permission = null; + try { + permission = delegator.findOne("SecurityPermission", UtilMisc.toMap("permissionId", perm), true); + } catch (GenericEntityException e) { + Debug.logWarning(e, module); + } + if (permission != null) { + return permission.getString("dynamicAccess"); + } + return null; + } +} Propchange: ofbiz/branches/jquery/framework/security/src/org/ofbiz/security/authz/EntityAuthorization.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/security/src/org/ofbiz/security/authz/da/DynamicAccess.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/security/src/org/ofbiz/security/authz/da/DynamicAccessFactory.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/security/src/org/ofbiz/security/authz/da/DynamicAccessHandler.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/security/src/org/ofbiz/security/authz/da/GroovyDaHandler.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/security/src/org/ofbiz/security/authz/da/ObjectDaHandler.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/service/src/org/ofbiz/service/GenericInvoker.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/AggregateFunction.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/Atom.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/BetweenCondition.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/BooleanCondition.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/Condition.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/ConditionList.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/ConditionPlan.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/ConditionPlanner.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/ConstantValue.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/CountAllFunction.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/DeletePlan.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/FieldAll.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/FieldDef.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/FieldValue.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/FunctionCall.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/InsertPlan.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/InsertRow.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/InsertSource.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/InsertValues.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/Joined.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/Joiner.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/KeyMap.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/ListCondition.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/Main.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/MathValue.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/NumberValue.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/OrderByItem.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/ParameterValue.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/ParameterizedConditionException.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/jquery/framework/sql/src/org/ofbiz/sql/Planner.java ------------------------------------------------------------------------------ svn:eol-style = native |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |