svn commit: r805012 [6/11] - in /ofbiz/branches/executionconte
Locked
svn commit: r805012 [6/11] - in /ofbiz/branches/executionconte
 
|
Modified: ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java (original) +++ ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java Mon Aug 17 15:42:56 2009 @@ -90,7 +90,7 @@ // xmlString should contain the auth document at the beginning // all documents require an <?xml version="1.0" encoding="UTF-8" ?> header - if (! xmlString.matches( "^(?s)<\\?xml\\s+version=\"1\\.0\"\\s+encoding=\"UTF-8\"\\s*\\?>.*")) { + if (! xmlString.matches("^(?s)<\\?xml\\s+version=\"1\\.0\"\\s+encoding=\"UTF-8\"\\s*\\?>.*")) { throw new FedexConnectException("XML header is malformed"); } @@ -115,7 +115,7 @@ String response = null; try { response = http.post(xmlString); - } catch ( HttpClientException e) { + } catch (HttpClientException e) { Debug.logError(e, "Problem connecting to Fedex server", module); throw new FedexConnectException("URL Connection problem", e); } @@ -133,7 +133,7 @@ /* * Register a Fedex account for shipping by obtaining the meter number */ - public static Map<String, Object> fedexSubscriptionRequest( DispatchContext dctx, Map<String, ? extends Object> context) { + public static Map<String, Object> fedexSubscriptionRequest(DispatchContext dctx, Map<String, ? extends Object> context) { GenericDelegator delegator = dctx.getDelegator(); List<Object> errorList = FastList.newInstance(); @@ -332,11 +332,11 @@ try { fDXSubscriptionReplyDocument = UtilXml.readXmlDocument(fDXSubscriptionReplyString, false); Debug.log("Fedex response for FDXSubscriptionRequest:" + fDXSubscriptionReplyString); - } catch ( SAXException se) { + } catch (SAXException se) { String errorMessage = "Error parsing the FDXSubscriptionRequest response: " + se.toString(); Debug.logError(se, errorMessage, module); return ServiceUtil.returnError(errorMessage); - } catch ( ParserConfigurationException pce) { + } catch (ParserConfigurationException pce) { String errorMessage = "Error parsing the FDXSubscriptionRequest response: " + pce.toString(); Debug.logError(pce, errorMessage, module); return ServiceUtil.returnError(errorMessage); @@ -357,7 +357,7 @@ result.put("meterNumber", meterNumber); - } catch ( GenericEntityException e ) { + } catch (GenericEntityException e) { Debug.logError(e, module); return ServiceUtil.returnError(e.getMessage()); } @@ -369,7 +369,7 @@ * * Send a FDXShipRequest via the Ship Manager Direct API */ - public static Map<String, Object> fedexShipRequest( DispatchContext dctx, Map<String, ? extends Object> context) { + public static Map<String, Object> fedexShipRequest(DispatchContext dctx, Map<String, ? extends Object> context) { GenericDelegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); //GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -530,7 +530,7 @@ String originContactKey = "PERSON".equals(partyFrom.getString("partyTypeId")) ? "OriginContactPersonName" : "OriginContactCompanyName"; String originContactName = PartyHelper.getPartyName(partyFrom, false); if (UtilValidate.isEmpty(originContactName)) { - return ServiceUtil.returnError("partyIdFrom for shipmentId " + shipmentId + ", shipmentRouteSegmentId " + shipmentRouteSegmentId + " has no name (required for Fedex shipments)" ); + return ServiceUtil.returnError("partyIdFrom for shipmentId " + shipmentId + ", shipmentRouteSegmentId " + shipmentRouteSegmentId + " has no name (required for Fedex shipments)"); } // Get and validate destination postal address @@ -581,7 +581,7 @@ String destinationContactKey = "PERSON".equals(partyTo.getString("partyTypeId")) ? "DestinationContactPersonName" : "DestinationContactCompanyName"; String destinationContactName = PartyHelper.getPartyName(partyTo, false); if (UtilValidate.isEmpty(destinationContactName)) { - return ServiceUtil.returnError("partyTo for shipmentId " + shipmentId + ", shipmentRouteSegmentId " + shipmentRouteSegmentId + " has no name (required for Fedex shipments)" ); + return ServiceUtil.returnError("partyTo for shipmentId " + shipmentId + ", shipmentRouteSegmentId " + shipmentRouteSegmentId + " has no name (required for Fedex shipments)"); } String homeDeliveryType = null; @@ -808,7 +808,7 @@ if (UtilValidate.isNotEmpty(dimensionsUomId) && dimensionsLength != null && dimensionsLength.setScale(0, BigDecimal.ROUND_HALF_UP).compareTo(BigDecimal.ZERO) > 0 && dimensionsWidth != null && dimensionsWidth.setScale(0, BigDecimal.ROUND_HALF_UP).compareTo(BigDecimal.ZERO) > 0 && - dimensionsHeight != null && dimensionsHeight.setScale(0, BigDecimal.ROUND_HALF_UP).compareTo(BigDecimal.ZERO) > 0 ) { + dimensionsHeight != null && dimensionsHeight.setScale(0, BigDecimal.ROUND_HALF_UP).compareTo(BigDecimal.ZERO) > 0) { shipRequestContext.put("DimensionsUnits", dimensionsUomId.equals("LEN_in") ? "IN" : "CM"); shipRequestContext.put("DimensionsLength", dimensionsLength.setScale(0, BigDecimal.ROUND_HALF_UP).toString()); shipRequestContext.put("DimensionsWidth", dimensionsWidth.setScale(0, BigDecimal.ROUND_HALF_UP).toString()); @@ -843,10 +843,10 @@ // Pass the reply to the handler method return handleFedexShipReply(fDXShipReplyString, shipmentRouteSegment, shipmentPackageRouteSegs); - } catch ( GenericEntityException e) { + } catch (GenericEntityException e) { Debug.logError(e, module); return ServiceUtil.returnError("Error in fedexShipRequest service: " + e.toString()); - } catch ( GenericServiceException se) { + } catch (GenericServiceException se) { Debug.logError(se, module); return ServiceUtil.returnError("Error in fedexShipRequest service: " + se.toString()); } @@ -939,7 +939,7 @@ Element errorMessageElement = UtilXml.firstChildElement(errorElement, "Message"); if (errorCodeElement != null || errorMessageElement != null) { String errorCode = UtilXml.childElementValue(errorElement, "Code"); - String errorMessage = UtilXml.childElementValue( errorElement, "Message"); + String errorMessage = UtilXml.childElementValue(errorElement, "Message"); if (UtilValidate.isNotEmpty(errorCode) || UtilValidate.isNotEmpty(errorMessage)) { String errMsg = "An error occurred [code: " + errorCode + " [Description: " + errorMessage + "]."; errorList.add(errMsg); Modified: ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java (original) +++ ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java Mon Aug 17 15:42:56 2009 @@ -1627,7 +1627,7 @@ GenericValue destCountryGeo = null; try { destCountryGeo = shipToAddress.getRelatedOne("CountryGeo"); - } catch ( GenericEntityException e ) { + } catch (GenericEntityException e) { Debug.logError(e, module); return ServiceUtil.returnError(e.getMessage()); } @@ -1639,7 +1639,7 @@ cxt.put("carrierPartyId", context.get("carrierPartyId")); cxt.put("shipmentMethodTypeId", context.get("shipmentMethodTypeId")); cxt.put("shippingPostalCode", shipToAddress.getString("postalCode")); - cxt.put("shippingCountryCode",destCountryGeo.getString("geoCode") ); + cxt.put("shippingCountryCode",destCountryGeo.getString("geoCode")); cxt.put("packageWeights", context.get("packageWeights")); cxt.put("shippableItemInfo", context.get("shippableItemInfo")); cxt.put("shippableTotal", context.get("shippableTotal")); @@ -1695,7 +1695,7 @@ String productId = i.next(); Map<String, Object> productInfo = getProductItemInfo(shippableItemInfo, productId); if (productInfo.get("inShippingBox") != null && ((String) productInfo.get("inShippingBox")).equalsIgnoreCase("Y") - && productInfo.get("shippingDepth") !=null && productInfo.get("shippingWidth") !=null && productInfo.get("shippingHeight") !=null ) { + && productInfo.get("shippingDepth") !=null && productInfo.get("shippingWidth") !=null && productInfo.get("shippingHeight") !=null) { Element dimensionsElement = UtilXml.addChildElement(packageElement, "Dimensions", requestDoc); UtilXml.addChildElementValue(dimensionsElement, "Length", productInfo.get("shippingDepth").toString(), requestDoc); UtilXml.addChildElementValue(dimensionsElement, "Width", productInfo.get("shippingWidth").toString(), requestDoc); @@ -2651,7 +2651,7 @@ Document acceptAccessRequestDocument = createAccessRequestDocument(); String acceptAccessRequestString = null; try { - acceptAccessRequestString = UtilXml.writeXmlDocument(acceptAccessRequestDocument); + acceptAccessRequestString = UtilXml.writeXmlDocument(acceptAccessRequestDocument); } catch (IOException e) { String ioeErrMsg = "Error writing the AccessRequest XML Document to a String: " + e.toString(); Debug.logError(e, ioeErrMsg, module); Modified: ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java (original) +++ ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java Mon Aug 17 15:42:56 2009 @@ -621,7 +621,7 @@ String state = (String) context.get("state"); String city = (String) context.get("city"); String zip5 = (String) context.get("zip5"); - if ( (UtilValidate.isEmpty(state) && UtilValidate.isEmpty(city) && UtilValidate.isEmpty(zip5)) || // No state, city or zip5 + if ((UtilValidate.isEmpty(state) && UtilValidate.isEmpty(city) && UtilValidate.isEmpty(zip5)) || // No state, city or zip5 (UtilValidate.isEmpty(zip5) && (UtilValidate.isEmpty(state) || UtilValidate.isEmpty(city)))) { // Both state and city are required if no zip5 String errorMessage = UtilProperties.getMessage(errorResource, "ProductUspsAddressValidationStateAndCityOrZipRqd", (Locale) context.get("locale")); Debug.logError(errorMessage, module); @@ -1573,7 +1573,7 @@ shipmentRouteSegment.get("shipmentId"), shipmentPackageRouteSeg.get("shipmentPackageSeqId"), shipmentRouteSegment.get("shipmentRouteSegementId") - ), ':'); + ), ':'); UtilXml.addChildElementValue(rootElement, "FromCustomsReference", fromCustomsReference, packageDocument); // Determine the container type for this package String container = "VARIABLE"; Modified: ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java (original) +++ ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java Mon Aug 17 15:42:56 2009 @@ -358,7 +358,7 @@ verifiedQty = verifiedQty.add(pickRow.getReadyToVerifyQty()); } - if (orderedQty.compareTo(verifiedQty) != 0 ) { + if (orderedQty.compareTo(verifiedQty) != 0) { throw new GeneralException(UtilProperties.getMessage("ProductErrorUiLabels", "ProductErrorAllOrderItemsAreNotVerified", locale)); } } Modified: ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java (original) +++ ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java Mon Aug 17 15:42:56 2009 @@ -516,7 +516,7 @@ } shipCostEstimateMap.put("shippableTotal", shippableTotal); shipCostEstimateResult = getDispatcher().runSync("calcShipmentCostEstimate", shipCostEstimateMap); - } catch ( GeneralException e ) { + } catch (GeneralException e) { Debug.logError(e, module); } if (UtilValidate.isNotEmpty(shipCostEstimateResult.get("shippingEstimateAmount"))) { Modified: ofbiz/branches/executioncontext20090812/applications/product/webapp/catalog/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/webapp/catalog/WEB-INF/controller.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/product/webapp/catalog/WEB-INF/controller.xml Mon Aug 17 15:42:56 2009 @@ -21,6 +21,7 @@ <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> <include location="component://common/webcommon/WEB-INF/common-controller.xml"/> + <include location="component://commonext/webapp/WEB-INF/controller.xml"/> <description>Catalog Module Site Configuration File</description> <owner>Copyright 2001-2009 The Apache Software Foundation</owner> Modified: ofbiz/branches/executioncontext20090812/applications/product/webapp/catalog/find/exportproducts.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/webapp/catalog/find/exportproducts.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/webapp/catalog/find/exportproducts.ftl (original) +++ ofbiz/branches/executioncontext20090812/applications/product/webapp/catalog/find/exportproducts.ftl Mon Aug 17 15:42:56 2009 @@ -16,5 +16,5 @@ specific language governing permissions and limitations under the License. --><#list productExportList as productExportMap><#assign productCategoryCount=0/><#assign productFeatureCount=0/> -${productExportMap.productId} <#if productExportMap.productFeatureCustom?has_content>${productExportMap.productFeatureCustom.description?if_exists}</#if> <#list productExportMap.productCategories as productCategoryAndMember><#if productCategoryAndMember.categoryName?has_content><#if productCategoryCount > 0>,</#if>${productCategoryAndMember.categoryName}<#assign productCategoryCount=productCategoryCount + 1/></#if></#list> <#list productExportMap.productFeatures as productFeatureAndAppl><#if productFeatureAndAppl.description?has_content><#if productFeatureCount > 0>,</#if>${productFeatureAndAppl.description}<#assign productFeatureCount=productFeatureCount + 1/></#if></#list> +${productExportMap.productId} <#if productExportMap.productFeatureCustom?has_content>${productExportMap.productFeatureCustom.description?if_exists}</#if> <#list productExportMap.productCategories as productCategoryAndMember><#if productCategoryAndMember.categoryName?has_content><#if productCategoryCount > 0>,</#if>${productCategoryAndMember.categoryName}<#assign productCategoryCount=productCategoryCount + 1/></#if></#list> <#list productExportMap.productFeatures as productFeatureAndAppl><#if productFeatureAndAppl.description?has_content><#if productFeatureCount > 0>,</#if>${productFeatureAndAppl.description}<#assign productFeatureCount=productFeatureCount + 1/></#if></#list> </#list> \ No newline at end of file Modified: ofbiz/branches/executioncontext20090812/applications/product/webapp/catalog/reviews/pendingReviews.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/webapp/catalog/reviews/pendingReviews.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/webapp/catalog/reviews/pendingReviews.ftl (original) +++ ofbiz/branches/executioncontext20090812/applications/product/webapp/catalog/reviews/pendingReviews.ftl Mon Aug 17 15:42:56 2009 @@ -60,9 +60,9 @@ <#assign party = postedUserLogin.getRelatedOne("Party")> <#assign partyTypeId = party.get("partyTypeId")> <#if partyTypeId == "PERSON"> - <#assign postedPerson = postedUserLogin.getRelatedOne("Person")> + <#assign postedPerson = postedUserLogin.getRelatedOne("Person")> <#else> - <#assign postedPerson = postedUserLogin.getRelatedOne("PartyGroup")> + <#assign postedPerson = postedUserLogin.getRelatedOne("PartyGroup")> </#if> <tr id="review_tableRow_${rowCount}" valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> <td> @@ -70,9 +70,9 @@ ${review.postedDateTime?if_exists} </td> <#if postedPerson.firstName?has_content && postedPerson.lastName?has_content> - <td>${postedPerson.firstName} ${postedPerson.lastName}</td> + <td>${postedPerson.firstName} ${postedPerson.lastName}</td> <#else> - <td>${postedPerson.groupName}</td> + <td>${postedPerson.groupName}</td> </#if> <td> <select name='postedAnonymous_o_${rowCount}'> Modified: ofbiz/branches/executioncontext20090812/applications/product/webapp/facility/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/webapp/facility/WEB-INF/controller.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/webapp/facility/WEB-INF/controller.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/product/webapp/facility/WEB-INF/controller.xml Mon Aug 17 15:42:56 2009 @@ -21,6 +21,7 @@ <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> <include location="component://common/webcommon/WEB-INF/common-controller.xml"/> + <include location="component://commonext/webapp/WEB-INF/controller.xml"/> <description>Facility Manager Module Site Configuration File</description> <owner>Copyright 2001-2009 The Apache Software Foundation</owner> Modified: ofbiz/branches/executioncontext20090812/applications/securityext/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/securityext/build.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/securityext/build.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/securityext/build.xml Mon Aug 17 15:42:56 2009 @@ -43,7 +43,7 @@ <fileset dir="../../framework/webapp/lib" includes="*.jar"/> <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/> <fileset dir="../../framework/common/build/lib" includes="*.jar"/> - <fileset dir="../../framework/testtools/build/lib" includes="*.jar"/> + <fileset dir="../../framework/testtools/build/lib" includes="*.jar"/> <fileset dir="../party/build/lib" includes="*.jar"/> <fileset dir="../product/build/lib" includes="*.jar"/> <fileset dir="../order/build/lib" includes="*.jar"/> Modified: ofbiz/branches/executioncontext20090812/applications/workeffort/config/WorkEffortUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/workeffort/config/WorkEffortUiLabels.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/workeffort/config/WorkEffortUiLabels.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/workeffort/config/WorkEffortUiLabels.xml Mon Aug 17 15:42:56 2009 @@ -43,7 +43,7 @@ </property> <property key="FormFieldTitle_actualEndDate"> <value xml:lang="en">Actual End Date</value> - <value xml:lang="fr">Date de fin réelle</value> + <value xml:lang="fr">Date d'achèvement réelle</value> <value xml:lang="it">Data Fine Attuale</value> <value xml:lang="ro">Data Finala Actuala</value> <value xml:lang="th">วัà¸à¸ªà¸´à¹à¸à¸ªà¸¸à¸à¸à¸²à¸¡à¸à¸§à¸²à¸¡à¸à¸£à¸´à¸</value> Modified: ofbiz/branches/executioncontext20090812/applications/workeffort/data/WorkEffortPortletData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/workeffort/data/WorkEffortPortletData.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/workeffort/data/WorkEffortPortletData.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/workeffort/data/WorkEffortPortletData.xml Mon Aug 17 15:42:56 2009 @@ -29,8 +29,8 @@ editFormLocation="component://workeffort/widget/CalendarForms.xml" screenshot="/images/portlets/Calendar.png"/> <PortletPortletCategory portalPortletId="Calendar" portletCategoryId="EVENTSTASKS"/> - <DataResource dataResourceId="HELP-PortLetCalendar" localeString="en" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Calendar help file" mimeTypeId="text/xml" isPublic="Y" /> - <ElectronicText dataResourceId="HELP-PortLetCalendar"> + <DataResource dataResourceId="HELP_Calendar" localeString="en" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Calendar help file" mimeTypeId="text/xml" isPublic="Y" /> + <ElectronicText dataResourceId="HELP_Calendar"> <textData><![CDATA[ <root> <definition> @@ -45,8 +45,8 @@ </root> ]]></textData> </ElectronicText> - <DataResource dataResourceId="HELP-TEMPL-FLAT_GREY"/> - <Content contentId="HELP-PortLetCalendar" contentTypeId="DOCUMENT" templateDataResourceId="HELP-TEMPL-FLAT_GREY" dataResourceId="HELP-PortLetCalendar" statusId="CTNT_IN_PROGRESS" contentName="PortLetCalendar" mimeTypeId="text/html"/> + <Content contentId="HELP_Calendar" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_Calendar" statusId="CTNT_IN_PROGRESS" contentName="Help portlet Celendar" mimeTypeId="text/html"/> + <ContentAssoc contentId="HELP_MYPORTAL" contentIdTo="HELP_Calendar" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01"/> Modified: ofbiz/branches/executioncontext20090812/applications/workeffort/script/isCalOwner.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/workeffort/script/isCalOwner.groovy?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/workeffort/script/isCalOwner.groovy (original) +++ ofbiz/branches/executioncontext20090812/applications/workeffort/script/isCalOwner.groovy Mon Aug 17 15:42:56 2009 @@ -24,9 +24,9 @@ partyAssign = EntityUtil.filterByDate(delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : parameters.workEffortId, "partyId" : parameters.userLogin.partyId])); if (partyAssign) { - if (partyAssign.get(0).roleTypeId.equals("CAL_OWNER")) { - context.isCalOwner = new Boolean(true); - } else{ + if (partyAssign.get(0).roleTypeId.equals("CAL_OWNER")) { + context.isCalOwner = new Boolean(true); + } else{ context.isCalOwner = new Boolean(false); - } + } } Modified: ofbiz/branches/executioncontext20090812/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java (original) +++ ofbiz/branches/executioncontext20090812/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java Mon Aug 17 15:42:56 2009 @@ -823,7 +823,7 @@ if ("TASK".equals(workEffortTypeId) || (typeValue != null && "TASK".equals(typeValue.get("parentTypeId")))) { isTask = true; resultList = components.getComponents("VTODO"); - } else if ("EVENT".equals(workEffortTypeId) || (typeValue != null && "EVENT".equals(typeValue.get("parentTypeId")))){ + } else if ("EVENT".equals(workEffortTypeId) || (typeValue != null && "EVENT".equals(typeValue.get("parentTypeId")))) { resultList = components.getComponents("VEVENT"); } else { return null; Modified: ofbiz/branches/executioncontext20090812/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java (original) +++ ofbiz/branches/executioncontext20090812/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java Mon Aug 17 15:42:56 2009 @@ -113,10 +113,10 @@ List<GenericValue> toBeStored = FastList.newInstance(); for (Map.Entry<String, Long> entry: keywords.entrySet()) { - if (entry.getKey().length() < 60) { // ignore very long strings, cannot be stored anyway - GenericValue workEffortKeyword = delegator.makeValue("WorkEffortKeyword", UtilMisc.toMap("workEffortId", workEffort.getString("workEffortId"), "keyword", entry.getKey(), "relevancyWeight", entry.getValue())); + if (entry.getKey().length() < 60) { // ignore very long strings, cannot be stored anyway + GenericValue workEffortKeyword = delegator.makeValue("WorkEffortKeyword", UtilMisc.toMap("workEffortId", workEffort.getString("workEffortId"), "keyword", entry.getKey(), "relevancyWeight", entry.getValue())); toBeStored.add(workEffortKeyword); - } + } } if (toBeStored.size() > 0) { if (Debug.verboseOn()) Debug.logVerbose("WorkEffortKeywordIndex indexKeywords Storing " + toBeStored.size() + " keywords for workEffortId " + workEffort.getString("workEffortId"), module); Modified: ofbiz/branches/executioncontext20090812/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java (original) +++ ofbiz/branches/executioncontext20090812/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java Mon Aug 17 15:42:56 2009 @@ -218,7 +218,7 @@ } // add a WorkEfort fromDate thruDate to the search - if (UtilValidate.isNotEmpty((String) parameters.get("fromDate")) || UtilValidate.isNotEmpty((String) parameters.get("thruDate")) ) { + if (UtilValidate.isNotEmpty((String) parameters.get("fromDate")) || UtilValidate.isNotEmpty((String) parameters.get("thruDate"))) { Timestamp fromDate =null; if (UtilValidate.isNotEmpty((String) parameters.get("fromDate"))) { fromDate=Timestamp.valueOf((String) parameters.get("fromDate")); Modified: ofbiz/branches/executioncontext20090812/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java (original) +++ ofbiz/branches/executioncontext20090812/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java Mon Aug 17 15:42:56 2009 @@ -84,10 +84,10 @@ EntityCondition.makeCondition("currentStatusId", EntityOperator.NOT_EQUAL, "CAL_DELEGATED"), EntityCondition.makeCondition("currentStatusId", EntityOperator.NOT_EQUAL, "CAL_COMPLETED"), EntityCondition.makeCondition("currentStatusId", EntityOperator.NOT_EQUAL, "CAL_CANCELLED") - ); + ); validWorkEfforts = EntityUtil.filterByDate( delegator.findList("WorkEffortAndPartyAssign", ecl, null, UtilMisc.toList("estimatedStartDate", "priority"), null, false) - ); + ); } catch (GenericEntityException e) { Debug.logWarning(e, module); return ServiceUtil.returnError("Error finding desired WorkEffort records: " + e.toString()); @@ -120,7 +120,7 @@ EntityConditionList<EntityExpr> ecl = EntityCondition.makeCondition(conditionList, EntityOperator.AND); validWorkEfforts = EntityUtil.filterByDate( delegator.findList("WorkEffortAndPartyAssign", ecl, null, UtilMisc.toList("estimatedStartDate", "priority"), null, false) - ); + ); } catch (GenericEntityException e) { Debug.logWarning(e, module); return ServiceUtil.returnError("Error finding desired WorkEffort records: " + e.toString()); @@ -232,7 +232,7 @@ EntityConditionList<EntityExpr> ecl = EntityCondition.makeCondition(constraints); roleWorkEfforts = EntityUtil.filterByDate( delegator.findList("WorkEffortPartyAssignByRole", ecl, null, UtilMisc.toList("priority"), null, false) - ); + ); } catch (GenericEntityException e) { Debug.logWarning(e, module); return ServiceUtil.returnError("Error finding desired WorkEffort records: " + e.toString()); @@ -269,7 +269,7 @@ EntityConditionList<EntityExpr> ecl = EntityCondition.makeCondition(constraints); groupWorkEfforts = EntityUtil.filterByDate( delegator.findList("WorkEffortPartyAssignByGroup", ecl, null, UtilMisc.toList("priority"), null, false) - ); + ); } catch (GenericEntityException e) { Debug.logWarning(e, module); return ServiceUtil.returnError("Error finding desired WorkEffort records: " + e.toString()); @@ -358,18 +358,18 @@ if (UtilValidate.isNotEmpty(partyIds)) { // (non cancelled) public events, with a startdate List<EntityCondition> publicEvents = UtilMisc.<EntityCondition>toList( - EntityCondition.makeCondition("scopeEnumId", EntityOperator.EQUALS, "WES_PUBLIC"), - EntityCondition.makeCondition("parentTypeId", EntityOperator.EQUALS, "EVENT") - ); + EntityCondition.makeCondition("scopeEnumId", EntityOperator.EQUALS, "WES_PUBLIC"), + EntityCondition.makeCondition("parentTypeId", EntityOperator.EQUALS, "EVENT") + ); if (cancelledCheckAndList != null) { - publicEvents.addAll(cancelledCheckAndList); + publicEvents.addAll(cancelledCheckAndList); } entityExprList.add( - EntityCondition.makeCondition(UtilMisc.toList( - EntityCondition.makeCondition("partyId", EntityOperator.IN, partyIds), - EntityCondition.makeCondition(publicEvents, EntityJoinOperator.AND) - ), EntityJoinOperator.OR)); + EntityCondition.makeCondition(UtilMisc.toList( + EntityCondition.makeCondition("partyId", EntityOperator.IN, partyIds), + EntityCondition.makeCondition(publicEvents, EntityJoinOperator.AND) + ), EntityJoinOperator.OR)); } if (UtilValidate.isNotEmpty(facilityId)) { entityExprList.add(EntityCondition.makeCondition("facilityId", EntityOperator.EQUALS, facilityId)); @@ -438,22 +438,22 @@ */ public static Map<String, Object> getWorkEffortEventsByPeriod(DispatchContext ctx, Map<String, ? extends Object> context) { - - /* - To create testdata for this function for fixedasset/facility - - 1) go to Manufacturing -> JobShop, then click on "create new Production run": - https://localhost:8443/manufacturing/control/CreateProductionRun - 2) enter as productId "PROD_MANUF", quantity 1, start date tomorrow and press the submit button - ` 3) in the next screen, click on the "Confirm" link (top part of the sccreen) + + /* + To create testdata for this function for fixedasset/facility + + 1) go to Manufacturing -> JobShop, then click on "create new Production run": + https://localhost:8443/manufacturing/control/CreateProductionRun + 2) enter as productId "PROD_MANUF", quantity 1, start date tomorrow and press the submit button + ` 3) in the next screen, click on the "Confirm" link (top part of the sccreen) - Now you have a confirmed production run (starting tomorrow) happening in facility "WebStoreWarehouse", - with a task happening in fixed asset "WORKCENTER_COST" + Now you have a confirmed production run (starting tomorrow) happening in facility "WebStoreWarehouse", + with a task happening in fixed asset "WORKCENTER_COST" - In the calendars screen, selecting the proper facility you should see the work effort associated to the production run; - if you select the proper fixed asset you should see the task. + In the calendars screen, selecting the proper facility you should see the work effort associated to the production run; + if you select the proper fixed asset you should see the task. - */ + */ GenericDelegator delegator = ctx.getDelegator(); Security security = ctx.getSecurity(); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -514,9 +514,9 @@ } // cancelled status id's - List<EntityCondition> cancelledCheckAndList = UtilMisc.<EntityCondition>toList( - EntityCondition.makeCondition("currentStatusId", EntityOperator.NOT_EQUAL, "EVENT_CANCELLED"), - EntityCondition.makeCondition("currentStatusId", EntityOperator.NOT_EQUAL, "CAL_CANCELLED")); + List<EntityCondition> cancelledCheckAndList = UtilMisc.<EntityCondition>toList( + EntityCondition.makeCondition("currentStatusId", EntityOperator.NOT_EQUAL, "EVENT_CANCELLED"), + EntityCondition.makeCondition("currentStatusId", EntityOperator.NOT_EQUAL, "CAL_CANCELLED")); List<EntityCondition> entityExprList = UtilGenerics.checkList(context.get("entityExprList")); @@ -525,82 +525,82 @@ } // should have at least a start date - EntityCondition startDateRequired = EntityCondition.makeCondition(UtilMisc.<EntityCondition>toList( - EntityCondition.makeCondition("estimatedStartDate", EntityOperator.NOT_EQUAL, null), - EntityCondition.makeCondition("actualStartDate", EntityOperator.NOT_EQUAL, null) - ), EntityJoinOperator.OR); - + EntityCondition startDateRequired = EntityCondition.makeCondition(UtilMisc.<EntityCondition>toList( + EntityCondition.makeCondition("estimatedStartDate", EntityOperator.NOT_EQUAL, null), + EntityCondition.makeCondition("actualStartDate", EntityOperator.NOT_EQUAL, null) + ), EntityJoinOperator.OR); + List<EntityCondition> periodCheckAndlList = UtilMisc.<EntityCondition>toList( - startDateRequired, - // the startdate should be less than the period end - EntityCondition.makeCondition(UtilMisc.<EntityCondition>toList( - EntityCondition.makeCondition(UtilMisc.<EntityCondition>toList( - EntityCondition.makeCondition("actualStartDate", EntityOperator.EQUALS, null), - EntityCondition.makeCondition("estimatedStartDate", EntityOperator.NOT_EQUAL, null), - EntityCondition.makeCondition("estimatedStartDate", EntityOperator.LESS_THAN_EQUAL_TO, endStamp) - ), EntityJoinOperator.AND), - EntityCondition.makeCondition(UtilMisc.<EntityCondition>toList( - EntityCondition.makeCondition("actualStartDate", EntityOperator.NOT_EQUAL, null), - EntityCondition.makeCondition("actualStartDate", EntityOperator.LESS_THAN_EQUAL_TO, endStamp) - ), EntityJoinOperator.AND) - ), EntityJoinOperator.OR), - // if the completion date is not null then it should be larger than the period start - EntityCondition.makeCondition(UtilMisc.<EntityCondition>toList( - // can also be empty - EntityCondition.makeCondition(UtilMisc.<EntityCondition>toList( - EntityCondition.makeCondition("estimatedCompletionDate", EntityOperator.EQUALS, null), - EntityCondition.makeCondition("actualCompletionDate", EntityOperator.EQUALS, null) - ), EntityJoinOperator.AND), - // check estimated value if the actual is not provided - EntityCondition.makeCondition(UtilMisc.<EntityCondition>toList( - EntityCondition.makeCondition("actualCompletionDate", EntityOperator.EQUALS, null), - EntityCondition.makeCondition("estimatedCompletionDate", EntityOperator.NOT_EQUAL, null), - EntityCondition.makeCondition("estimatedCompletionDate", EntityOperator.GREATER_THAN_EQUAL_TO, startStamp) - ), EntityJoinOperator.AND), - // at last check the actual value - EntityCondition.makeCondition(UtilMisc.<EntityCondition>toList( - EntityCondition.makeCondition("actualCompletionDate", EntityOperator.NOT_EQUAL, null), - EntityCondition.makeCondition("actualCompletionDate", EntityOperator.GREATER_THAN_EQUAL_TO, startStamp) - ), EntityJoinOperator.AND) - ), EntityJoinOperator.OR)); + startDateRequired, + // the startdate should be less than the period end + EntityCondition.makeCondition(UtilMisc.<EntityCondition>toList( + EntityCondition.makeCondition(UtilMisc.<EntityCondition>toList( + EntityCondition.makeCondition("actualStartDate", EntityOperator.EQUALS, null), + EntityCondition.makeCondition("estimatedStartDate", EntityOperator.NOT_EQUAL, null), + EntityCondition.makeCondition("estimatedStartDate", EntityOperator.LESS_THAN_EQUAL_TO, endStamp) + ), EntityJoinOperator.AND), + EntityCondition.makeCondition(UtilMisc.<EntityCondition>toList( + EntityCondition.makeCondition("actualStartDate", EntityOperator.NOT_EQUAL, null), + EntityCondition.makeCondition("actualStartDate", EntityOperator.LESS_THAN_EQUAL_TO, endStamp) + ), EntityJoinOperator.AND) + ), EntityJoinOperator.OR), + // if the completion date is not null then it should be larger than the period start + EntityCondition.makeCondition(UtilMisc.<EntityCondition>toList( + // can also be empty + EntityCondition.makeCondition(UtilMisc.<EntityCondition>toList( + EntityCondition.makeCondition("estimatedCompletionDate", EntityOperator.EQUALS, null), + EntityCondition.makeCondition("actualCompletionDate", EntityOperator.EQUALS, null) + ), EntityJoinOperator.AND), + // check estimated value if the actual is not provided + EntityCondition.makeCondition(UtilMisc.<EntityCondition>toList( + EntityCondition.makeCondition("actualCompletionDate", EntityOperator.EQUALS, null), + EntityCondition.makeCondition("estimatedCompletionDate", EntityOperator.NOT_EQUAL, null), + EntityCondition.makeCondition("estimatedCompletionDate", EntityOperator.GREATER_THAN_EQUAL_TO, startStamp) + ), EntityJoinOperator.AND), + // at last check the actual value + EntityCondition.makeCondition(UtilMisc.<EntityCondition>toList( + EntityCondition.makeCondition("actualCompletionDate", EntityOperator.NOT_EQUAL, null), + EntityCondition.makeCondition("actualCompletionDate", EntityOperator.GREATER_THAN_EQUAL_TO, startStamp) + ), EntityJoinOperator.AND) + ), EntityJoinOperator.OR)); entityExprList.addAll(periodCheckAndlList); // (non cancelled) recurring events List<EntityCondition> recurringEvents = UtilMisc.<EntityCondition>toList(EntityCondition.makeCondition("tempExprId", EntityOperator.NOT_EQUAL, null)); if (filterOutCanceledEvents.booleanValue()) { - recurringEvents.addAll(cancelledCheckAndList); + recurringEvents.addAll(cancelledCheckAndList); } EntityCondition eclTotal = EntityCondition.makeCondition(UtilMisc.toList( - EntityCondition.makeCondition(entityExprList, EntityJoinOperator.AND), - EntityCondition.makeCondition(recurringEvents, EntityJoinOperator.AND) - ), EntityJoinOperator.OR); + EntityCondition.makeCondition(entityExprList, EntityJoinOperator.AND), + EntityCondition.makeCondition(recurringEvents, EntityJoinOperator.AND) + ), EntityJoinOperator.OR); List<String> orderByList = UtilMisc.toList("estimatedStartDate"); if (partyIdsToUse.size() > 0 || UtilValidate.isNotEmpty(facilityId) || UtilValidate.isNotEmpty(fixedAssetId)) { try { List<GenericValue> tempWorkEfforts = null; if (UtilValidate.isNotEmpty(partyIdsToUse)) { - // Debug.log("=====conditions for party: " + eclTotal); + // Debug.log("=====conditions for party: " + eclTotal); tempWorkEfforts = EntityUtil.filterByDate(delegator.findList("WorkEffortAndPartyAssignAndType", eclTotal, null, orderByList, null, false)); } else if (UtilValidate.isNotEmpty(fixedAssetId)) { - EntityConditionList<EntityCondition> ecl = - EntityCondition.makeCondition(UtilMisc.toList( - eclTotal, - EntityCondition.makeCondition("fixedAssetId", EntityOperator.EQUALS, fixedAssetId) - ), EntityJoinOperator.AND); + EntityConditionList<EntityCondition> ecl = + EntityCondition.makeCondition(UtilMisc.toList( + eclTotal, + EntityCondition.makeCondition("fixedAssetId", EntityOperator.EQUALS, fixedAssetId) + ), EntityJoinOperator.AND); // Get "old style" work efforts and "new style" work efforts - // Debug.log("=====conditions for fixed asset: " + ecl); + // Debug.log("=====conditions for fixed asset: " + ecl); tempWorkEfforts = delegator.findList("WorkEffort", ecl, null, orderByList, null, false); tempWorkEfforts.addAll(EntityUtil.filterByDate(delegator.findList("WorkEffortAndFixedAssetAssign", ecl, null, orderByList, null, false))); } else { - EntityConditionList<EntityCondition> ecl = - EntityCondition.makeCondition(UtilMisc.toList( - eclTotal, - EntityCondition.makeCondition("facilityId", EntityOperator.EQUALS, facilityId) - ), EntityJoinOperator.AND); - // Debug.log("=====conditions for facility: " + ecl); + EntityConditionList<EntityCondition> ecl = + EntityCondition.makeCondition(UtilMisc.toList( + eclTotal, + EntityCondition.makeCondition("facilityId", EntityOperator.EQUALS, facilityId) + ), EntityJoinOperator.AND); + // Debug.log("=====conditions for facility: " + ecl); tempWorkEfforts = delegator.findList("WorkEffort", ecl, null, UtilMisc.toList("estimatedStartDate"), null, false); } validWorkEfforts = WorkEffortWorker.removeDuplicateWorkEfforts(tempWorkEfforts); @@ -627,10 +627,10 @@ Calendar cal = UtilDateTime.toCalendar(startStamp, timeZone, locale); for (GenericValue workEffort : validWorkEfforts) { if (UtilValidate.isNotEmpty(workEffort.getString("tempExprId"))) { - // check if either the workeffort is public or the requested party is a member - if (UtilValidate.isNotEmpty(partyIdsToUse) && !workEffort.getString("scopeEnumId").equals("WES_PUBLIC") && !partyIdsToUse.contains(workEffort.getString("partyId"))) { - continue; - } + // check if either the workeffort is public or the requested party is a member + if (UtilValidate.isNotEmpty(partyIdsToUse) && !workEffort.getString("scopeEnumId").equals("WES_PUBLIC") && !partyIdsToUse.contains(workEffort.getString("partyId"))) { + continue; + } TemporalExpression tempExpr = TemporalExpressionWorker.getTemporalExpression(delegator, workEffort.getString("tempExprId")); Set<Date> occurrences = tempExpr.getRange(range, cal); for (Date occurrence : occurrences) { @@ -667,15 +667,15 @@ List<Map<String, Object>> curWorkEfforts = FastList.newInstance(); Map<String, Object> entry = FastMap.newInstance(); for (GenericValue workEffort : validWorkEfforts) { - Timestamp startDate = workEffort.getTimestamp("estimatedStartDate"); - if (workEffort.getTimestamp("actualStartDate") != null) { - startDate = workEffort.getTimestamp("actualStartDate"); - } - Timestamp endDate = workEffort.getTimestamp("estimatedCompletionDate"); - if (workEffort.getTimestamp("actualCompletionDate") != null){ - endDate = workEffort.getTimestamp("actualCompletionDate"); - } - if (endDate == null) endDate = startDate; + Timestamp startDate = workEffort.getTimestamp("estimatedStartDate"); + if (workEffort.getTimestamp("actualStartDate") != null) { + startDate = workEffort.getTimestamp("actualStartDate"); + } + Timestamp endDate = workEffort.getTimestamp("estimatedCompletionDate"); + if (workEffort.getTimestamp("actualCompletionDate") != null) { + endDate = workEffort.getTimestamp("actualCompletionDate"); + } + if (endDate == null) endDate = startDate; DateRange weRange = new DateRange(startDate, endDate); if (periodRange.intersectsRange(weRange)) { Map<String, Object> calEntry = FastMap.newInstance(); Modified: ofbiz/branches/executioncontext20090812/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/CreateUrlParam.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/CreateUrlParam.groovy?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/CreateUrlParam.groovy (original) +++ ofbiz/branches/executioncontext20090812/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/CreateUrlParam.groovy Mon Aug 17 15:42:56 2009 @@ -38,7 +38,7 @@ } if (urlParam) { - urlParam = "&" + urlParam; + urlParam = "&" + urlParam; } context.put("urlParam", urlParam); Modified: ofbiz/branches/executioncontext20090812/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy (original) +++ ofbiz/branches/executioncontext20090812/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy Mon Aug 17 15:42:56 2009 @@ -70,14 +70,14 @@ lastWeekCal = UtilDateTime.toCalendar(getTo, timeZone, locale); followingMonthDays = lastWeekCal.get(Calendar.DAY_OF_WEEK) - monthEndDay; if (followingMonthDays < 0) { - followingMonthDays += 7; + followingMonthDays += 7; } numDays += followingMonthDays; serviceCtx = UtilMisc.toMap("userLogin", userLogin, "start", getFrom, "numPeriods", new Integer(numDays), "periodType", new Integer(Calendar.DATE)); serviceCtx.putAll(UtilMisc.toMap("partyId", partyId, "facilityId", facilityId, "fixedAssetId", fixedAssetId, "workEffortTypeId", workEffortTypeId, "locale", locale, "timeZone", timeZone)); if (entityExprList) { - serviceCtx.putAll(["entityExprList" : entityExprList]); + serviceCtx.putAll(["entityExprList" : entityExprList]); } result = dispatcher.runSync("getWorkEffortEventsByPeriod", serviceCtx); Modified: ofbiz/branches/executioncontext20090812/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy (original) +++ ofbiz/branches/executioncontext20090812/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy Mon Aug 17 15:42:56 2009 @@ -35,7 +35,7 @@ entityExprList = (List) context.get("entityExprList"); filterOutCanceledEvents = parameters.filterOutCanceledEvents; if (!filterOutCanceledEvents) { - filterOutCanceledEvents = Boolean.FALSE; + filterOutCanceledEvents = Boolean.FALSE; } Timestamp start = null; @@ -56,10 +56,10 @@ Timestamp end = UtilDateTime.getDayStart(start, 6, timeZone, locale); Map serviceCtx = UtilMisc.toMap("userLogin", userLogin,"start",start,"numPeriods",new Integer(7), - "periodType",new Integer(Calendar.DATE)); + "periodType",new Integer(Calendar.DATE)); serviceCtx.putAll(UtilMisc.toMap("partyId", partyId, "facilityId", facilityId, - "fixedAssetId", fixedAssetId, "workEffortTypeId", workEffortTypeId, - "locale", locale, "timeZone", timeZone)); + "fixedAssetId", fixedAssetId, "workEffortTypeId", workEffortTypeId, + "locale", locale, "timeZone", timeZone)); if (entityExprList) { serviceCtx.putAll(["entityExprList" : entityExprList]); } Modified: ofbiz/branches/executioncontext20090812/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml Mon Aug 17 15:42:56 2009 @@ -21,6 +21,7 @@ <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> <include location="component://common/webcommon/WEB-INF/common-controller.xml"/> + <include location="component://commonext/webapp/WEB-INF/controller.xml"/> <include location="component://workeffort/webapp/workeffort/WEB-INF/icalendar-controller.xml"/> <description>Work Manager Module Site Configuration File</description> <owner>Copyright 2001-2009 The Apache Software Foundation</owner> Modified: ofbiz/branches/executioncontext20090812/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl (original) +++ ofbiz/branches/executioncontext20090812/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl Mon Aug 17 15:42:56 2009 @@ -33,8 +33,8 @@ <#list workEfforts as calendarEntry> <#assign workEffort = calendarEntry.workEffort> <tr<#if alt_row> class="alternate-row"</#if>> - <td>${workEffort.estimatedStartDate}</td> - <td>${workEffort.estimatedStartDate}</td> + <td><#if workEffort.actualStartDate?exists>${workEffort.actualStartDate}<#else>${workEffort.estimatedStartDate}</#if></td> + <td><#if workEffort.actualCompletionDate?exists>${workEffort.actualCompletionDate}<#else>${workEffort.estimatedCompletionDate}</#if></td> <td>${workEffort.getRelatedOne("WorkEffortType").get("description",locale)}</td> <td class="button-col"><a href="<@ofbizUrl>EditWorkEffort?workEffortId=${workEffort.workEffortId}${addlParam?if_exists}</@ofbizUrl>">${workEffort.workEffortName}</a></td> </tr> Modified: ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/component/ComponentConfig.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/component/ComponentConfig.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/component/ComponentConfig.java (original) +++ ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/component/ComponentConfig.java Mon Aug 17 15:42:56 2009 @@ -86,12 +86,12 @@ } public static Boolean componentExists(String componentName) { - ComponentConfig componentConfig = componentConfigs.get(componentName); - if (componentConfig == null) { - return Boolean.FALSE; - } else { - return Boolean.TRUE; - } + ComponentConfig componentConfig = componentConfigs.get(componentName); + if (componentConfig == null) { + return Boolean.FALSE; + } else { + return Boolean.TRUE; + } } public static Collection<ComponentConfig> getAllComponents() { Modified: ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/StringUtil.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/StringUtil.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/StringUtil.java (original) +++ ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/StringUtil.java Mon Aug 17 15:42:56 2009 @@ -418,11 +418,11 @@ private static char[] hexChar = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; public static int convertChar(char c) { - if ( '0' <= c && c <= '9' ) { + if ('0' <= c && c <= '9') { return c - '0' ; - } else if ( 'a' <= c && c <= 'f' ) { + } else if ('a' <= c && c <= 'f') { return c - 'a' + 0xa ; - } else if ( 'A' <= c && c <= 'F' ) { + } else if ('A' <= c && c <= 'F') { return c - 'A' + 0xa ; } else { throw new IllegalArgumentException("Invalid hex character: [" + c + "]"); Modified: ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilDateTime.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilDateTime.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilDateTime.java (original) +++ ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilDateTime.java Mon Aug 17 15:42:56 2009 @@ -851,7 +851,7 @@ } public static Timestamp getWeekEnd(Timestamp stamp, TimeZone timeZone, Locale locale) { - Timestamp weekStart = getWeekStart(stamp, timeZone, locale); + Timestamp weekStart = getWeekStart(stamp, timeZone, locale); Calendar tempCal = toCalendar(weekStart, timeZone, locale); tempCal.add(Calendar.DAY_OF_MONTH, 6); return getDayEnd(new Timestamp(tempCal.getTimeInMillis()), timeZone, locale); Modified: ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilGenerics.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilGenerics.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilGenerics.java (original) +++ ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilGenerics.java Mon Aug 17 15:42:56 2009 @@ -142,7 +142,7 @@ throw new IllegalArgumentException("You must pass an even sized array to the toMap method"); } Map<K, V> map = FastMap.newInstance(); - for (int i = 0; i < data.length; ) { + for (int i = 0; i < data.length;) { Object key = data[i]; if (key != null && !(keyType.isInstance(key))) throw new IllegalArgumentException("Key(" + i + ") is not a " + keyType.getName() + ", was(" + key.getClass().getName() + ")"); i++; @@ -163,7 +163,7 @@ throw new IllegalArgumentException("You must pass an even sized array to the toMap method"); } Map<K, Object> map = FastMap.newInstance(); - for (int i = 0; i < data.length; ) { + for (int i = 0; i < data.length;) { Object key = data[i]; if (key != null && !(keyType.isInstance(key))) throw new IllegalArgumentException("Key(" + i + ") is not a " + keyType.getName() + ", was(" + key.getClass().getName() + ")"); i++; Modified: ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilHttp.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilHttp.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilHttp.java (original) +++ ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilHttp.java Mon Aug 17 15:42:56 2009 @@ -1179,7 +1179,7 @@ // collect the composite fields into a map Map<String, String> data = FastMap.newInstance(); - for (Enumeration names = request.getParameterNames(); names.hasMoreElements(); ) { + for (Enumeration names = request.getParameterNames(); names.hasMoreElements();) { String name = (String) names.nextElement(); if (!name.startsWith(prefix + COMPOSITE_DELIMITER)) continue; Modified: ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java (original) +++ ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java Mon Aug 17 15:42:56 2009 @@ -84,8 +84,8 @@ if (methodNameIndex < 0) methodNameIndex = javaFile.indexOf(" Map " + methodName + "(DispatchContext "); if (methodNameIndex < 0) methodNameIndex = javaFile.indexOf(" Map " + methodName + "(DispatchContext "); if (methodNameIndex < 0) methodNameIndex = javaFile.indexOf(" Map " + methodName + " (DispatchContext "); - if (methodNameIndex < 0) methodNameIndex = javaFile.indexOf(" Map " + methodName + "( DispatchContext "); - if (methodNameIndex < 0) methodNameIndex = javaFile.indexOf(" Map " + methodName + " ( DispatchContext "); + if (methodNameIndex < 0) methodNameIndex = javaFile.indexOf(" Map " + methodName + "(DispatchContext "); + if (methodNameIndex < 0) methodNameIndex = javaFile.indexOf(" Map " + methodName + " (DispatchContext "); // not found! if (methodNameIndex < 0) return -1; Modified: ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilMisc.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilMisc.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilMisc.java (original) +++ ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilMisc.java Mon Aug 17 15:42:56 2009 @@ -189,7 +189,7 @@ throw new IllegalArgumentException("You must pass an even sized array to the toMap method"); } Map<String, V> map = FastMap.newInstance(); - for (int i = 0; i < data.length; ) { + for (int i = 0; i < data.length;) { map.put((String) data[i++], (V) data[i++]); } return map; @@ -757,7 +757,7 @@ /** This is meant to be very quick to create and use for small sized maps, perfect for how we usually use UtilMisc.toMap */ @SuppressWarnings("serial") - protected static class SimpleMap<V> implements Map<String, V>, java.io.Serializable { + protected static class SimpleMap<V> implements Map<String, V>, java.io.Serializable { protected Map<String, V> realMapIfNeeded = null; String[] names; Modified: ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilValidate.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilValidate.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilValidate.java (original) +++ ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilValidate.java Mon Aug 17 15:42:56 2009 @@ -354,7 +354,7 @@ // if (isSignedInteger.arguments.length > 1) secondArg = isSignedInteger.arguments[1]; // skip leading + or - - // if ((s.charAt(0) == "-") ||(s.charAt(0) == "+") ) startPos = 1; + // if ((s.charAt(0) == "-") ||(s.charAt(0) == "+")) startPos = 1; // return(isInteger(s.substring(startPos, s.length), secondArg)) } @@ -387,7 +387,7 @@ } // return(isSignedInteger(s, secondArg) - // &&((isEmpty(s) && secondArg) ||(parseInt(s) > 0) ) ); + // &&((isEmpty(s) && secondArg) ||(parseInt(s) > 0))); } /** Returns true if string s is an integer >= 0. */ @@ -404,7 +404,7 @@ } // return(isSignedInteger(s, secondArg) - // &&((isEmpty(s) && secondArg) ||(parseInt(s) >= 0) ) ); + // &&((isEmpty(s) && secondArg) ||(parseInt(s) >= 0))); } /** Returns true if string s is an integer < 0. */ @@ -421,7 +421,7 @@ } // return(isSignedInteger(s, secondArg) - // &&((isEmpty(s) && secondArg) ||(parseInt(s) < 0) ) ); + // &&((isEmpty(s) && secondArg) ||(parseInt(s) < 0))); } /** Returns true if string s is an integer <= 0. */ @@ -438,7 +438,7 @@ } // return(isSignedInteger(s, secondArg) - // &&((isEmpty(s) && secondArg) ||(parseInt(s) <= 0) ) ); + // &&((isEmpty(s) && secondArg) ||(parseInt(s) <= 0))); } /** True if string s is an unsigned floating point(real) number. @@ -547,7 +547,7 @@ // int startPos = 0; // if (isSignedFloat.arguments.length > 1) secondArg = isSignedFloat.arguments[1]; // skip leading + or - - // if ((s.charAt(0) == "-") ||(s.charAt(0) == "+") ) startPos = 1; + // if ((s.charAt(0) == "-") ||(s.charAt(0) == "+")) startPos = 1; // return(isFloat(s.substring(startPos, s.length), secondArg)) } Modified: ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilXml.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilXml.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilXml.java (original) +++ ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/UtilXml.java Mon Aug 17 15:42:56 2009 @@ -1000,7 +1000,7 @@ + String.valueOf(exception.getLineNumber()) + ". Error message: " + exceptionMessage, module - ); + ); } } @@ -1012,7 +1012,7 @@ + String.valueOf(exception.getLineNumber()) + ". Error message: " + exception.getMessage(), module - ); + ); } } @@ -1024,7 +1024,7 @@ + String.valueOf(exception.getLineNumber()) + ". Error message: " + exception.getMessage(), module - ); + ); } } } Modified: ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java (original) +++ ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java Mon Aug 17 15:42:56 2009 @@ -444,7 +444,7 @@ } if (varNames != null) { for (String varName: varNames) { - //freemarker.ext.beans.StringModel varObj = (freemarker.ext.beans.StringModel ) varNameIter.next(); + //freemarker.ext.beans.StringModel varObj = (freemarker.ext.beans.StringModel) varNameIter.next(); //Object varObj = varNameIter.next(); //String varName = varObj.toString(); templateRoot.put(varName, FreeMarkerWorker.getWrappedObject(varName, env)); @@ -453,7 +453,7 @@ return templateRoot; } - public static void saveContextValues(Map<String, Object> context, String [] saveKeyNames, Map<String, Object> saveMap ) { + public static void saveContextValues(Map<String, Object> context, String [] saveKeyNames, Map<String, Object> saveMap) { //Map saveMap = new HashMap(); for (String key: saveKeyNames) { Object o = context.get(key); @@ -479,7 +479,7 @@ } - public static void reloadValues(Map<String, Object> context, Map<String, Object> saveValues, Environment env ) { + public static void reloadValues(Map<String, Object> context, Map<String, Object> saveValues, Environment env) { for (Map.Entry<String, Object> entry: saveValues.entrySet()) { String key = entry.getKey(); Object o = entry.getValue(); @@ -498,7 +498,7 @@ } } - public static void removeValues(Map<String, ?> context, String... removeKeyNames ) { + public static void removeValues(Map<String, ?> context, String... removeKeyNames) { for (String key: removeKeyNames) { context.remove(key); } Modified: ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/template/XslTransform.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/template/XslTransform.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/template/XslTransform.java (original) +++ ofbiz/branches/executioncontext20090812/framework/base/src/org/ofbiz/base/util/template/XslTransform.java Mon Aug 17 15:42:56 2009 @@ -69,7 +69,7 @@ translet = xslTemplatesCache.get(templateName); } - if (translet == null ) { + if (translet == null) { String templateUrl = (String)context.get("templateUrl"); String templateString = (String)context.get("templateString"); Document templateDocument = (Document)context.get("templateDocument"); @@ -79,7 +79,7 @@ xslTemplatesCache.put(templateName, translet); } } - if (translet != null ) { + if (translet != null) { Transformer transformer = translet.newTransformer(); if (params != null) { for (Map.Entry<String, Object> entry: params.entrySet()) { Modified: ofbiz/branches/executioncontext20090812/framework/bi/webapp/bi/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/bi/webapp/bi/WEB-INF/controller.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/bi/webapp/bi/WEB-INF/controller.xml (original) +++ ofbiz/branches/executioncontext20090812/framework/bi/webapp/bi/WEB-INF/controller.xml Mon Aug 17 15:42:56 2009 @@ -22,6 +22,7 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> <include location="component://common/webcommon/WEB-INF/common-controller.xml"/> + <include location="component://commonext/webapp/WEB-INF/controller.xml"/> <description>Business Intelligence Component Site Configuration File</description> <!-- Request Mappings --> Modified: ofbiz/branches/executioncontext20090812/framework/bi/webapp/bi/main.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/bi/webapp/bi/main.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/bi/webapp/bi/main.ftl (original) +++ ofbiz/branches/executioncontext20090812/framework/bi/webapp/bi/main.ftl Mon Aug 17 15:42:56 2009 @@ -1,38 +1,38 @@ <h1>${uiLabelMap.BusinessIntelligenceIntegratedFramework}</h1> <p> - ${uiLabelMap.BusinessIntelligenceNote1} - ${uiLabelMap.BusinessIntelligenceNote2} - ${uiLabelMap.BusinessIntelligenceNote3} - ${uiLabelMap.BusinessIntelligenceNote4} - ${uiLabelMap.BusinessIntelligenceNote5} - ${uiLabelMap.BusinessIntelligenceNote6} - ${uiLabelMap.BusinessIntelligenceNote7} - ${uiLabelMap.BusinessIntelligenceNote8} - ${uiLabelMap.BusinessIntelligenceNote9} - ${uiLabelMap.BusinessIntelligenceNote10} - ${uiLabelMap.BusinessIntelligenceNote11} - ${uiLabelMap.BusinessIntelligenceNote12} + ${uiLabelMap.BusinessIntelligenceNote1} + ${uiLabelMap.BusinessIntelligenceNote2} + ${uiLabelMap.BusinessIntelligenceNote3} + ${uiLabelMap.BusinessIntelligenceNote4} + ${uiLabelMap.BusinessIntelligenceNote5} + ${uiLabelMap.BusinessIntelligenceNote6} + ${uiLabelMap.BusinessIntelligenceNote7} + ${uiLabelMap.BusinessIntelligenceNote8} + ${uiLabelMap.BusinessIntelligenceNote9} + ${uiLabelMap.BusinessIntelligenceNote10} + ${uiLabelMap.BusinessIntelligenceNote11} + ${uiLabelMap.BusinessIntelligenceNote12} </p> <h2>${uiLabelMap.BusinessIntelligenceCurrentStatus}</h2> <p> - ${uiLabelMap.BusinessIntelligenceNote13} - ${uiLabelMap.BusinessIntelligenceNote14} - ${uiLabelMap.BusinessIntelligenceNote15} - ${uiLabelMap.BusinessIntelligenceNote16} - ${uiLabelMap.BusinessIntelligenceNote17} - ${uiLabelMap.BusinessIntelligenceNote18} + ${uiLabelMap.BusinessIntelligenceNote13} + ${uiLabelMap.BusinessIntelligenceNote14} + ${uiLabelMap.BusinessIntelligenceNote15} + ${uiLabelMap.BusinessIntelligenceNote16} + ${uiLabelMap.BusinessIntelligenceNote17} + ${uiLabelMap.BusinessIntelligenceNote18} </p> <h2>${uiLabelMap.BusinessIntelligenceQuickStartGuide}</h2> <p> - ${uiLabelMap.BusinessIntelligenceNote19} - ${uiLabelMap.BusinessIntelligenceNote20} - ${uiLabelMap.BusinessIntelligenceNote21} - ${uiLabelMap.BusinessIntelligenceNote22} - ${uiLabelMap.BusinessIntelligenceNote23} - ${uiLabelMap.BusinessIntelligenceNote24} - ${uiLabelMap.BusinessIntelligenceNote25} - ${uiLabelMap.BusinessIntelligenceNote26} - ${uiLabelMap.BusinessIntelligenceNote27} - ${uiLabelMap.BusinessIntelligenceNote28} + ${uiLabelMap.BusinessIntelligenceNote19} + ${uiLabelMap.BusinessIntelligenceNote20} + ${uiLabelMap.BusinessIntelligenceNote21} + ${uiLabelMap.BusinessIntelligenceNote22} + ${uiLabelMap.BusinessIntelligenceNote23} + ${uiLabelMap.BusinessIntelligenceNote24} + ${uiLabelMap.BusinessIntelligenceNote25} + ${uiLabelMap.BusinessIntelligenceNote26} + ${uiLabelMap.BusinessIntelligenceNote27} + ${uiLabelMap.BusinessIntelligenceNote28} </p> Modified: ofbiz/branches/executioncontext20090812/framework/bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl (original) +++ ofbiz/branches/executioncontext20090812/framework/bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl Mon Aug 17 15:42:56 2009 @@ -19,7 +19,7 @@ <table cellspacing="0" class="basic-table hover-bar"> <tr class="header-row"> - <#assign firstRecord = records[0]?if_exists/> + <#assign firstRecord = records[0]?if_exists/> <#list columnNames as columnName> <td<#if firstRecord?exists && firstRecord[columnName]?default("")?is_number> class="align-text"</#if>> ${columnName} Modified: ofbiz/branches/executioncontext20090812/framework/bi/widget/BiScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/bi/widget/BiScreens.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/bi/widget/BiScreens.xml (original) +++ ofbiz/branches/executioncontext20090812/framework/bi/widget/BiScreens.xml Mon Aug 17 15:42:56 2009 @@ -142,7 +142,7 @@ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <container style="screenlet"> - <container> + <container> <section> <widgets> <platform-specific> @@ -152,17 +152,17 @@ </section> </container> <container style="screenlet-body"> - <link target="quickInitDataWarehouse" text="${uiLabelMap.BusinessIntelligenceQuickInitDataWarehouse}" style="buttontext"> - <parameter param-name="fromDate"/> - <parameter param-name="thruDate"/> - </link> - <label style="note"> (${uiLabelMap.CommonFromDate} ${fromDate} ${uiLabelMap.CommonThruDate} ${thruDate})</label> - <label style="note"> - ${uiLabelMap.BusinessIntelligenceNote29} - ${uiLabelMap.BusinessIntelligenceNote30} - ${uiLabelMap.BusinessIntelligenceNote31} - </label> - </container> + <link target="quickInitDataWarehouse" text="${uiLabelMap.BusinessIntelligenceQuickInitDataWarehouse}" style="buttontext"> + <parameter param-name="fromDate"/> + <parameter param-name="thruDate"/> + </link> + <label style="note"> (${uiLabelMap.CommonFromDate} ${fromDate} ${uiLabelMap.CommonThruDate} ${thruDate})</label> + <label style="note"> + ${uiLabelMap.BusinessIntelligenceNote29} + ${uiLabelMap.BusinessIntelligenceNote30} + ${uiLabelMap.BusinessIntelligenceNote31} + </label> + </container> </container> </decorator-section> </decorator-screen> Modified: ofbiz/branches/executioncontext20090812/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java (original) +++ ofbiz/branches/executioncontext20090812/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java Mon Aug 17 15:42:56 2009 @@ -434,7 +434,7 @@ Manager manager = null; try { manager = (Manager)Class.forName(mgrClassName).newInstance(); - } catch(Exception exc) { + } catch (Exception exc) { throw new ContainerException("Cluster configuration requires a valid manager-class property: " + exc.getMessage()); } //cluster.setManagerClassName(mgrClassName); @@ -528,7 +528,7 @@ String mgrClassName = ContainerConfig.getPropertyValue(clusterProp, "manager-class", "org.apache.catalina.ha.session.DeltaManager"); try { sessionMgr = (Manager)Class.forName(mgrClassName).newInstance(); - } catch(Exception exc) { + } catch (Exception exc) { throw new ContainerException("Cluster configuration requires a valid manager-class property: " + exc.getMessage()); } } else { Modified: ofbiz/branches/executioncontext20090812/framework/common/config/CommonEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/common/config/CommonEntityLabels.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/common/config/CommonEntityLabels.xml (original) +++ ofbiz/branches/executioncontext20090812/framework/common/config/CommonEntityLabels.xml Mon Aug 17 15:42:56 2009 @@ -3411,7 +3411,6 @@ <value xml:lang="ro">Cote D'ivoire</value> <value xml:lang="ru">Ðод-д'ÐвÑаÑ</value> <value xml:lang="th">à¹à¸à¹à¸ à¹à¸à¸§à¸à¸£à¸µà¹ </value> - <value xml:lang="zh">Cote D'ivoire</value> <value xml:lang="zh">ç§ç¹è¿ªç¦</value> </property> <property key="Geo.geoName.CMR"> Modified: ofbiz/branches/executioncontext20090812/framework/common/data/CommonTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/common/data/CommonTypeData.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/common/data/CommonTypeData.xml (original) +++ ofbiz/branches/executioncontext20090812/framework/common/data/CommonTypeData.xml Mon Aug 17 15:42:56 2009 @@ -105,6 +105,7 @@ <!-- Visual Themes seed data --> <EnumerationType description="Visual Theme Resource Type (stylesheet, javascript file, etc)" enumTypeId="VT_RES_TYPE" hasTable="N"/> + <Enumeration enumId="VT_NAME" description="Visual Theme name" enumTypeId="VT_RES_TYPE" sequenceId="00"/> <Enumeration enumId="VT_STYLESHEET" description="Style Sheet URL" enumTypeId="VT_RES_TYPE" sequenceId="01"/> <Enumeration enumId="VT_RTL_STYLESHEET" description="Right-to-Left (RTL) Style Sheet URL" enumTypeId="VT_RES_TYPE" sequenceId="02"/> <Enumeration enumId="VT_SHORTCUT_ICON" description="Shortcut Icon URL" enumTypeId="VT_RES_TYPE" sequenceId="03"/> @@ -117,8 +118,7 @@ <Enumeration enumId="VT_NAV_TMPLT_LOC" description="Main Navigation Template Location" enumTypeId="VT_RES_TYPE" sequenceId="10"/> <Enumeration enumId="VT_MSG_TMPLT_LOC" description="Main Messages Template Location" enumTypeId="VT_RES_TYPE" sequenceId="11"/> <Enumeration enumId="VT_SCREENSHOT" description="Theme Preview Screenshot" enumTypeId="VT_RES_TYPE" sequenceId="12"/> - <Enumeration enumId="VT_HELP_TEMPL" description="Help screen template" enumTypeId="VT_RES_TYPE" sequenceId="13"/> - + <VisualThemeSet visualThemeSetId="BACKOFFICE" description="Themes to be used for backoffice applications"/> <VisualThemeSet visualThemeSetId="ECOMMERCE" description="Themes to be used for ECommerce applications"/> Modified: ofbiz/branches/executioncontext20090812/framework/common/src/org/ofbiz/common/Captcha.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/framework/common/src/org/ofbiz/common/Captcha.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/framework/common/src/org/ofbiz/common/Captcha.java (original) +++ ofbiz/branches/executioncontext20090812/framework/common/src/org/ofbiz/common/Captcha.java Mon Aug 17 15:42:56 2009 @@ -157,7 +157,7 @@ CAPTCHA_FILE_NAME = UtilDateTime.nowAsString().concat(".jpg"); request.setAttribute("captchaFileName", URL_FILE_PATH + CAPTCHA_FILE_NAME); request.setAttribute("ID_KEY", ID_KEY); - ImageIO.write(image, "jpg", new File( CAPTCHA_FILE_PATH + CAPTCHA_FILE_NAME)); + ImageIO.write(image, "jpg", new File(CAPTCHA_FILE_PATH + CAPTCHA_FILE_NAME)); } catch (IOException e) { return; } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |