svn commit: r1370126 [4/15] - in /ofbiz/branches/jackrabbit2012
Locked
svn commit: r1370126 [4/15] - in /ofbiz/branches/jackrabbit2012
 
|
Modified: ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/WEB-INF/controller.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/WEB-INF/controller.xml Tue Aug 7 06:25:59 2012 @@ -2377,15 +2377,21 @@ under the License. </request-map> <!-- ================ Product Review Requests ================= --> - <request-map uri="pendingReviews"> + <request-map uri="updateProductReview"> <security https="true" auth="true"/> - <response name="success" type="view" value="pendingReviews"/> + <event type="service" path="" invoke="updateProductReview"/> + <response name="success" type="request-redirect-noparam" value="FindReviews"/> + <response name="error" type="view" value="FindReviews"/> </request-map> - <request-map uri="updateProductReview"> + <request-map uri="FindReviews"> + <security https="true" auth="true"/> + <response name="success" type="view" value="FindReviews"/> + </request-map> + <request-map uri="updateProductReviewStatus"> <security https="true" auth="true"/> - <event type="service-multi" path="" invoke="updateProductReview"/> - <response name="success" type="view" value="pendingReviews"/> - <response name="error" type="view" value="pendingReviews"/> + <event type="service" path="" invoke="setProductReviewStatus"/> + <response name="success" type="view" value="FindReviews"/> + <response name="error" type="view" value="FindReviews"/> </request-map> <!-- ================ Supplier Product Requests ================= --> @@ -3133,7 +3139,6 @@ under the License. <view-map name="ListFeaturePrice" type="screen" page="component://product/widget/catalog/FeatureScreens.xml#ListFeaturePrice"/> <view-map name="CreateFeature" type="screen" page="component://product/widget/catalog/FeatureScreens.xml#CreateFeature"/> - <view-map name="FindProdCatalog" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#FindProdCatalog"/> <view-map name="EditProdCatalog" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalog"/> <view-map name="EditProdCatalogCategories" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalogCategories"/> <view-map name="EditProdCatalogStores" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalogStores"/> @@ -3174,7 +3179,7 @@ under the License. <view-map name="EditVendorProduct" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditVendorProduct"/> <view-map name="EditKeywordThesaurus" type="screen" page="component://product/widget/catalog/ThesaurusScreens.xml#EditKeywordThesaurus"/> - <view-map name="pendingReviews" type="screen" page="component://product/widget/catalog/ReviewScreens.xml#pendingReviews"/> + <view-map name="FindReviews" type="screen" page="component://product/widget/catalog/ReviewScreens.xml#FindReviews"/> <view-map name="ViewProductOrder" type="screen" page="component://product/widget/catalog/ProductScreens.xml#ViewProductOrder"/> <view-map name="EditProductCommunicationEvents" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditProductCommunicationEvents"/> @@ -3243,8 +3248,6 @@ under the License. <view-map name="ListImageRecentlyApproved" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ListImageRecentlyApproved"/> <view-map name="ListPeopleApproved" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ListPeopleApproved"/> <view-map name="ListPeopleRejected" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ListPeopleRejected"/> - <view-map name="AutomaticResize" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#AutomaticResize"/> - <view-map name="ListAutomaticResize" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ListAutomaticResize"/> <view-map name="LookupImageFrame" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#LookupImageFrame"/> <view-map name="ImageResize" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageResize"/> <!-- end of view mappings --> Modified: ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/WEB-INF/web.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/WEB-INF/web.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/WEB-INF/web.xml Tue Aug 7 06:25:59 2012 @@ -35,11 +35,6 @@ under the License. <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description> </context-param> <context-param> - <param-name>serviceReaderUrls</param-name> - <param-value>/WEB-INF/services.xml</param-value> - <description>Configuration File(s) For The Service Dispatcher</description> - </context-param> - <context-param> <param-name>mainDecoratorLocation</param-name> <param-value>component://product/widget/catalog/CommonScreens.xml</param-value> <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description> Modified: ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/find/sidecatalogs.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/find/sidecatalogs.ftl?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/find/sidecatalogs.ftl (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/find/sidecatalogs.ftl Tue Aug 7 06:25:59 2012 @@ -16,7 +16,6 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<div><a href='<@ofbizUrl>FindProdCatalog</@ofbizUrl>' class='buttontext'>${uiLabelMap.ProductCatalogDetailList}</a></div> <div class="browsecategorylist"> <#assign sortList = Static["org.ofbiz.base.util.UtilMisc"].toList("prodCatalogCategoryTypeId", "sequenceNum", "productCategoryId")> <#list prodCatalogs as prodCatalog> Modified: ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/price/setPriceRulesCondEventJs.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/price/setPriceRulesCondEventJs.ftl?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/price/setPriceRulesCondEventJs.ftl (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/price/setPriceRulesCondEventJs.ftl Tue Aug 7 06:25:59 2012 @@ -23,9 +23,9 @@ jQuery(document).ready( function() { if (document.getElementById('EditProductPriceRulesCond_o_${i}')) { jQuery('#EditProductPriceRulesCond_condValueInput_o_${i}').hide(); jQuery('#EditProductPriceRulesCond_inputParamEnumId_o_${i}').change( function() { - getDependentDropdownValues('getAssociatedPriceRulesConds', 'inputParamEnumId', 'EditProductPriceRulesCond_inputParamEnumId_o_${i}', 'EditProductPriceRulesCond_condValue_o_${i}', 'productPriceRulesCondValues', 'condValue_o_${i}', 'description', '', '', '', '', 'EditProductPriceRulesCond_condValueInput_o_${i}'); + getDependentDropdownValues('getAssociatedPriceRulesConds', 'inputParamEnumId', 'EditProductPriceRulesCond_inputParamEnumId_o_${i}', 'EditProductPriceRulesCond_condValue_o_${i}', 'productPriceRulesCondValues', 'condValue_o_${i}', 'description', '${productPriceConds[i].condValue}', '', '', '', 'EditProductPriceRulesCond_condValueInput_o_${i}'); }); - getDependentDropdownValues('getAssociatedPriceRulesConds', 'inputParamEnumId', 'EditProductPriceRulesCond_inputParamEnumId_o_${i}', 'EditProductPriceRulesCond_condValue_o_${i}', 'productPriceRulesCondValues', 'condValue_o_${i}', 'description', '', '', '', '', 'EditProductPriceRulesCond_condValueInput_o_${i}'); + getDependentDropdownValues('getAssociatedPriceRulesConds', 'inputParamEnumId', 'EditProductPriceRulesCond_inputParamEnumId_o_${i}', 'EditProductPriceRulesCond_condValue_o_${i}', 'productPriceRulesCondValues', 'condValue_o_${i}', 'description', '${productPriceConds[i].condValue}', '', '', '', 'EditProductPriceRulesCond_condValueInput_o_${i}'); } </#list> </#if> Modified: ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl Tue Aug 7 06:25:59 2012 @@ -23,7 +23,14 @@ under the License. </div> <div class="screenlet-body"> <#list productPromoCodeEmails as productPromoCodeEmail> - <div><a href="<@ofbizUrl>deleteProductPromoCodeEmail?productPromoCodeId=${productPromoCodeEmail.productPromoCodeId}&emailAddress=${productPromoCodeEmail.emailAddress}&productPromoId=${productPromoId}</@ofbizUrl>" class="buttontext">X</a> ${productPromoCodeEmail.emailAddress}</div> + <div> + <form name="deleteProductPromoCodeEmail_${productPromoCodeEmail_index}" method="post" action="<@ofbizUrl>deleteProductPromoCodeEmail</@ofbizUrl>"> + <input type="hidden" name="productPromoCodeId" value="${productPromoCodeEmail.productPromoCodeId}"/> + <input type="hidden" name="emailAddress" value="${productPromoCodeEmail.emailAddress}"/> + <input type="hidden" name="productPromoId" value="${productPromoId}"/> + <a href='javascript:document.deleteProductPromoCodeEmail_${productPromoCodeEmail_index}.submit()' class='buttontext'>${uiLabelMap.CommonRemove}</a> ${productPromoCodeEmail.emailAddress} + </form> + </div> </#list> <div> <form method="post" action="<@ofbizUrl>createProductPromoCodeEmail</@ofbizUrl>" style="margin: 0;"> Modified: ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/reviews/pendingReviews.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/reviews/pendingReviews.ftl?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/reviews/pendingReviews.ftl (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/reviews/pendingReviews.ftl Tue Aug 7 06:25:59 2012 @@ -1,122 +0,0 @@ -<#-- -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. ---> -<script language="JavaScript" type="text/javascript"> - function changeReviewStatus(statusId) { - document.selectAllForm.statusId.value = statusId; - document.selectAllForm.submit(); - } -</script> -<div class="screenlet"> - <div class="screenlet-title-bar"> - <h3>${uiLabelMap.ProductReviewsPendingApproval}</h3> - </div> - <div class="screenlet-body"> - <#if !pendingReviews?has_content> - <h3>${uiLabelMap.ProductReviewsNoPendingApproval}</h3> - <#else> - <form method='post' action='<@ofbizUrl>updateProductReview</@ofbizUrl>' name="selectAllForm"> - <input type="hidden" name="_useRowSubmit" value="Y" /> - <input type="hidden" name="_checkGlobalScope" value="Y" /> - <input type="hidden" name="statusId" value="" /> - <div align="right"> - <input type="button" value="${uiLabelMap.CommonUpdate}" onclick="javascript:changeReviewStatus('PRR_PENDING')" /> - <input type="button" value="${uiLabelMap.ProductPendingReviewUpdateAndApprove}" onclick="javascript:changeReviewStatus('PRR_APPROVED')" /> - <input type="button" value="${uiLabelMap.CommonDelete}" onclick="javascript:changeReviewStatus('PRR_DELETED')" /> - </div> - <table cellspacing="0" class="basic-table"> - <tr class="header-row"> - <td><b>${uiLabelMap.ProductPendingReviewDate}</b></td> - <td><b>${uiLabelMap.ProductPendingReviewBy}</b></td> - <td><b>${uiLabelMap.CommonIsAnonymous}</b></td> - <td><b>${uiLabelMap.ProductProductId}</b></td> - <td><b>${uiLabelMap.ProductRating}</b></td> - <td><b>${uiLabelMap.CommonStatus}</b></td> - <td><b>${uiLabelMap.ProductReviews}</b></td> - <td align="right"> - <span class="label">${uiLabelMap.CommonAll}</span> - <input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this, 'review_tableRow_', 'selectAllForm');" /> - </td> - </tr> - <#assign rowCount = 0> - <#assign rowClass = "2"> - <#list pendingReviews as review> - <#if review.userLoginId?has_content> - <#assign postedUserLogin = review.getRelatedOne("UserLogin", false)> - <#if postedUserLogin.partyId?has_content> - <#assign party = postedUserLogin.getRelatedOne("Party", false)> - <#assign partyTypeId = party.get("partyTypeId")> - <#if partyTypeId == "PERSON"> - <#assign postedPerson = postedUserLogin.getRelatedOne("Person", false)> - <#else> - <#assign postedPerson = postedUserLogin.getRelatedOne("PartyGroup", false)> - </#if> - </#if> - </#if> - <tr id="review_tableRow_${rowCount}" valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> - <td> - <input type="hidden" name="productReviewId_o_${rowCount}" value="${review.productReviewId}" /> - ${review.postedDateTime?if_exists} - </td> - <td> - <#if review.userLoginId?has_content && postedPerson?has_content> - <td> - <#if postedPerson.firstName?has_content && postedPerson.lastName?has_content> - ${postedPerson.firstName} ${postedPerson.lastName} - <#else> - ${postedPerson.groupName} - </#if> - </td> - <#else> - <td></td> - </#if> - </td> - <td> - <select name='postedAnonymous_o_${rowCount}'> - <option value="${review.postedAnonymous?default("N")}">${review.postedAnonymous?default("N")}</option> - <option value="${review.postedAnonymous?default("N")}">----</option> - <option value="N">${uiLabelMap.CommonN}</option> - <option value="Y">${uiLabelMap.CommonY}</option> - </select> - </td> - <td>${review.getRelatedOne("Product", false).internalName?if_exists}<br /><a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${review.productId}</@ofbizUrl>">${review.productId}</a></td> - <td> - <input type="text" size='3' name="productRating_o_${rowCount}" value="${review.productRating?if_exists?string}" /> - </td> - <td>${review.getRelatedOne("StatusItem", false).get("description", locale)}</td> - <td> - <textarea name="productReview_o_${rowCount}" rows="5" cols="30" wrap="hard">${review.productReview?if_exists}</textarea> - </td> - <td align="right"> - <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'review_tableRow_${rowCount}');" /> - </td> - </tr> - <#assign rowCount = rowCount + 1> - <#-- toggle the row color --> - <#if rowClass == "2"> - <#assign rowClass = "1"> - <#else> - <#assign rowClass = "2"> - </#if> - </#list> - <input type="hidden" name="_rowCount" value="${rowCount}" /> - </table> - </form> - </#if> - </div> -</div> Modified: ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/WEB-INF/controller.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/WEB-INF/controller.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/WEB-INF/controller.xml Tue Aug 7 06:25:59 2012 @@ -149,35 +149,6 @@ under the License. <security https="true" auth="true"/> <response name="success" type="view" value="ViewFacilityInventoryByProductExport"/> </request-map> - <request-map uri="ViewFacilityInventoryHistoryReport"> - <security https="true" auth="true"/> - <response name="success" type="view" value="ViewFacilityInventoryHistoryReport"/> - </request-map> - <request-map uri="RenderInventoryReportHtml"> - <security https="true" auth="true"/> - <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/> - <response name="success" type="view" value="RenderInventoryReportHtml"/> - </request-map> - <request-map uri="RenderInventoryReportPDF"> - <security https="true" auth="true"/> - <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/> - <response name="success" type="view" value="RenderInventoryReportPDF"/> - </request-map> - <request-map uri="RenderInventoryReportExcel"> - <security https="true" auth="true"/> - <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/> - <response name="success" type="view" value="RenderInventoryReportExcel"/> - </request-map> - <request-map uri="RenderInventoryReportMSWord"> - <security https="true" auth="true"/> - <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/> - <response name="success" type="view" value="RenderInventoryReportMSWord"/> - </request-map> - <request-map uri="RenderInventoryReportPPT"> - <security https="true" auth="true"/> - <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/> - <response name="success" type="view" value="RenderInventoryReportPPT"/> - </request-map> <request-map uri="FindFacilityTransfers"> <security https="true" auth="true"/> @@ -1385,7 +1356,6 @@ under the License. <view-map name="ViewFacilityInventoryByProductSimple" type="screen" page="component://product/widget/facility/FacilityScreens.xml#ViewFacilityInventoryByProductSimple"/> <view-map name="ViewFacilityInventoryByProductReport" type="screenfop" page="component://product/widget/facility/FacilityScreens.xml#ViewFacilityInventoryByProductReport" content-type="application/pdf" encoding="none"/> <view-map name="ViewFacilityInventoryByProductExport" type="screenxml" page="component://product/widget/facility/FacilityScreens.xml#ViewFacilityInventoryByProductReport" content-type="text/xml"/> - <view-map name="ViewFacilityInventoryHistoryReport" type="screen" page="component://product/widget/facility/FacilityScreens.xml#ViewFacilityInventoryHistoryReport"/> <view-map name="EditFacilityGroups" type="screen" page="component://product/widget/facility/FacilityScreens.xml#EditFacilityGroups"/> <view-map name="EditFacilityParties" type="screen" page="component://product/widget/facility/FacilityScreens.xml#EditFacilityParties"/> <view-map name="ViewContactMechs" type="screen" page="component://product/widget/facility/FacilityScreens.xml#ViewContactMechs"/> @@ -1474,13 +1444,6 @@ under the License. <view-map name="EditShipmentGatewayConfig" page="component://product//widget/facility/ShipmentGatewayConfigScreens.xml#EditShipmentGatewayConfig" type="screen"/> <view-map name="FindShipmentGatewayConfigTypes" page="component://product//widget/facility/ShipmentGatewayConfigScreens.xml#FindShipmentGatewayConfigTypes" type="screen"/> <view-map name="EditShipmentGatewayConfigType" page="component://product//widget/facility/ShipmentGatewayConfigScreens.xml#EditShipmentGatewayConfigType" type="screen"/> - - <!-- Export Report --> - <view-map name="RenderInventoryReportHtml" type="birt" page="component://product/webapp/facility/inventory/report/InventoryReport.rptdesign" content-type="text/html"/> - <view-map name="RenderInventoryReportPDF" type="birt" page="component://product/webapp/facility/inventory/report/InventoryReport.rptdesign" content-type="application/pdf"/> - <view-map name="RenderInventoryReportExcel" type="birt" page="component://product/webapp/facility/inventory/report/InventoryReport.rptdesign" content-type="application/vnd.ms-excel"/> - <view-map name="RenderInventoryReportMSWord" type="birt" page="component://product/webapp/facility/inventory/report/InventoryReport.rptdesign" content-type="application/vnd.ms-word"/> - <view-map name="RenderInventoryReportPPT" type="birt" page="component://product/webapp/facility/inventory/report/InventoryReport.rptdesign" content-type="application/vnd.ms-powerpoint"/> - + <!-- end of view mappings --> </site-conf> Modified: ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/WEB-INF/web.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/WEB-INF/web.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/WEB-INF/web.xml Tue Aug 7 06:25:59 2012 @@ -44,11 +44,6 @@ under the License. <param-value>component://product/widget/facility/CommonScreens.xml</param-value> <description>The location of the CommonFacilityDecorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description> </context-param> - <context-param> - <param-name>serviceReaderUrls</param-name> - <param-value>/WEB-INF/services.xml</param-value> - <description>Configuration File(s) For The Service Dispatcher</description> - </context-param> <filter> <filter-name>ContextFilter</filter-name> Modified: ofbiz/branches/jackrabbit20120501/applications/product/widget/catalog/CatalogMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/widget/catalog/CatalogMenus.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/widget/catalog/CatalogMenus.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/widget/catalog/CatalogMenus.xml Tue Aug 7 06:25:59 2012 @@ -27,7 +27,7 @@ under the License. <menu-item name="pricerules" title="${uiLabelMap.ProductPriceRules}"><link target="FindProductPriceRules"/></menu-item> <menu-item name="store" title="${uiLabelMap.ProductStores}"><link target="FindProductStore"/></menu-item> <menu-item name="thesaurus" title="${uiLabelMap.ProductThesaurus}"><link target="editKeywordThesaurus"/></menu-item> - <menu-item name="reviews" title="${uiLabelMap.ProductReviews}"><link target="pendingReviews"/></menu-item> + <menu-item name="reviews" title="${uiLabelMap.ProductReviews}"><link target="FindReviews"/></menu-item> <menu-item name="configs" title="${uiLabelMap.ProductConfigItems}"><link target="FindProductConfigItems"/></menu-item> <menu-item name="Subscription" title="${uiLabelMap.ProductSubscriptions}"><link target="FindSubscription"/></menu-item> <menu-item name="shipping" title="${uiLabelMap.ProductShipping}"><link target="ListShipmentMethodTypes"/></menu-item> Modified: ofbiz/branches/jackrabbit20120501/applications/product/widget/catalog/PriceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/widget/catalog/PriceForms.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/widget/catalog/PriceForms.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/widget/catalog/PriceForms.xml Tue Aug 7 06:25:59 2012 @@ -94,11 +94,11 @@ </field> <field name="condValueInput" title="${uiLabelMap.ProductValue}" entry-name="condValue"><text size="10"/></field> <field name="condValue" title=" "> - <drop-down allow-empty="false"> - <list-options list-name="productPriceRulesCondValues" key-name="condValue"/> + <drop-down allow-empty="false" current="selected"> + <list-options list-name="productPriceRulesCondValues" key-name="condValue"/> </drop-down> </field> - <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit/></field> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit/></field> <field name="deleteLink" title=" " widget-style="buttontext" widget-area-style="align-text"> <hyperlink target="deleteProductPriceCond" description="${uiLabelMap.CommonRemove}"> <parameter param-name="productPriceRuleId" from-field="productPriceCond.productPriceRuleId"/> Modified: ofbiz/branches/jackrabbit20120501/applications/product/widget/catalog/ProdCatalogForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/widget/catalog/ProdCatalogForms.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/widget/catalog/ProdCatalogForms.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/widget/catalog/ProdCatalogForms.xml Tue Aug 7 06:25:59 2012 @@ -55,22 +55,6 @@ under the License. <field name="catalogName" sort-field="true"><display/></field> <field name="useQuickAdd" title="${uiLabelMap.ProductUseQuickAdd}" sort-field="true"><display/></field> </form> - <!-- form name="ListProdCatalog" list-name="listIt" target="" title="" type="list" paginate-target="FindProdCatalog" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2"> - <actions> - <set field="parameters.sortField" from-field="parameters.sortField" default-value="prodCatalogId"/> - <entity-and entity-name="ProdCatalog" use-cache="true" list="listIt"> - <order-by field-name="${parameters.sortField}"/> - </entity-and> - </actions> - <field name="prodCatalogId" title="${uiLabelMap.ProductCatalogNameId}" widget-style="buttontext" sort-field="true"> - <hyperlink also-hidden="false" description="${prodCatalogId}" target="EditProdCatalog"> - <parameter param-name="prodCatalogId"/> - </hyperlink> - </field> - <field name="catalogName" title="${uiLabelMap.ProductCatalogName}" sort-field="true"><display/></field> - <field name="useQuickAdd" title="${uiLabelMap.ProductUseQuickAdd}" sort-field="true"><display/></field> - </form--> <form name="EditProdCatalog" type="single" target="updateProdCatalog" title="" default-map-name="prodCatalog" header-row-style="header-row" default-table-style="basic-table" default-entity-name="ProdCatalog"> Modified: ofbiz/branches/jackrabbit20120501/applications/product/widget/catalog/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/widget/catalog/ProductForms.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/widget/catalog/ProductForms.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/widget/catalog/ProductForms.xml Tue Aug 7 06:25:59 2012 @@ -2166,6 +2166,7 @@ under the License. <field name="soldOrderQty" title="${uiLabelMap.ProductSoldQuantity}"><display/></field> <field name="fromDate" title="${uiLabelMap.ProductDealStartDate}"><display/></field> <field name="thruDate" title="${uiLabelMap.ProductDealEndDate}"><display/></field> + <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> <field name="editLink" use-when="${groovy: return reqOrderQty.compareTo(soldOrderQty)!= 0;}&&${groovy: return thruDate.compareTo(org.ofbiz.base.util.UtilDateTime.nowTimestamp()) == 1}" title=" " widget-style="buttontext"> <hyperlink target="EditProductGroupOrder" description="${uiLabelMap.CommonEdit}" also-hidden="false"> <parameter param-name="productId"/> @@ -2183,6 +2184,7 @@ under the License. <form name="CreateProductGroupOrder" type="single" target="createProductGroupOrder" title="" header-row-style="header-row" default-table-style="basic-table"> <field name="productId"><hidden/></field> + <field name="statusId"><hidden value="GO_CREATED"/></field> <field name="soldOrderQty"><hidden value="0"/></field> <field name="reqOrderQty" title="${uiLabelMap.ProductDealQuantity}*"><text/></field> <field name="fromDate" title="${uiLabelMap.ProductDealStartDate}*"><date-time/></field> @@ -2194,6 +2196,7 @@ under the License. header-row-style="header-row" default-table-style="basic-table"> <field name="groupOrderId"><hidden/></field> <field name="productId"><hidden/></field> + <field name="statusId"><hidden/></field> <field name="reqOrderQty" title="${uiLabelMap.ProductDealQuantity}*"><text/></field> <field name="fromDate" title="${uiLabelMap.ProductDealStartDate}*"><date-time/></field> <field name="thruDate" title="${uiLabelMap.ProductDealEndDate}*"><date-time/></field> Modified: ofbiz/branches/jackrabbit20120501/applications/product/widget/catalog/ReviewScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/widget/catalog/ReviewScreens.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/widget/catalog/ReviewScreens.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/widget/catalog/ReviewScreens.xml Tue Aug 7 06:25:59 2012 @@ -45,23 +45,24 @@ under the License. </widgets> </section> </screen> - <screen name="pendingReviews"> + + <screen name="FindReviews"> <section> <actions> - <set field="titleProperty" value="ProductReviewsPendingApproval"/> + <set field="titleProperty" value="ProductReviews"/> <set field="headerItem" value="reviews"/> - - <entity-condition entity-name="ProductReview" list="pendingReviews"> - <condition-expr field-name="statusId" value="PRR_PENDING"/> - <order-by field-name="+postedDateTime"/> - </entity-condition> </actions> <widgets> <decorator-screen name="CommonReviewDecorator"> <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://product/webapp/catalog/reviews/pendingReviews.ftl"/></html> - </platform-specific> + <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="search-options"> + <include-form name="FindReviews" location="component://product/widget/catalog/ReviewForms.xml"/> + </decorator-section> + <decorator-section name="search-results"> + <include-form name="ListReviews" location="component://product/widget/catalog/ReviewForms.xml"/> + </decorator-section> + </decorator-screen> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/branches/jackrabbit20120501/applications/product/widget/facility/FacilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/widget/facility/FacilityForms.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/widget/facility/FacilityForms.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/widget/facility/FacilityForms.xml Tue Aug 7 06:25:59 2012 @@ -853,35 +853,6 @@ under the License. <submit/> </field> </form> - - <form name="ViewFacilityInventoryHistoryReportForm" extends="FindFacilityInventoryByProduct" target="RenderInventoryReportHtml" target-window="_BLANK"> - <field name="facilityId"><hidden/></field> - <field name="productId"><hidden/></field> - <field name="internalName"><hidden/></field> - <field name="productTypeId"><hidden/></field> - <field name="searchInProductCategoryId"><hidden/></field> - <field name="productSupplierId"><hidden/></field> - <field name="statusId"><hidden/></field> - <field name="productsSoldThruTimestamp"><hidden/></field> - <field name="VIEW_SIZE"><hidden/></field> - <field name="monthsInPastLimit"><hidden/></field> - <field name="fromDateSellThrough"><hidden/></field> - <field name="thruDateSellThrough"><hidden/></field> - <field name="offsetQOHQty"><hidden/></field> - <field name="offsetATPQty"><hidden/></field> - <field name="lastIntMonth" title="Number of last month to sold out"><text size="15" default-value="0"></text></field> - <field name="contentType" action="document.ViewFacilityInventoryHistoryReportForm.action=this.value" event="onchange"> - <drop-down allow-empty="false" > - <option key="RenderInventoryReportHtml" description="HTML"/> - <option key="RenderInventoryReportPDF" description="PDF"/> - <!--option key="RenderInventoryReportExcel" description="MS-Excel"/> - <option key="RenderInventoryReportMSWord" description="MS-Word"/> - <option key="RenderInventoryReportPPT" description="MS-Powerpoint"/--> - </drop-down> - </field> - <field name="submitButton"><hidden/></field> - <field name="report" title="Export Report" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> <!--Facility Content--> <form name="AddFacilityContent" type="upload" focus-field-name="contentId" Modified: ofbiz/branches/jackrabbit20120501/applications/product/widget/facility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/widget/facility/FacilityScreens.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/widget/facility/FacilityScreens.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/widget/facility/FacilityScreens.xml Tue Aug 7 06:25:59 2012 @@ -1473,33 +1473,6 @@ under the License. </widgets> </section> </screen> - - <screen name="ViewFacilityInventoryHistoryReport"> - <section> - <actions> - <set field="headerItem" value="reports"/> - <set field="facilityId" from-field="parameters.facilityId"/> - <entity-one entity-name="Facility" value-field="facility" use-cache="true"/> - </actions> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <container> - <label style="h1" text="${uiLabelMap.ProductInventoryByProduct} ${uiLabelMap.CommonFor} ${facility.facilityName}"/> - </container> - <container> - <link target="ViewFacilityInventoryByProductReport?facilityId=${parameters.facilityId}" text="${uiLabelMap.CommonPrint}" style="buttontext"/> - <link target="ViewFacilityInventoryByProductExport?facilityId=${parameters.facilityId}" text="${uiLabelMap.CommonExport}" style="buttontext"/> - <link target="ViewFacilityInventoryHistoryReport?facilityId=${parameters.facilityId}" text="${uiLabelMap.FacilityInventoryHistoryReport}" style="buttontext"/> - </container> - <screenlet title="${uiLabelMap.FacilityInventoryHistoryReport}"> - <include-form name="ViewFacilityInventoryHistoryReportForm" location="component://product/widget/facility/FacilityForms.xml"/> - </screenlet> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> <screen name="EditFacilityContent"> <section> Modified: ofbiz/branches/jackrabbit20120501/applications/product/widget/facility/ReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/widget/facility/ReportScreens.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/widget/facility/ReportScreens.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/widget/facility/ReportScreens.xml Tue Aug 7 06:25:59 2012 @@ -56,7 +56,6 @@ under the License. <container> <link target="ViewFacilityInventoryByProductReport?${searchParameterString}" text="${uiLabelMap.CommonPrint}" style="buttontext"/> <link target="ViewFacilityInventoryByProductExport?${searchParameterString}" text="${uiLabelMap.CommonExport}" style="buttontext"/> - <link target="ViewFacilityInventoryHistoryReport?${searchParameterString}" text="${uiLabelMap.FacilityInventoryHistoryReport}" style="buttontext"/> </container> <screenlet title="${uiLabelMap.PageTitleFindFacilityInventoryItemsByProduct}"> <include-form name="FindFacilityInventoryByProduct" location="component://product/widget/facility/FacilityForms.xml"/> Modified: ofbiz/branches/jackrabbit20120501/applications/securityext/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/securityext/ofbiz-component.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/securityext/ofbiz-component.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/securityext/ofbiz-component.xml Tue Aug 7 06:25:59 2012 @@ -26,5 +26,4 @@ under the License. <classpath type="dir" location="config"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/UserDemoData.xml"/> <service-resource type="model" loader="main" location="servicedef/services.xml"/> - <test-suite loader="main" location="testdef/securitytests.xml"/> </ofbiz-component> Modified: ofbiz/branches/jackrabbit20120501/applications/securityext/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/securityext/servicedef/services.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/securityext/servicedef/services.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/securityext/servicedef/services.xml Tue Aug 7 06:25:59 2012 @@ -36,23 +36,4 @@ under the License. <attribute name="alias" type="String" mode="IN" optional="false"/> </service> - <!-- authorization dynamic access implementation API --> - <service name="dynamicAccessInterface" engine="interface"> - <description>Service interface for implementing Dynamic Access as a service</description> - <attribute name="userId" type="String" mode="IN" optional="false"/> - <attribute name="permission" type="String" mode="IN" optional="false"/> - <attribute name="accessString" type="String" mode="IN" optional="false"/> - <attribute name="permissionContext" type="Map" mode="IN" optional="true"/> - <attribute name="permissionGranted" type="Boolean" mode="OUT" optional="false"/> - </service> - - <!-- dynamic access test service --> - <service name="dynamicAccessTestService" engine="simple" auth="false" - location="component://securityext/testdef/da/DynamicAccessTest.xml" invoke="testDa"> - <implements service="dynamicAccessInterface"/> - </service> - <service name="dynamicAccessRecursiveTest" engine="simple" auth="false" - location="component://securityext/testdef/da/DynamicAccessTest.xml" invoke="testDaRecursion"> - <implements service="dynamicAccessInterface"/> - </service> </services> Modified: ofbiz/branches/jackrabbit20120501/applications/workeffort/webapp/workeffort/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/workeffort/webapp/workeffort/WEB-INF/web.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/workeffort/webapp/workeffort/WEB-INF/web.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/workeffort/webapp/workeffort/WEB-INF/web.xml Tue Aug 7 06:25:59 2012 @@ -35,11 +35,6 @@ under the License. <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description> </context-param> <context-param> - <param-name>serviceReaderUrls</param-name> - <param-value>/WEB-INF/services.xml</param-value> - <description>Configuration File(s) For The Service Dispatcher</description> - </context-param> - <context-param> <param-name>scriptLocationPath</param-name> <param-value>/WEB-INF/bsh</param-value> <description>BeanShell Script Location</description> Modified: ofbiz/branches/jackrabbit20120501/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/build.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/build.xml (original) +++ ofbiz/branches/jackrabbit20120501/build.xml Tue Aug 7 06:25:59 2012 @@ -27,7 +27,7 @@ under the License. <property name="memory.initial.param" value="-Xms128M"/> <property name="memory.max.param" value="-Xmx512M"/> <property name="pos.memory.max.param" value="-Xmx512M"/> - <property name="memory.maxpermsize.param" value="-XX:MaxPermSize=512m"/> + <property name="memory.maxpermsize.param" value="-XX:MaxPermSize=512M"/> <available file="applications/build.xml" property="applications.present"/> <available file="specialpurpose/build.xml" property="specialpurpose.present"/> @@ -188,7 +188,7 @@ under the License. <xmlproperty file="runtime/svninfo_tmp.xml"/> <echo message="Rev:${info.entry.commit(revision)}"/> <basename property="releasePath" file="${info.entry.url}"/> - <echo message=" - Release-revision : ${releasePath}-${info.entry.commit(revision)}" file="runtime/svninfo.ftl"/> + <echo message=" - Release-revision : ${releasePath}-r${info.entry.commit(revision)}" file="runtime/svninfo.ftl"/> <delete file="runtime/svninfo_tmp.xml"/> <echo message="Done!"/> </target> @@ -278,7 +278,6 @@ under the License. <fileset dir="${ofbiz.home.dir}/framework/base/lib/commons" includes="*.jar"/> <fileset dir="${ofbiz.home.dir}/framework/base/lib/j2eespecs" includes="*.jar"/> <fileset dir="${ofbiz.home.dir}/framework/base/lib/scripting" includes="*.jar"/> - <fileset dir="${ofbiz.home.dir}/framework/birt/lib" includes="*.jar"/> <fileset dir="${ofbiz.home.dir}/framework/catalina/lib" includes="*.jar"/> <fileset dir="${ofbiz.home.dir}/framework/entity/lib" includes="*.jar"/> <fileset dir="${ofbiz.home.dir}/framework/geronimo/lib" includes="*.jar"/> @@ -287,6 +286,7 @@ under the License. <fileset dir="${ofbiz.home.dir}/framework/testtools/lib" includes="*.jar"/> <fileset dir="${ofbiz.home.dir}/framework/webapp/lib" includes="*.jar"/> <fileset dir="${ofbiz.home.dir}/framework/webapp/build/lib" includes="*.jar"/> + <fileset dir="${ofbiz.home.dir}/specialpurpose/birt/lib" includes="*.jar"/> <fileset dir="${ofbiz.home.dir}/specialpurpose/ebaystore/lib" includes="*.jar"/> <fileset dir="${ofbiz.home.dir}/specialpurpose/googlecheckout/lib" includes="*.jar"/> <fileset dir="${ofbiz.home.dir}/specialpurpose/ldap/lib" includes="*.jar"/> @@ -376,7 +376,7 @@ under the License. description="Start OFBiz"> <java jar="ofbiz.jar" fork="true"> <jvmarg value="${memory.initial.param}"/> - <jvmarg value="${pos.memory.max.param}"/> + <jvmarg value="${memory.max.param}"/> <jvmarg value="${memory.maxpermsize.param}"/> </java> </target> @@ -384,7 +384,7 @@ under the License. description="Start OFBiz as a separate process"> <java jar="ofbiz.jar" fork="true" spawn="true"> <jvmarg value="${memory.initial.param}"/> - <jvmarg value="${pos.memory.max.param}"/> + <jvmarg value="${memory.max.param}"/> <jvmarg value="${memory.maxpermsize.param}"/> </java> </target> @@ -856,7 +856,7 @@ under the License. <delete file="runtime/tmp/tmpUserLogin.xml"/> </target> <target name="create-admin-user-login" - description="Prompt for a user name, then create a user login with admin privileges and a temporary password equal to 'ofbiz'. After a successful login the user will be prompted for a new password."> + description="Prompt for a user name, then create a user login with admin privileges and a temporary password equal to 'ofbiz'. After a successful login the user will be prompted for a new password. Note: this uses load-admin-user-login target"> <input addproperty="userLoginId" message="Enter user name (log in with the temporary password 'ofbiz'):"/> <antcall target="load-admin-user-login"/> </target> @@ -1049,7 +1049,7 @@ under the License. </exec> <xmlproperty file="runtime/svninfo_tmp.xml"/> - <property name="sonar.sources" value="framework/appserver/src, framework/base/src, framework/bi/src, framework/birt/src, + <property name="sonar.sources" value="framework/appserver/src, framework/base/src, framework/bi/src, framework/catalina/src, framework/common/src, framework/datafile/src, framework/entity/src, framework/entityext/src, framework/example/src, framework/geronimo/src, framework/jetty/src, framework/minilang/src, framework/security/src, framework/service/src, framework/sql/src, framework/start/src, @@ -1059,7 +1059,7 @@ under the License. applications/product/src, applications/securityext/src, applications/workeffort/src, specialpurpose/assetmaint/src, specialpurpose/ebay/src, specialpurpose/ebaystore/src, specialpurpose/ecommerce/src, specialpurpose/googlebase/src, specialpurpose/googlecheckout/src, specialpurpose/hhfacility/src, specialpurpose/oagis/src, specialpurpose/pos/src, - specialpurpose/scrum/src" /> + specialpurpose/scrum/src, specialpurpose/birt/src" /> <property name="sonar.tests" value="framework/base/src/org/ofbiz/base/test, framework/entity/src/org/ofbiz/entity/test, framework/service/src/org/ofbiz/service/test, framework/sql/src/org/ofbiz/sql/test, applications/accounting/src/org/ofbiz/accounting/test, applications/content/src/org/ofbiz/content/test, Modified: ofbiz/branches/jackrabbit20120501/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java (original) +++ ofbiz/branches/jackrabbit20120501/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java Tue Aug 7 06:25:59 2012 @@ -71,11 +71,11 @@ public class GenerateContainer implement private boolean isGeronimo = false; private String geronimoHome = null; + private String name; - /** - * @see org.ofbiz.base.container.Container#init(java.lang.String[], java.lang.String) - */ - public void init(String[] args, String configFile) { + @Override + public void init(String[] args, String name, String configFile) { + this.name = name; ofbizHome = System.getProperty("ofbiz.home"); this.configFile = configFile; this.args = args; @@ -94,7 +94,6 @@ public class GenerateContainer implement */ public boolean start() throws ContainerException { generateFiles(); - System.exit(1); return true; } @@ -107,6 +106,10 @@ public class GenerateContainer implement public void stop() throws ContainerException { } + public String getName() { + return name; + } + private void generateFiles() throws ContainerException { if (isGeronimo) { if (geronimoHome == null) { Modified: ofbiz/branches/jackrabbit20120501/framework/base/config/ofbiz-containers.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/base/config/ofbiz-containers.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/base/config/ofbiz-containers.xml (original) +++ ofbiz/branches/jackrabbit20120501/framework/base/config/ofbiz-containers.xml Tue Aug 7 06:25:59 2012 @@ -20,244 +20,19 @@ under the License. <ofbiz-containers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-containers.xsd"> - <!-- load the ofbiz component container (always first) --> - <container name="component-container" class="org.ofbiz.base.container.ComponentContainer"/> - - <!-- load the cached classloader container (always second) --> - <container name="classloader-container" class="org.ofbiz.base.container.ClassLoaderContainer"/> - - <!-- load JNDI/JOTM; this is no longer needed, leaving this in for now just in case someone wants to drop in JOTM from the specialized directory - <container name="jotm-container" class="org.ofbiz.jotm.container.JotmContainer"> - <property name="jndi-config" value="iiop.properties"/> - </container> - --> - - <!-- load the naming (JNDI) server --> - <container name="naming-container" class="org.ofbiz.base.container.NamingServiceContainer"> - <property name="host" value="0.0.0.0"/> - <property name="port" value="1099"/> - </container> - <!-- RMI Service Dispatcher --> - <container name="rmi-dispatcher" class="org.ofbiz.service.rmi.RmiServiceContainer"> - <property name="bound-name" value="RMIDispatcher"/> - <property name="bound-host" value="127.0.0.1"/> - <property name="bound-port" value="1099"/> - <property name="delegator-name" value="default"/> - <property name="client-factory" value="org.ofbiz.service.rmi.socket.ssl.SSLClientSocketFactory"/> - <property name="server-factory" value="org.ofbiz.service.rmi.socket.ssl.SSLServerSocketFactory"/> - <property name="ssl-keystore" value="framework/base/config/ofbizrmi.jks"/> - <property name="ssl-keystore-type" value="JKS"/> - <property name="ssl-keystore-pass" value="changeit"/> - <property name="ssl-keystore-alias" value="rmissl"/> - <property name="ssl-client-auth" value="false"/> - </container> - - - <!-- Load embedded Jackrabbit content repository. Since this container depends - upon JNDI, it must be started after the naming-container container.--> - <container name="jcr-container" class="org.ofbiz.jcr.loader.JCRContainer"> - <property name="configFilePath" value="framework/jcr/config/jcr-config.xml"/> - <property name="removeOnShutdown" value="false"/> - </container> + <!-- load the ofbiz component container (always first) --> + <container name="component-container" loaders="main,rmi,pos,install" class="org.ofbiz.base.container.ComponentContainer"/> - <!-- JavaMail Listener Container - Triggers MCA Rules --> - <!-- if delete-mail is set to true, will delete messages after fetching them. otherwise, will try to mark them as seen - mail.store.protocol supports both imap and pop3, but pop3 will not be able to mark messages as seen, so you would need to delete them--> - <!-- To use the mail listerner just uncomment and go... - <container name="javamail-container" class="org.ofbiz.service.mail.JavaMailContainer"> - <property name="delegator-name" value="default"/> - <property name="dispatcher-name" value="JavaMailDispatcher"/> - <property name="run-as-user" value="system"/> - <property name="poll-delay" value="300000"/> - <property name="delete-mail" value="false"/> - <property name="maxSize" value="100000"/> - <property name="default-listener" value="store-listener"> - <property name="mail.store.protocol" value="imap"/> - <property name="mail.host" value="[host]"/> - <property name="mail.user" value="[user]"/> - <property name="mail.pass" value="[pass]"/> - <property name="mail.debug" value="false"/> - </property> + <container name="component-container-test" loaders="test" class="org.ofbiz.base.container.ComponentContainer"> + <property name="ofbiz.instrumenterClassName" value="org.ofbiz.base.config.CoberturaInstrumenter"/> + <property name="ofbiz.instrumenterFile" value="runtime/logs/cobertura-components.dat"/> </container> - --> - <!-- load catalina (tomcat) and all web applications --> - <container name="catalina-container" class="org.ofbiz.catalina.container.CatalinaContainer"> - <!-- static configuration for tomcat --> - <property name="delegator-name" value="default"/> - <property name="use-naming" value="false"/> - <property name="debug" value="0"/> - <property name="catalina-runtime-home" value="runtime/catalina"/> - <property name="apps-context-reloadable" value="false"/> - <property name="apps-cross-context" value="false"/> - <property name="apps-distributable" value="false"/><!-- you must also set all the webapps you want distributable, by adding <distributable/> in their web.xml file --> - <!-- one or more tomcat engines (servers); map to this + host --> - <property name="default-server" value="engine"> - <property name="default-host" value="0.0.0.0"/> - <property name="jvm-route" value="jvm1"/> - <property name="access-log-pattern"> - <property-value>%h %l %u %t "%r" %s %b "%{Referer}i" "%{User-Agent}i"</property-value> - </property> - <property name="access-log-resolve" value="true"/> - <property name="access-log-rotate" value="true"/> - <property name="access-log-prefix" value="access_log."/> - <property name="access-log-dir" value="runtime/logs"/> - <!-- uncomment for cluster support - <property name="default-server-cluster" value="cluster"> - <property name="rep-valve-filter"> - <property-value>.*\.gif;.*\.js;.*\.jpg;.*\.htm;.*\.html;.*\.txt;.*\.png;.*\.css;.*\.ico;.*\.htc;</property-value> - </property> - <property name="manager-class" value="org.apache.catalina.ha.session.DeltaManager"/> - <property name="debug" value="5"/> - <property name="replication-mode" value="org.apache.catalina.tribes.transport.bio.PooledMultiSender"/> - <property name="tcp-listen-host" value="auto"/> - <property name="tcp-listen-port" value="4001"/> - <property name="tcp-sector-timeout" value="100"/> - <property name="tcp-thread-count" value="6"/> - <property name="mcast-bind-addr" value="192.168.2.1"/> - <property name="mcast-addr" value="228.0.0.4"/> - <property name="mcast-port" value="45564"/> - <property name="mcast-freq" value="500"/> - <property name="mcast-drop-time" value="3000"/> - </property> - --> - <!-- <property name="ssl-accelerator-port" value="8443"/> --> - <property name="enable-cross-subdomain-sessions" value="false"/> - </property> - <!-- all connectors support type, host, port, enable-lookups --> - <property name="ajp-connector" value="connector"> - <!-- see http://jakarta.apache.org/tomcat/tomcat-5.5-doc/config/ajp.html for reference --> - <property name="allowTrace" value="false"/> - <property name="emptySessionPath" value="false"/> - <property name="enableLookups" value="false"/> - <property name="maxPostSize" value="2097152"/> - <property name="protocol" value="AJP/1.3"/> - <property name="proxyName" value=""/> - <property name="proxyPort" value=""/> - <property name="redirectPort" value=""/> - <property name="scheme" value="http"/> - <property name="secure" value="false"/> - <property name="URIEncoding" value="UTF-8"/> - <property name="useBodyEncodingForURI" value="false"/> - <property name="xpoweredBy" value="true"/> - <!-- AJP/13 connector attributes --> - <property name="address" value="0.0.0.0"/> - <property name="backlog" value="10"/> - <property name="maxSpareThreads" value="50"/> - <property name="maxThreads" value="200"/> - <property name="minSpareThreads" value="4"/> - <property name="port" value="8009"/> - <property name="tcpNoDelay" value="true"/> - <property name="soTimeout" value="60000"/> - <property name="tomcatAuthentication" value="true"/> - </property> - <property name="http-connector" value="connector"> - <!-- see http://jakarta.apache.org/tomcat/tomcat-5.5-doc/config/http.html for reference --> - <property name="allowTrace" value="false"/> - <property name="emptySessionPath" value="false"/> - <property name="enableLookups" value="false"/> - <property name="maxPostSize" value="2097152"/> - <property name="protocol" value="HTTP/1.1"/> - <property name="proxyName" value=""/> - <property name="proxyPort" value=""/> - <property name="redirectPort" value=""/> - <property name="scheme" value="http"/> - <property name="secure" value="false"/> - <property name="URIEncoding" value="UTF-8"/> - <property name="useBodyEncodingForURI" value="false"/> - <property name="xpoweredBy" value="true"/> - <!-- HTTP connector attributes --> - <property name="acceptCount" value="10"/> - <property name="address" value="0.0.0.0"/> - <property name="bufferSize" value="2048"/> - <property name="compression" value="on"/> - <property name="compressableMimeType" value="text/html,text/xml,text/plain,text/javascript,text/css"/> - <property name="noCompressionUserAgents" value=""/> - <property name="connectionLinger" value="-1"/> - <property name="connectionTimeout" value="60000"/> - <property name="disableUploadTimeout" value="false"/> - <property name="maxHttpHeaderSize" value="4096"/> - <property name="maxKeepAliveRequests" value="100"/> - <property name="maxSpareThreads" value="50"/> - <property name="maxThreads" value="100"/> - <property name="minSpareThreads" value="4"/> - <property name="port" value="8080"/> - <property name="restrictedUserAgents" value=""/> - <property name="server" value=""/> - <property name="socketBuffer" value="9000"/> - <property name="strategy" value="lf"/> - <property name="tcpNoDelay" value="true"/> - <property name="threadPriority" value="java.lang.Thread#NORM_PRIORITY"/> - </property> - <property name="https-connector" value="connector"> - <!-- see http://jakarta.apache.org/tomcat/tomcat-5.5-doc/config/http.html for reference --> - <property name="allowTrace" value="false"/> - <property name="emptySessionPath" value="false"/> - <property name="enableLookups" value="false"/> - <property name="maxPostSize" value="2097152"/> - <property name="protocol" value="HTTP/1.1"/> - <property name="proxyName" value=""/> - <property name="proxyPort" value=""/> - <property name="redirectPort" value=""/> - <property name="scheme" value="https"/> - <property name="secure" value="true"/> - <property name="URIEncoding" value="UTF-8"/> - <property name="useBodyEncodingForURI" value="false"/> - <property name="xpoweredBy" value="true"/> - <!-- HTTP connector attributes --> - <property name="acceptCount" value="10"/> - <property name="address" value="0.0.0.0"/> - <property name="bufferSize" value="2048"/> - <property name="compression" value="on"/> - <property name="compressableMimeType" value="text/html,text/xml,text/plain,text/javascript,text/css"/> - <property name="noCompressionUserAgents" value=""/> - <property name="connectionLinger" value="-1"/> - <property name="connectionTimeout" value="60000"/> - <property name="disableUploadTimeout" value="false"/> - <property name="maxHttpHeaderSize" value="4096"/> - <property name="maxKeepAliveRequests" value="100"/> - <property name="maxSpareThreads" value="50"/> - <property name="maxThreads" value="100"/> - <property name="minSpareThreads" value="4"/> - <property name="port" value="8443"/> - <property name="restrictedUserAgents" value=""/> - <property name="server" value=""/> - <property name="socketBuffer" value="9000"/> - <property name="strategy" value="lf"/> - <property name="tcpNoDelay" value="true"/> - <property name="threadPriority" value="java.lang.Thread#NORM_PRIORITY"/> - <!-- SSL connector attributes --> - <property name="sSLImplementation" value="org.ofbiz.catalina.container.SSLImpl"/> - <property name="algorithm" value="SunX509"/> - <!-- the clientAuth to "want" in order to receive certs from the client; - note that this isn't set this way by default because with certain browsers - (like Safari) it breaks access via HTTPS, so until that problem is fixed - the default will be false --> - <property name="clientAuth" value="false"/> - <property name="keystoreFile" value="framework/base/config/ofbizssl.jks"/> - <property name="keystorePass" value="changeit"/> - <property name="keystoreType" value="JKS"/> - <property name="sslProtocol" value="TLS"/> - <property name="ciphers" value=""/> - </property> + <container name="component-container-limited" loaders="limited" class="org.ofbiz.base.container.ComponentContainer"> + <property name="update-classpath" value="false"/> </container> - <!-- load the BIRT container --> - <container name="birt-container" class="org.ofbiz.birt.container.BirtContainer"/> + <container name="component-container" loaders="testlist" class="org.ofbiz.base.container.JustLoadComponentsContainer"/> - <!-- load BeanShell remote telnet server --> - <!-- Commented out by default for security reasons --> - <!-- the port below and port-1 will be opened by Beanshell --> - <!--container name="beanshell-container" class="org.ofbiz.base.container.BeanShellContainer"> - <property name="telnet-port" value="9990"/> - <property name="app-name" value="OFBiz"/> - </container--> - - <!-- load Groovy remote telnet server --> - <!-- Commented out by default for security reasons --> - <!-- the port below will be opened by Groovy --> - <!--container name="groovyshell-container" class="org.ofbiz.base.container.GroovyShellContainer"> - <property name="telnet-port" value="9991"/> - </container--> </ofbiz-containers> Modified: ofbiz/branches/jackrabbit20120501/framework/base/dtd/ofbiz-component.xsd URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/base/dtd/ofbiz-component.xsd?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/base/dtd/ofbiz-component.xsd (original) +++ ofbiz/branches/jackrabbit20120501/framework/base/dtd/ofbiz-component.xsd Tue Aug 7 06:25:59 2012 @@ -255,6 +255,7 @@ under the License. <xs:attributeGroup name="attlist.container"> <xs:attribute type="xs:string" name="name" use="required"/> <xs:attribute type="xs:string" name="class" use="required"/> + <xs:attribute type="xs:string" name="loaders"/> </xs:attributeGroup> <xs:element name="property"> <xs:complexType> Modified: ofbiz/branches/jackrabbit20120501/framework/base/dtd/ofbiz-containers.xsd URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/base/dtd/ofbiz-containers.xsd?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/base/dtd/ofbiz-containers.xsd (original) +++ ofbiz/branches/jackrabbit20120501/framework/base/dtd/ofbiz-containers.xsd Tue Aug 7 06:25:59 2012 @@ -36,6 +36,7 @@ under the License. <xs:attributeGroup name="attlist.container"> <xs:attribute type="xs:string" name="name" use="required"/> <xs:attribute type="xs:string" name="class" use="required"/> + <xs:attribute type="xs:string" name="loaders"/> </xs:attributeGroup> <xs:element name="property"> <xs:complexType> Modified: ofbiz/branches/jackrabbit20120501/framework/base/dtd/ofbiz-properties.xsd URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/base/dtd/ofbiz-properties.xsd?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/base/dtd/ofbiz-properties.xsd (original) +++ ofbiz/branches/jackrabbit20120501/framework/base/dtd/ofbiz-properties.xsd Tue Aug 7 06:25:59 2012 @@ -18,31 +18,30 @@ specific language governing permissions under the License. --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"> - <xs:import namespace="http://www.w3.org/XML/1998/namespace" - schemaLocation="http://www.w3.org/2001/xml.xsd"/> + <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd" /> + + <xs:complexType name="valueType"> + <xs:simpleContent> + <xs:extension base="xs:string"> + <xs:attribute ref="xml:lang" /> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + <xs:element name="resource"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="1" maxOccurs="unbounded" ref="property"/> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="property" /> </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="property"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="1" maxOccurs="unbounded" name="value" type="valueType"/> + <xs:element minOccurs="1" maxOccurs="unbounded" name="value" type="valueType" /> </xs:sequence> - <xs:attributeGroup ref="attlist.property"/> + <xs:attribute type="xs:string" name="key" use="required" /> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.property"> - <xs:attribute type="xs:string" name="key" use="required"/> - </xs:attributeGroup> - <xs:complexType name="valueType"> - <xs:simpleContent> - <xs:extension base="xs:string"> - <xs:attribute ref="xml:lang"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> </xs:schema> Modified: ofbiz/branches/jackrabbit20120501/framework/base/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/base/ofbiz-component.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/base/ofbiz-component.xml (original) +++ ofbiz/branches/jackrabbit20120501/framework/base/ofbiz-component.xml Tue Aug 7 06:25:59 2012 @@ -27,4 +27,29 @@ under the License. <classpath type="jar" location="lib/*"/> <test-suite loader="main" location="testdef/basetests.xml"/> + + <!-- load the cached classloader container (always second) --> + <container name="classloader-container" loaders="main,rmi,pos,install,test" class="org.ofbiz.base.container.ClassLoaderContainer"/> + + <!-- load the naming (JNDI) server --> + <container name="naming-container" loaders="rmi" class="org.ofbiz.base.container.NamingServiceContainer"> + <property name="host" value="0.0.0.0"/> + <property name="port" value="1099"/> + </container> + + <!-- load BeanShell remote telnet server --> + <!-- Commented out by default for security reasons --> + <!-- the port below and port-1 will be opened by Beanshell --> + <!--container name="beanshell-container" class="org.ofbiz.base.container.BeanShellContainer"> + <property name="telnet-port" value="9990"/> + <property name="app-name" value="OFBiz"/> + </container--> + + <!-- load Groovy remote telnet server --> + <!-- Commented out by default for security reasons --> + <!-- the port below will be opened by Groovy --> + <!--container name="groovyshell-container" class="org.ofbiz.base.container.GroovyShellContainer"> + <property name="telnet-port" value="9991"/> + </container--> + </ofbiz-component> Modified: ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/concurrent/ExecutionPool.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/concurrent/ExecutionPool.java?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/concurrent/ExecutionPool.java (original) +++ ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/concurrent/ExecutionPool.java Tue Aug 7 06:25:59 2012 @@ -18,7 +18,7 @@ *******************************************************************************/ package org.ofbiz.base.concurrent; -import java.lang.management.ManagementFactory; +import java.lang.Runtime; import java.util.Collection; import java.util.Iterator; import java.util.List; @@ -39,7 +39,7 @@ import org.ofbiz.base.util.Debug; @SourceMonitored public final class ExecutionPool { public static final String module = ExecutionPool.class.getName(); - public static final ScheduledExecutorService GLOBAL_EXECUTOR = getExecutor(null, "ofbiz-config", -1, true); + public static final ScheduledExecutorService GLOBAL_EXECUTOR = getExecutor(null, "OFBiz-config", -1, true); protected static class ExecutionPoolThreadFactory implements ThreadFactory { private final ThreadGroup group; @@ -78,7 +78,7 @@ public final class ExecutionPool { if (threadCount == 0) { threadCount = 1; } else if (threadCount < 0) { - int numCpus = ManagementFactory.getOperatingSystemMXBean().getAvailableProcessors(); + int numCpus = Runtime.getRuntime().availableProcessors(); threadCount = Math.abs(threadCount) * numCpus; } ThreadFactory threadFactory = createThreadFactory(group, namePrefix); @@ -134,11 +134,11 @@ public final class ExecutionPool { static { ExecutionPoolPulseWorker worker = new ExecutionPoolPulseWorker(); - int processorCount = ManagementFactory.getOperatingSystemMXBean().getAvailableProcessors(); + int processorCount = Runtime.getRuntime().availableProcessors(); for (int i = 0; i < processorCount; i++) { Thread t = new Thread(worker); t.setDaemon(true); - t.setName("ExecutionPoolPulseWorker(" + i + ")"); + t.setName("OFBiz-ExecutionPoolPulseWorker-" + i); t.start(); } } Modified: ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/container/BeanShellContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/container/BeanShellContainer.java?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/container/BeanShellContainer.java (original) +++ ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/container/BeanShellContainer.java Tue Aug 7 06:25:59 2012 @@ -34,22 +34,20 @@ public class BeanShellContainer implemen protected String configFileLocation = null; protected Interpreter bsh = null; + protected String containerName; protected String name; protected int port; - /** - * @see org.ofbiz.base.container.Container#init(java.lang.String[], java.lang.String) - */ - public void init(String[] args, String configFile) { + @Override + public void init(String[] args, String name, String configFile) { + this.containerName = name; this.configFileLocation = configFile; } - /** - * @see org.ofbiz.base.container.Container#init(java.lang.String[], java.lang.String) - */ + @Override public boolean start() throws ContainerException { // get the container config - ContainerConfig.Container cfg = ContainerConfig.getContainer("beanshell-container", configFileLocation); + ContainerConfig.Container cfg = ContainerConfig.getContainer(containerName, configFileLocation); // get the app-name ContainerConfig.Container.Property appName = cfg.getProperty("app-name"); @@ -115,4 +113,8 @@ public class BeanShellContainer implemen public void stop() throws ContainerException { bsh = null; } + + public String getName() { + return containerName; + } } Modified: ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/container/ClassLoaderContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/container/ClassLoaderContainer.java?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/container/ClassLoaderContainer.java (original) +++ ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/container/ClassLoaderContainer.java Tue Aug 7 06:25:59 2012 @@ -32,11 +32,11 @@ public class ClassLoaderContainer implem public static final String module = ClassLoaderContainer.class.getName(); protected static CachedClassLoader cl = null; + private String name; - /** - * @see org.ofbiz.base.container.Container#init(java.lang.String[], java.lang.String) - */ - public void init(String[] args, String configFile) throws ContainerException { + @Override + public void init(String[] args, String name, String configFile) throws ContainerException { + this.name = name; ClassLoader parent = Thread.currentThread().getContextClassLoader(); if (parent == null) { parent = Classpath.class.getClassLoader(); @@ -63,6 +63,10 @@ public class ClassLoaderContainer implem public void stop() throws ContainerException { } + public String getName() { + return name; + } + public static ClassLoader getClassLoader() { if (cl != null) { return cl; Modified: ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/container/ComponentContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/container/ComponentContainer.java?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/container/ComponentContainer.java (original) +++ ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/container/ComponentContainer.java Tue Aug 7 06:25:59 2012 @@ -50,18 +50,18 @@ public class ComponentContainer implemen protected Classpath classPath = new Classpath(System.getProperty("java.class.path")); protected Classpath libraryPath = new Classpath(System.getProperty("java.library.path")); protected String configFileLocation = null; + private String name; private boolean loaded = false; private String instrumenterClassName; private String instrumenterFile; - /** - * @see org.ofbiz.base.container.Container#init(java.lang.String[], java.lang.String) - */ - public void init(String[] args, String configFile) throws ContainerException { + @Override + public void init(String[] args, String name, String configFile) throws ContainerException { + this.name = name; this.configFileLocation = configFile; // get the config for this container - ContainerConfig.Container cc = ContainerConfig.getContainer("component-container", configFileLocation); + ContainerConfig.Container cc = ContainerConfig.getContainer(name, configFileLocation); // check for an override loader config String loaderConfig = null; @@ -299,6 +299,10 @@ public class ComponentContainer implemen public void stop() throws ContainerException { } + public String getName() { + return name; + } + /** * Static method for easy loading of components for use when the container system is not. * Modified: ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/container/Container.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/container/Container.java?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/container/Container.java (original) +++ ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/container/Container.java Tue Aug 7 06:25:59 2012 @@ -40,12 +40,13 @@ public interface Container { * should initialize internal structures and then return. * * @param args Command-line arguments. + * @param name Unique name of the container's instance. * @param configFile Location of the configuration file used to load this container. * @throws ContainerException If an error was encountered. Throwing this exception * will halt container loading, so it should be thrown only when other containers * might depend on this one. */ - public void init(String[] args, String configFile) throws ContainerException; + public void init(String[] args, String name, String configFile) throws ContainerException; /** * Start the container process. This method must not block - implementations @@ -62,4 +63,11 @@ public interface Container { * @throws ContainerException If an error was encountered. */ public void stop() throws ContainerException; + + /** + * Return the container name. + * + * @return Name of the container's instance. + */ + public String getName(); } Modified: ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/container/ContainerConfig.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/container/ContainerConfig.java?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/container/ContainerConfig.java (original) +++ ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/container/ContainerConfig.java Tue Aug 7 06:25:59 2012 @@ -30,6 +30,7 @@ import java.util.Map; import javax.xml.parsers.ParserConfigurationException; import org.ofbiz.base.lang.LockedBy; +import org.ofbiz.base.util.StringUtil; import org.ofbiz.base.util.UtilURL; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; @@ -172,13 +173,15 @@ public class ContainerConfig { } public static class Container { - public String name; - public String className; - public Map<String, Property> properties; + public final String name; + public final String className; + public final List<String> loaders; + public final Map<String, Property> properties; public Container(Element element) { this.name = element.getAttribute("name"); this.className = element.getAttribute("class"); + this.loaders = StringUtil.split(element.getAttribute("loaders"), ","); properties = new LinkedHashMap<String, Property>(); for (Element curElement: UtilXml.childElementList(element, "property")) { |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |