Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/servicedef/services.xml?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/servicedef/services.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/servicedef/services.xml Mon Sep 8 06:04:39 2014 @@ -214,22 +214,19 @@ under the License. <override name="productStoreId" optional="false"/> </service> - <service name="createPartyAttribute" engine="simple" default-entity-name="PartyAttribute" - location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="createPartyAttribute" auth="true"> + <service name="createPartyAttribute" default-entity-name="PartyAttribute" engine="entity-auto" invoke="create" auth="true"> <description>create a party attribute record</description> <permission-service service-name="partyBasePermissionCheck" main-action="CREATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updatePartyAttribute" engine="simple" default-entity-name="PartyAttribute" - location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="updatePartyAttribute" auth="true"> + <service name="updatePartyAttribute" default-entity-name="PartyAttribute" engine="entity-auto" invoke="update" auth="true"> <description>updates a party attribute record</description> <permission-service service-name="partyBasePermissionCheck" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="removePartyAttribute" engine="simple" default-entity-name="PartyAttribute" - location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="removePartyAttribute" auth="true"> + <service name="removePartyAttribute" default-entity-name="PartyAttribute" engine="entity-auto" invoke="delete" auth="true"> <description>removes a party attribute record</description> <permission-service service-name="partyBasePermissionCheck" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -262,21 +259,17 @@ under the License. </service> <!-- Party Role services --> - <service name="createPartyRole" engine="simple" - location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="createPartyRole" auth="true"> + <service name="createPartyRole" default-entity-name="PartyRole" engine="entity-auto" invoke="create" auth="true"> <description>Create a Party Role (add a Role to a Party). The logged in user must have PARTYMGR_CREATE or have permission to change the role of this partyId</description> <permission-service service-name="partyRolePermissionCheck" main-action="CREATE"/> - <attribute name="partyId" type="String" mode="IN" optional="true"/> - <attribute name="roleTypeId" type="String" mode="IN" optional="false"/> + <auto-attributes include="pk" mode="IN" optional="false"/> </service> - <service name="deletePartyRole" engine="simple" - location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="deletePartyRole" auth="true"> + <service name="deletePartyRole" default-entity-name="PartyRole" engine="entity-auto" invoke="delete" auth="true"> <description>Delete a Party Role (remove a Role from a Party). The logged in user must have PARTYMGR_DELETE or have permission to change the role of this partyId</description> <permission-service service-name="partyRolePermissionCheck" main-action="DELETE"/> - <attribute name="partyId" type="String" mode="IN" optional="true"/> - <attribute name="roleTypeId" type="String" mode="IN" optional="false"/> + <auto-attributes include="pk" mode="IN" optional="false"/> </service> <service name="ensurePartyRole" engine="simple" location="component://party/script/org/ofbiz/party/party/PartySimpleMethods.xml" invoke="ensureNaPartyRole" auth="false"> @@ -625,57 +618,49 @@ under the License. </service> <!-- PostalAddressBoundary --> - <service name="createPostalAddressBoundary" engine="simple" default-entity-name="PostalAddressBoundary" - location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="createPostalAddressBoundary"> + <service name="createPostalAddressBoundary" default-entity-name="PostalAddressBoundary" engine="entity-auto" invoke="create"> <description>Create a Postal Address Boundary</description> <permission-service service-name="partyBasePermissionCheck" main-action="CREATE"/> <auto-attributes mode="IN" include="pk" optional="false"/> </service> - <service name="deletePostalAddressBoundary" engine="simple" default-entity-name="PostalAddressBoundary" - location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="deletePostalAddressBoundary"> + <service name="deletePostalAddressBoundary" default-entity-name="PostalAddressBoundary" engine="entity-auto" invoke="delete"> <description>Delete a Postal Address Boundary</description> <permission-service service-name="partyBasePermissionCheck" main-action="DELETE"/> <auto-attributes mode="IN" include="pk" optional="false"/> </service> <!-- PartyClassification --> - <service name="createPartyClassification" engine="simple" default-entity-name="PartyClassification" - location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="createPartyClassification"> + <service name="createPartyClassification" default-entity-name="PartyClassification" engine="entity-auto" invoke="create"> <description>create PartyClassification</description> <permission-service service-name="partyBasePermissionCheck" main-action="CREATE"/> <auto-attributes mode="IN" include="pk" optional="false"/> <auto-attributes mode="IN" include="nonpk" optional="true"/> <override name="fromDate" optional="true"/> </service> - <service name="updatePartyClassification" engine="simple" default-entity-name="PartyClassification" - location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="updatePartyClassification"> + <service name="updatePartyClassification" default-entity-name="PartyClassification" engine="entity-auto" invoke="update"> <description>update PartyClassification</description> <permission-service service-name="partyBasePermissionCheck" main-action="UPDATE"/> <auto-attributes mode="IN" include="pk" optional="false"/> <auto-attributes mode="IN" include="nonpk" optional="true"/> </service> - <service name="deletePartyClassification" engine="simple" default-entity-name="PartyClassification" - location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="deletePartyClassification"> + <service name="deletePartyClassification" default-entity-name="PartyClassification" engine="entity-auto" invoke="delete"> <description>delete PartyClassification</description> <permission-service service-name="partyBasePermissionCheck" main-action="DELETE"/> <auto-attributes mode="IN" include="pk" optional="false"/> </service> - <service name="createPartyClassificationGroup" engine="simple" default-entity-name="PartyClassificationGroup" - location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="createPartyClassificationGroup"> + <service name="createPartyClassificationGroup" default-entity-name="PartyClassificationGroup" engine="entity-auto" invoke="create"> <description>create PartyClassificationGroup</description> <permission-service service-name="partyBasePermissionCheck" main-action="CREATE"/> <auto-attributes mode="OUT" include="pk" optional="false"/> <auto-attributes mode="IN" include="nonpk" optional="true"/> </service> - <service name="updatePartyClassificationGroup" engine="simple" default-entity-name="PartyClassificationGroup" - location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="updatePartyClassificationGroup"> + <service name="updatePartyClassificationGroup" default-entity-name="PartyClassificationGroup" engine="entity-auto" invoke="update"> <description>update PartyClassificationGroup</description> <permission-service service-name="partyBasePermissionCheck" main-action="UPDATE"/> <auto-attributes mode="IN" include="pk" optional="false"/> <auto-attributes mode="IN" include="nonpk" optional="true"/> </service> - <service name="deletePartyClassificationGroup" engine="simple" default-entity-name="PartyClassificationGroup" - location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="deletePartyClassificationGroup"> + <service name="deletePartyClassificationGroup" default-entity-name="PartyClassificationGroup" engine="entity-auto" invoke="delete"> <description>delete PartyClassificationGroup</description> <permission-service service-name="partyBasePermissionCheck" main-action="DELETE"/> <auto-attributes mode="IN" include="pk" optional="false"/> @@ -709,22 +694,19 @@ under the License. <!-- Vendor --> - <service name="createVendor" engine="simple" - location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="createVendor" auth="true"> + <service name="createVendor" default-entity-name="Vendor" engine="entity-auto" invoke="create" auth="true"> <description>Create Vendor Information</description> <permission-service service-name="partyBasePermissionCheck" main-action="CREATE"/> <auto-attributes entity-name="Vendor" include="pk" mode="IN" optional="false"/> <auto-attributes entity-name="Vendor" include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateVendor" engine="simple" - location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="updateVendor" auth="true"> + <service name="updateVendor" default-entity-name="Vendor" engine="entity-auto" invoke="update" auth="true"> <description>Update Vendor Information</description> <permission-service service-name="partyBasePermissionCheck" main-action="UPDATE"/> <auto-attributes entity-name="Vendor" include="pk" mode="IN" optional="false"/> <auto-attributes entity-name="Vendor" include="nonpk" mode="IN" optional="true"/> </service> - <service name="deleteVendor" engine="simple" - location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="deleteVendor" auth="true"> + <service name="deleteVendor" default-entity-name="Vendor" engine="entity-auto" invoke="delete" auth="true"> <description>Remove Vendor Information</description> <permission-service service-name="partyBasePermissionCheck" main-action="DELETE"/> <auto-attributes entity-name="Vendor" include="pk" mode="IN" optional="false"/> @@ -1046,8 +1028,7 @@ under the License. <attribute name="countryGeoId" type="String" mode="OUT" optional="true"/> </service> - <service name="createPartyCarrierAccount" engine="simple" default-entity-name="PartyCarrierAccount" - location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="createPartyCarrierAccount" auth="true"> + <service name="createPartyCarrierAccount" default-entity-name="PartyCarrierAccount" engine="entity-auto" invoke="create" auth="true"> <description>Create a PartyCarrierAccount record</description> <auto-attributes mode="IN" include="pk" optional="false"/> <auto-attributes mode="IN" include="nonpk" optional="true"/> @@ -1055,8 +1036,7 @@ under the License. <override type="String" mode="IN" name="accountNumber" optional="false"/> </service> - <service name="updatePartyCarrierAccount" engine="simple" default-entity-name="PartyCarrierAccount" - location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="updatePartyCarrierAccount" auth="true"> + <service name="updatePartyCarrierAccount" default-entity-name="PartyCarrierAccount" engine="entity-auto" invoke="update" auth="true"> <description>Update a PartyCarrierAccount record</description> <auto-attributes mode="IN" include="pk" optional="false"/> <auto-attributes mode="IN" include="nonpk" optional="true"/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml Mon Sep 8 06:04:39 2014 @@ -26,6 +26,14 @@ <value xml:lang="vi">Thêm Äặc tÃnh SP gia tÄng nà y</value> <value xml:lang="zh">为å½å产åæ·»å æ°ç产åç¹å¾</value> </property> + <property key="AddProductComponent"> + <value xml:lang="en">Add Product Component</value> + <value xml:lang="es">Añadir componente</value> + <value xml:lang="fr">Ajouter un composant</value> + <value xml:lang="it">Aggiungi componente</value> + <value xml:lang="pt_BR">Adicionar componente de produto</value> + <value xml:lang="ro">Adauga Componente Produs</value> + </property> <property key="CatalogWebAnalytics"> <value xml:lang="de">Web Analytik</value> <value xml:lang="en">Web Analytics</value> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/cost/CostServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/cost/CostServices.xml?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/cost/CostServices.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/cost/CostServices.xml Mon Sep 8 06:04:39 2014 @@ -21,25 +21,6 @@ under the License. <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd";> <!-- CostComponent services --> - <simple-method method-name="createCostComponent" short-description="Create a CostComponent"> - <make-value value-field="newEntity" entity-name="CostComponent"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id sequence-name="CostComponent" field="newEntity.costComponentId"/> - <field-to-result field="newEntity.costComponentId" result-name="costComponentId"/> - <if-empty field="newEntity.fromDate"> - <now-timestamp field="newEntity.fromDate"/> - </if-empty> - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="updateCostComponent" short-description="Update a CostComponent"> - <entity-one entity-name="CostComponent" value-field="costComponent"/> - <set-nonpk-fields map="parameters" value-field="costComponent"/> - <store-value value-field="costComponent"/> - </simple-method> - <simple-method method-name="deleteCostComponent" short-description="Delete a CostComponent"> - <entity-one entity-name="CostComponent" value-field="costComponent"/> - <remove-value value-field="costComponent"/> - </simple-method> <simple-method method-name="cancelCostComponents" short-description="Cancels CostComponents"> <set from-field="parameters.costComponentId" field="costsAndMap.costComponentId"/> <set from-field="parameters.productId" field="costsAndMap.productId"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml Mon Sep 8 06:04:39 2014 @@ -109,349 +109,6 @@ under the License. </if-compare-field> </simple-method> - <!-- ProductStore and ProdCatalog services --> - <simple-method method-name="createProductStoreCatalog" short-description="Create ProductStoreCatalog"> - <check-permission permission="CATALOG" action="_CREATE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> - </check-permission> - <check-errors/> - - <make-value value-field="newEntity" entity-name="ProductStoreCatalog"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - - <if-empty field="newEntity.fromDate"> - <now-timestamp field="nowTimestamp"/> - <set from-field="nowTimestamp" field="newEntity.fromDate"/> - </if-empty> - - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="updateProductStoreCatalog" short-description="Update ProductStoreCatalog"> - <check-permission permission="CATALOG" action="_UPDATE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> - </check-permission> - <check-errors/> - - <make-value value-field="lookupPKMap" entity-name="ProductStoreCatalog"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - <simple-method method-name="deleteProductStoreCatalog" short-description="Delete ProductStoreCatalog"> - <check-permission permission="CATALOG" action="_DELETE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> - </check-permission> - <check-errors/> - - <make-value value-field="lookupPKMap" entity-name="ProductStoreCatalog"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <!-- ProductStore Payment Setting Services --> - <simple-method method-name="createProductStorePaymentSetting" short-description="Create a Product Store Payment Setting"> - <check-permission permission="CATALOG" action="_CREATE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> - </check-permission> - <check-errors/> - - <make-value value-field="newEntity" entity-name="ProductStorePaymentSetting"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="updateProductStorePaymentSetting" short-description="Update a Product Store Payment Setting"> - <check-permission permission="CATALOG" action="_UPDATE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> - </check-permission> - <check-errors/> - - <make-value value-field="lookupPKMap" entity-name="ProductStorePaymentSetting"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <find-by-primary-key entity-name="ProductStorePaymentSetting" map="lookupPKMap" value-field="setting"/> - <set-nonpk-fields map="parameters" value-field="setting"/> - <store-value value-field="setting"/> - </simple-method> - <simple-method method-name="deleteProductStorePaymentSetting" short-description="Delete a Product Store Payment Setting"> - <check-permission permission="CATALOG" action="_DELETE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> - </check-permission> - <check-errors/> - - <make-value value-field="lookupPKMap" entity-name="ProductStorePaymentSetting"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <find-by-primary-key entity-name="ProductStorePaymentSetting" map="lookupPKMap" value-field="setting"/> - <set-nonpk-fields map="parameters" value-field="setting"/> - <remove-value value-field="setting"/> - </simple-method> - - <!-- ProductStore Email Services --> - <simple-method method-name="createProductStoreEmail" short-description="Create Product Store Email Setting"> - <check-permission permission="CATALOG" action="_CREATE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> - </check-permission> - <check-errors/> - - <make-value value-field="newEntity" entity-name="ProductStoreEmailSetting"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="updateProductStoreEmail" short-description="Update Product Store Email Setting"> - <check-permission permission="CATALOG" action="_UPDATE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> - </check-permission> - <check-errors/> - - <make-value value-field="lookupKeyValue" entity-name="ProductStoreEmailSetting"/> - <set-pk-fields map="parameters" value-field="lookupKeyValue"/> - <find-by-primary-key entity-name="ProductStoreEmailSetting" map="lookupKeyValue" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - <simple-method method-name="removeProductStoreEmail" short-description="Remove Product Store Email Setting"> - <check-permission permission="CATALOG" action="_DELETE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> - </check-permission> - <check-errors/> - - <make-value value-field="lookupPKMap" entity-name="ProductStoreEmailSetting"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <find-by-primary-key entity-name="ProductStoreEmailSetting" map="lookupPKMap" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <!-- ProductStore Vendor Payment Services --> - <simple-method method-name="createProductStoreVendorPayment" short-description="Create a ProductStoreVendorPayment"> - <check-permission permission="CATALOG" action="_CREATE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> - </check-permission> - <check-errors/> - - <make-value entity-name="ProductStoreVendorPayment" value-field="newEntity"/> - <set-pk-fields value-field="newEntity" map="parameters"/> - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="deleteProductStoreVendorPayment" short-description="Remove the ProductStoreVendorPayment"> - <check-permission permission="CATALOG" action="_DELETE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> - </check-permission> - <check-errors/> - - <make-value entity-name="ProductStoreVendorPayment" value-field="lookedUpValue"/> - <set-pk-fields value-field="lookedUpValue" map="parameters"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <!-- ProductStore Carrier Shipment Services --> - <simple-method method-name="createProductStoreShipMeth" short-description="Create Product Store Carrier Shipment Method"> - <check-permission permission="CATALOG" action="_CREATE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> - </check-permission> - <check-errors/> - - <make-value value-field="newEntity" entity-name="ProductStoreShipmentMeth"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id sequence-name="ProductStoreShipmentMeth" field="newEntity.productStoreShipMethId"/> - - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="updateProductStoreShipMeth" short-description="Update Product Store Carrier Shipment Method"> - <check-permission permission="CATALOG" action="_UPDATE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> - </check-permission> - <check-errors/> - - <make-value value-field="lookupKeyValue" entity-name="ProductStoreShipmentMeth"/> - <set-pk-fields map="parameters" value-field="lookupKeyValue"/> - <find-by-primary-key entity-name="ProductStoreShipmentMeth" map="lookupKeyValue" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - <simple-method method-name="removeProductStoreShipMeth" short-description="Remove Product Store Carrier Shipment Method"> - <check-permission permission="CATALOG" action="_DELETE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> - </check-permission> - <check-errors/> - - <make-value value-field="lookupPKMap" entity-name="ProductStoreShipmentMeth"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <find-by-primary-key entity-name="ProductStoreShipmentMeth" map="lookupPKMap" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <!-- Product Store Role Services --> - <simple-method method-name="createProductStoreRole" short-description="Create ProductStoreRole"> - <check-permission permission="CATALOG" action="_CREATE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> - </check-permission> - <check-errors/> - - <make-value value-field="newEntity" entity-name="ProductStoreRole"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - - <if-empty field="newEntity.fromDate"> - <now-timestamp field="nowTimestamp"/> - <set from-field="nowTimestamp" field="newEntity.fromDate"/> - </if-empty> - - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="updateProductStoreRole" short-description="Update a ProductStoreRole"> - <check-permission permission="CATALOG" action="_UPDATE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> - </check-permission> - <check-errors/> - - <make-value value-field="lookupPKMap" entity-name="ProductStoreRole"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - <simple-method method-name="removeProductStoreRole" short-description="Remove ProductStoreRole"> - <check-permission permission="CATALOG" action="_DELETE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> - </check-permission> - <check-errors/> - - <make-value value-field="lookupPKMap" entity-name="ProductStoreRole"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - - <if-empty field="lookedUpValue.thruDate"> - <now-timestamp field="nowTimestamp"/> - <set from-field="nowTimestamp" field="lookedUpValue.thruDate"/> - </if-empty> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <!-- Product Store Keyword Override Services --> - <simple-method method-name="createProductStoreKeywordOvrd" short-description="Create a ProductStoreKeywordOvrd"> - <check-permission permission="CATALOG" action="_CREATE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> - </check-permission> - <check-errors/> - - <make-value value-field="newEntity" entity-name="ProductStoreKeywordOvrd"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - - <if-empty field="newEntity.fromDate"> - <now-timestamp field="nowTimestamp"/> - <set from-field="nowTimestamp" field="newEntity.fromDate"/> - </if-empty> - - <!-- make sure the keyword is lower cased --> - <call-object-method obj-field="newEntity.keyword" method-name="toLowerCase" ret-field="newEntity.keyword"/> - - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="updateProductStoreKeywordOvrd" short-description="Update a ProductStoreKeywordOvrd"> - <check-permission permission="CATALOG" action="_UPDATE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> - </check-permission> - <check-errors/> - - <make-value value-field="lookupPKMap" entity-name="ProductStoreKeywordOvrd"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - <simple-method method-name="deleteProductStoreKeywordOvrd" short-description="Delete a ProductStoreKeywordOvrd"> - <check-permission permission="CATALOG" action="_DELETE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> - </check-permission> - <check-errors/> - - <make-value value-field="lookupPKMap" entity-name="ProductStoreKeywordOvrd"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <!-- Product Store Survey Appl Services --> - <simple-method method-name="createProductStoreSurveyAppl" short-description="Create ProductStoreSurveyAppl"> - <check-permission permission="CATALOG" action="_CREATE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> - </check-permission> - <check-errors/> - - <make-value value-field="newEntity" entity-name="ProductStoreSurveyAppl"/> - <sequenced-id sequence-name="ProductStoreSurveyAppl" field="productStoreSurveyId"/> - <set from-field="productStoreSurveyId" field="newEntity.productStoreSurveyId"/> - <field-to-result field="productStoreSurveyId" result-name="productStoreSurveyId"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - - <if-empty field="newEntity.fromDate"> - <now-timestamp field="nowTimestamp"/> - <set from-field="nowTimestamp" field="newEntity.fromDate"/> - </if-empty> - - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="removeProductStoreSurveyAppl" short-description="Remove ProductStoreSurveyAppl"> - <check-permission permission="CATALOG" action="_DELETE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> - </check-permission> - <check-errors/> - - <make-value value-field="lookupPKMap" entity-name="ProductStoreSurveyAppl"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - - <if-empty field="lookedUpValue.thruDate"> - <now-timestamp field="nowTimestamp"/> - <set from-field="nowTimestamp" field="lookedUpValue.thruDate"/> - </if-empty> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <!-- Product Store FinAccount Settings --> - <simple-method method-name="createProductStoreFinActSetting" short-description="Create a ProductStoreFinActSetting"> - <check-permission permission="CATALOG" action="_CREATE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> - </check-permission> - <check-errors/> - - <make-value value-field="finAcctSetting" entity-name="ProductStoreFinActSetting"/> - <set-pk-fields value-field="finAcctSetting" map="parameters"/> - <set-nonpk-fields value-field="finAcctSetting" map="parameters"/> - <create-value value-field="finAcctSetting"/> - </simple-method> - <simple-method method-name="updateProductStoreFinActSetting" short-description="Update a ProductStoreFinActSetting"> - <check-permission permission="CATALOG" action="_UPDATE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> - </check-permission> - <check-errors/> - - <make-value value-field="lookupPk" entity-name="ProductStoreFinActSetting"/> - <set-pk-fields value-field="lookupPk" map="parameters"/> - <find-by-primary-key map="lookupPk" value-field="finAccountSetting"/> - - <set-nonpk-fields value-field="finAccountSetting" map="parameters"/> - <store-value value-field="finAccountSetting"/> - </simple-method> - <simple-method method-name="removeProductStoreFinActSetting" short-description="Remove a ProductStoreFinActSetting"> - <check-permission permission="CATALOG" action="_DELETE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> - </check-permission> - <check-errors/> - - <make-value value-field="lookupPk" entity-name="ProductStoreFinActSetting"/> - <set-pk-fields value-field="lookupPk" map="parameters"/> - <find-by-primary-key map="lookupPk" value-field="finAccountSetting"/> - <remove-value value-field="finAccountSetting"/> - </simple-method> - <!-- Store Inventory Services --> <simple-method method-name="reserveStoreInventory" short-description="Reserve Store Inventory"> <entity-one entity-name="Product" value-field="product" use-cache="true"/> @@ -753,24 +410,87 @@ under the License. </if-compare> </simple-method> - <!-- ProductStore Vendor Shipment Services --> - <simple-method method-name="createProductStoreVendorShipment" short-description="Create a ProductStoreVendorShipment"> - <check-permission permission="CATALOG" action="_CREATE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> - </check-permission> - <check-errors/> - <make-value entity-name="ProductStoreVendorShipment" value-field="newEntity"/> - <set-pk-fields value-field="newEntity" map="parameters"/> - <create-value value-field="newEntity"/> + <!-- ============================= --> + <!-- Permission Methods --> + <!-- ============================= --> + + <!-- a methods to centralize product security code, meant to be called in-line with + call-simple-method, and the checkAction and callingMethodName attributes should be in the method context --> + <simple-method method-name="checkProductStoreRelatedPermission" short-description="Check ProductStore Related Permission"> + <if-empty field="callingMethodName"> + <set field="callingMethodName" value="this operation"/> + </if-empty> + <if-empty field="checkAction"> + <set field="checkAction" value="UPDATE"/> + </if-empty> + <if-empty field="productStoreIdName"> + <set field="productStoreIdName" value="productStoreId"/> + </if-empty> + <if-empty field="productStoreIdToCheck"> + <set field="productStoreIdToCheck" from-field="parameters.${productStoreIdName}"/> + </if-empty> + + <!-- find all role-store that this productStore is a member of --> + <if> + <condition> + <not><if-has-permission permission="CATALOG" action="_${checkAction}"/></not> + </condition> + <then> + <entity-and entity-name="ProductStoreRole" list="roleStores" filter-by-date="true"> + <field-map field-name="productStoreId" from-field="productStoreIdToCheck"/> + <field-map field-name="partyId" from-field="userLogin.partyId"/> + <field-map field-name="roleTypeId" value="LTD_ADMIN"/> + </entity-and> + <filter-list-by-date list="roleStores" from-field-name="roleFromDate" thru-field-name="roleThruDate"/> + </then> + </if> + <log level="info" message="Checking store permission, roleStores=${roleStores}"/> + <if> + <condition> + <not> + <or> + <if-has-permission permission="CATALOG" action="_${checkAction}"/> + <and> + <if-has-permission permission="CATALOG_ROLE" action="_${checkAction}"/> + <not><if-empty field="roleStores"/></not> + </and> + </or> + </not> + </condition> + <then> + <log level="verbose" message="Permission check failed, user does not have permission"/> + <set field="checkActionLabel" value="${groovy: 'ProductCatalog' + checkAction.charAt(0) + checkAction.substring(1).toLowerCase() + 'PermissionError'}"/> + <add-error> + <fail-property resource="ProductUiLabels" property="${checkActionLabel}"/> + </add-error> + <set field="hasPermission" type="Boolean" value="false"/> + </then> + </if> </simple-method> - <simple-method method-name="deleteProductStoreVendorShipment" short-description="Remove the ProductStoreVendorShipment"> - <check-permission permission="CATALOG" action="_DELETE"> - <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> - </check-permission> - <check-errors/> - <make-value entity-name="ProductStoreVendorShipment" value-field="lookedUpValue"/> - <set-pk-fields value-field="lookedUpValue" map="parameters"/> - <remove-value value-field="lookedUpValue"/> + <simple-method method-name="productStoreGenericPermission" short-description="Main permission logic"> + <set field="mainAction" from-field="parameters.mainAction"/> + <if-empty field="mainAction"> + <add-error> + <fail-property resource="ProductUiLabels" property="ProductMissingMainActionInPermissionService"/> + </add-error> + <check-errors/> + </if-empty> + + <set field="callingMethodName" from-field="parameters.resourceDescription"/> + <set field="checkAction" from-field="parameters.mainAction"/> + <call-simple-method method-name="checkProductStoreRelatedPermission"/> + + <if-empty field="error_list"> + <set field="hasPermission" type="Boolean" value="true"/> + <field-to-result field="hasPermission"/> + + <else> + <property-to-field resource="ProductUiLabels" property="ProductPermissionError" field="failMessage"/> + <set field="hasPermission" type="Boolean" value="false"/> + <field-to-result field="hasPermission"/> + <field-to-result field="failMessage"/> + </else> + </if-empty> </simple-method> <simple-method method-name="checkProductStoreGroupRollup" short-description="When product store group hierarchy has been operate, synchronize primaryParentGroupId with ProductStoreGroupRollup"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml Mon Sep 8 06:04:39 2014 @@ -48,11 +48,6 @@ under the License. <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> </simple-method> - <simple-method method-name="updateSubscription" short-description="Update a Subscription"> - <entity-one entity-name="Subscription" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-field="lookedUpValue"/> - </simple-method> <simple-method method-name="isSubscribed" short-description="check if a party has a subscription"> <set field="pfInput.inputFields" from-field="parameters"/> @@ -83,35 +78,6 @@ under the License. </if-not-empty> </simple-method> - <simple-method method-name="createSubscriptionResource" short-description="Create a SubscriptionResource"> - <make-value entity-name="SubscriptionResource" value-field="newEntity"/> - <sequenced-id sequence-name="SubscriptionResource" field="newEntity.subscriptionResourceId"/> - <field-to-result field="newEntity.subscriptionResourceId" result-name="subscriptionResourceId"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="updateSubscriptionResource" short-description="Update a SubscriptionResource"> - <entity-one entity-name="SubscriptionResource" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="createProductSubscriptionResource" short-description="Create a ProductSubscriptionResource"> - <make-value entity-name="ProductSubscriptionResource" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="updateProductSubscriptionResource" short-description="Update a ProductSubscriptionResource"> - <entity-one entity-name="ProductSubscriptionResource" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - <simple-method method-name="deleteProductSubscriptionResource" short-description="Delete a ProductSubscriptionResource"> - <entity-one entity-name="ProductSubscriptionResource" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> <simple-method method-name="updateSubscriptionAttribute" short-description="Create (when not exist) or update (when exist) a Subscription attribute"> <field-to-result field="parameters.subscriptionId" result-name="subscriptionId"/> <entity-one entity-name="SubscriptionAttribute" value-field="lookedUpValue"/> @@ -127,17 +93,6 @@ under the License. </if-empty> </simple-method> - <simple-method method-name="createSubscriptionCommEvent" short-description="Create a Subscription Communication Event"> - <make-value value-field="newEntity" entity-name="SubscriptionCommEvent"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="removeSubscriptionCommEvent" short-description="Remove a Subscription Communication Event"> - <entity-one entity-name="SubscriptionCommEvent" value-field="eventSubscription"/> - <remove-value value-field="eventSubscription"/> - </simple-method> - <!-- ============== Permission Checking Service ============= --> <simple-method method-name="subscriptionPermissionCheck" short-description="Subscription permission checking logic"> <set field="primaryPermission" value="CATALOG"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_cost.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_cost.xml?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_cost.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_cost.xml Mon Sep 8 06:04:39 2014 @@ -24,21 +24,18 @@ under the License. <vendor>OFBiz</vendor> <version>1.0</version> - <service name="createCostComponent" default-entity-name="CostComponent" engine="simple" - location="component://product/script/org/ofbiz/product/cost/CostServices.xml" invoke="createCostComponent" auth="true"> + <service name="createCostComponent" default-entity-name="CostComponent" engine="entity-auto" invoke="create" auth="true"> <description>Create a CostComponent</description> <auto-attributes include="nonpk" mode="IN" optional="true"/> <auto-attributes include="pk" mode="OUT" optional="false"/> <!--<override name="costComponentTypeId" optional="false"/>--> </service> - <service name="updateCostComponent" default-entity-name="CostComponent" engine="simple" - location="component://product/script/org/ofbiz/product/cost/CostServices.xml" invoke="updateCostComponent" auth="true"> + <service name="updateCostComponent" default-entity-name="CostComponent" engine="entity-auto" invoke="update" auth="true"> <description>Update a CostComponent</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="deleteCostComponent" default-entity-name="CostComponent" engine="simple" - location="component://product/script/org/ofbiz/product/cost/CostServices.xml" invoke="deleteCostComponent" auth="true"> + <service name="deleteCostComponent" default-entity-name="CostComponent" engine="entity-auto" invoke="delete" auth="true"> <description>Delete a CostComponent</description> <auto-attributes include="pk" mode="IN" optional="false"/> </service> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_store.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_store.xml?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_store.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_store.xml Mon Sep 8 06:04:39 2014 @@ -83,151 +83,151 @@ under the License. </service> <!-- Product Store Role Services --> - <service name="createProductStoreRole" default-entity-name="ProductStoreRole" engine="simple" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="createProductStoreRole" auth="true"> + <service name="createProductStoreRole" default-entity-name="ProductStoreRole" engine="entity-auto" invoke="create" auth="true"> <description>Create ProductStoreRole</description> + <permission-service service-name="productStoreGenericPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> <override name="fromDate" optional="true"/> </service> - <service name="updateProductStoreRole" default-entity-name="ProductStoreRole" engine="simple" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="updateProductStoreRole" auth="true"> + <service name="updateProductStoreRole" default-entity-name="ProductStoreRole" engine="entity-auto" invoke="update" auth="true"> <description>Update a Product Store Role</description> + <permission-service service-name="productStoreGenericPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="removeProductStoreRole" default-entity-name="ProductStoreRole" engine="simple" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="removeProductStoreRole" auth="true"> + <service name="removeProductStoreRole" default-entity-name="ProductStoreRole" engine="entity-auto" invoke="delete" auth="true"> <description>Remove ProductStoreRole</description> + <permission-service service-name="productStoreGenericPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <!-- Product Store Catalog Services --> - <service name="createProductStoreCatalog" default-entity-name="ProductStoreCatalog" engine="simple" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="createProductStoreCatalog" auth="true"> + <service name="createProductStoreCatalog" default-entity-name="ProductStoreCatalog" engine="entity-auto" invoke="create" auth="true"> <description>Create ProductStoreCatalog</description> + <permission-service service-name="productStoreGenericPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> <override name="fromDate" optional="true"/> </service> - <service name="updateProductStoreCatalog" default-entity-name="ProductStoreCatalog" engine="simple" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="updateProductStoreCatalog" auth="true"> + <service name="updateProductStoreCatalog" default-entity-name="ProductStoreCatalog" engine="entity-auto" invoke="update" auth="true"> <description>Update ProductStoreCatalog</description> + <permission-service service-name="productStoreGenericPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="deleteProductStoreCatalog" default-entity-name="ProductStoreCatalog" engine="simple" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="deleteProductStoreCatalog" auth="true"> + <service name="deleteProductStoreCatalog" default-entity-name="ProductStoreCatalog" engine="entity-auto" invoke="delete" auth="true"> <description>Delete ProductStoreCatalog</description> + <permission-service service-name="productStoreGenericPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!-- Product Store Payment Services --> - <service name="createProductStorePaymentSetting" default-entity-name="ProductStorePaymentSetting" engine="simple" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="createProductStorePaymentSetting" auth="true"> + <service name="createProductStorePaymentSetting" default-entity-name="ProductStorePaymentSetting" engine="entity-auto" invoke="create" auth="true"> <description>Create ProductStorePaymentSetting</description> + <permission-service service-name="productStoreGenericPermission" main-action="CREATE"/> <auto-attributes include="all" mode="IN" optional="false"/> <override name="paymentCustomMethodId" optional="true"/> <override name="paymentGatewayConfigId" optional="true"/> <override name="paymentPropertiesPath" optional="true"/> <override name="paymentService" optional="true"/> </service> - <service name="updateProductStorePaymentSetting" default-entity-name="ProductStorePaymentSetting" engine="simple" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="updateProductStorePaymentSetting" auth="true"> + <service name="updateProductStorePaymentSetting" default-entity-name="ProductStorePaymentSetting" engine="entity-auto" invoke="update" auth="true"> <description>Update ProductStorePaymentSetting</description> + <permission-service service-name="productStoreGenericPermission" main-action="UPDATE"/> <auto-attributes include="all" mode="IN" optional="false"/> <override name="paymentCustomMethodId" optional="true"/> <override name="paymentGatewayConfigId" optional="true"/> <override name="paymentPropertiesPath" optional="true"/> <override name="paymentService" optional="true"/> </service> - <service name="deleteProductStorePaymentSetting" default-entity-name="ProductStorePaymentSetting" engine="simple" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="deleteProductStorePaymentSetting" auth="true"> + <service name="deleteProductStorePaymentSetting" default-entity-name="ProductStorePaymentSetting" engine="entity-auto" invoke="delete" auth="true"> <description>Delete ProductStorePaymentSetting</description> + <permission-service service-name="productStoreGenericPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!-- Product Store Email Services --> - <service name="createProductStoreEmailSetting" engine="simple" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="createProductStoreEmail" auth="true"> + <service name="createProductStoreEmailSetting" default-entity-name="ProductStoreEmailSetting" engine="entity-auto" invoke="create" auth="true"> <description>Create a Product Store Email Setting</description> + <permission-service service-name="productStoreGenericPermission" main-action="CREATE"/> <auto-attributes entity-name="ProductStoreEmailSetting" include="all" mode="IN" optional="false"/> <override name="xslfoAttachScreenLocation" optional="true"/> <override name="ccAddress" optional="true"/> <override name="bccAddress" optional="true"/> <override name="contentType" optional="true"/> </service> - <service name="updateProductStoreEmailSetting" engine="simple" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="updateProductStoreEmail" auth="true"> + <service name="updateProductStoreEmailSetting" default-entity-name="ProductStoreEmailSetting" engine="entity-auto" invoke="update" auth="true"> <description>Update a Product Store Email Setting</description> + <permission-service service-name="productStoreGenericPermission" main-action="UPDATE"/> <auto-attributes entity-name="ProductStoreEmailSetting" include="all" mode="IN" optional="false"/> <override name="xslfoAttachScreenLocation" optional="true"/> <override name="ccAddress" optional="true"/> <override name="bccAddress" optional="true"/> <override name="contentType" optional="true"/> </service> - <service name="removeProductStoreEmailSetting" engine="simple" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="removeProductStoreEmail" auth="true"> + <service name="removeProductStoreEmailSetting" default-entity-name="ProductStoreEmailSetting" engine="entity-auto" invoke="delete" auth="true"> <description>Remove a Product Store Email Setting</description> + <permission-service service-name="productStoreGenericPermission" main-action="DELETE"/> <auto-attributes entity-name="ProductStoreEmailSetting" include="pk" mode="IN" optional="false"/> </service> <!-- Product Store Shipping Method Services --> - <service name="createProductStoreShipMeth" default-entity-name="ProductStoreShipmentMeth" engine="simple" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="createProductStoreShipMeth" auth="true"> + <service name="createProductStoreShipMeth" default-entity-name="ProductStoreShipmentMeth" engine="entity-auto" invoke="create" auth="true"> <description>Create a Product Store Shipment Method</description> - <auto-attributes include="nonpk" mode="IN" optional="true"/> + <permission-service service-name="productStoreGenericPermission" main-action="CREATE"/> + <auto-attributes include="all" mode="IN" optional="true"/> + <auto-attributes include="pk" mode="OUT" optional="false"/> <override name="productStoreId" optional="false"/> <override name="shipmentMethodTypeId" optional="false"/> <override name="partyId" optional="false"/> <override name="roleTypeId" optional="false"/> </service> - <service name="updateProductStoreShipMeth" default-entity-name="ProductStoreShipmentMeth" engine="simple" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="updateProductStoreShipMeth" auth="true"> + <service name="updateProductStoreShipMeth" default-entity-name="ProductStoreShipmentMeth" engine="entity-auto" invoke="update" auth="true"> <description>Update a Product Store Shipment Method</description> + <permission-service service-name="productStoreGenericPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="removeProductStoreShipMeth" default-entity-name="ProductStoreShipmentMeth" engine="simple" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="removeProductStoreShipMeth" auth="true"> + <service name="removeProductStoreShipMeth" default-entity-name="ProductStoreShipmentMeth" engine="entity-auto" invoke="delete" auth="true"> <description>Remove a Product Store Shipment Method</description> + <permission-service service-name="productStoreGenericPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!-- Product Store Keyword Override services --> - <service name="createProductStoreKeywordOvrd" default-entity-name="ProductStoreKeywordOvrd" engine="simple" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="createProductStoreKeywordOvrd" auth="true"> + <service name="createProductStoreKeywordOvrd" default-entity-name="ProductStoreKeywordOvrd" engine="entity-auto" invoke="create" auth="true"> <description>Create a Product Store Keyword Override</description> + <permission-service service-name="productStoreGenericPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> <override name="target" optional="false"/> <override name="fromDate" optional="true"/> <override name="targetTypeEnumId" optional="false"/> </service> - <service name="updateProductStoreKeywordOvrd" default-entity-name="ProductStoreKeywordOvrd" engine="simple" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="updateProductStoreKeywordOvrd" auth="true"> + <service name="updateProductStoreKeywordOvrd" default-entity-name="ProductStoreKeywordOvrd" engine="entity-auto" invoke="update" auth="true"> <description>Update a Product Store Keyword Override</description> + <permission-service service-name="productStoreGenericPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="deleteProductStoreKeywordOvrd" default-entity-name="ProductStoreKeywordOvrd" engine="simple" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="deleteProductStoreKeywordOvrd" auth="true"> + <service name="deleteProductStoreKeywordOvrd" default-entity-name="ProductStoreKeywordOvrd" engine="entity-auto" invoke="delete" auth="true"> <description>Delete a Product Store Keyword Override</description> + <permission-service service-name="productStoreGenericPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> - <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <!-- ProductStoreSurveyAppl Services --> - <service name="createProductStoreSurveyAppl" default-entity-name="ProductStoreSurveyAppl" engine="simple" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="createProductStoreSurveyAppl" auth="true"> + <service name="createProductStoreSurveyAppl" default-entity-name="ProductStoreSurveyAppl" engine="entity-auto" invoke="create" auth="true"> <description>Create a Product Store Survey Appl</description> + <permission-service service-name="productStoreGenericPermission" main-action="CREATE"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> <auto-attributes include="pk" mode="OUT" optional="false"/> </service> - <service name="deleteProductStoreSurveyAppl" default-entity-name="ProductStoreSurveyAppl" engine="simple" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="removeProductStoreSurveyAppl" auth="true"> + <service name="deleteProductStoreSurveyAppl" default-entity-name="ProductStoreSurveyAppl" engine="entity-auto" invoke="delete" auth="true"> <description>Delete a Product Store Survey Appl</description> + <permission-service service-name="productStoreGenericPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> @@ -252,57 +252,60 @@ under the License. </service> <!-- ProductStoreFinActSetting Services --> - <service name="createProductStoreFinActSetting" default-entity-name="ProductStoreFinActSetting" engine="simple" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="createProductStoreFinActSetting" auth="true"> + <service name="createProductStoreFinActSetting" default-entity-name="ProductStoreFinActSetting" engine="entity-auto" invoke="create" auth="true"> <description>Create ProductStoreFinActSetting</description> + <permission-service service-name="productStoreGenericPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateProductStoreFinActSetting" default-entity-name="ProductStoreFinActSetting" engine="simple" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="updateProductStoreFinActSetting" auth="true"> + <service name="updateProductStoreFinActSetting" default-entity-name="ProductStoreFinActSetting" engine="entity-auto" invoke="update" auth="true"> <description>Update ProductStoreFinActSetting</description> + <permission-service service-name="productStoreGenericPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="removeProductStoreFinActSetting" default-entity-name="ProductStoreFinActSetting" engine="simple" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="removeProductStoreFinActSetting" auth="true"> + <service name="removeProductStoreFinActSetting" default-entity-name="ProductStoreFinActSetting" engine="entity-auto" invoke="delete" auth="true"> <description>Remove ProductStoreFinActSetting</description> + <permission-service service-name="productStoreGenericPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!--ProductStoreVendorPayment Services --> - <service name="createProductStoreVendorPayment" engine="simple" default-entity-name="ProductStoreVendorPayment" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="createProductStoreVendorPayment" auth="true"> + <service name="createProductStoreVendorPayment" engine="entity-auto" default-entity-name="ProductStoreVendorPayment" invoke="create" auth="true"> + <permission-service service-name="productStoreGenericPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> - <service name="deleteProductStoreVendorPayment" engine="simple" default-entity-name="ProductStoreVendorPayment" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="deleteProductStoreVendorPayment" auth="true"> + <service name="deleteProductStoreVendorPayment" engine="entity-auto" default-entity-name="ProductStoreVendorPayment" invoke="delete" auth="true"> + <permission-service service-name="productStoreGenericPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!--ProductStoreVendorShipment Services --> - <service name="createProductStoreVendorShipment" engine="simple" default-entity-name="ProductStoreVendorShipment" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="createProductStoreVendorShipment" auth="true"> + <service name="createProductStoreVendorShipment" default-entity-name="ProductStoreVendorShipment" engine="entity-auto" invoke="create" auth="true"> + <permission-service service-name="productStoreGenericPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> - <service name="deleteProductStoreVendorShipment" engine="simple" default-entity-name="ProductStoreVendorShipment" - location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="deleteProductStoreVendorShipment" auth="true"> + <service name="deleteProductStoreVendorShipment" default-entity-name="ProductStoreVendorShipment" engine="entity-auto" invoke="delete" auth="true"> + <permission-service service-name="productStoreGenericPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!--ProductStoreFacility Services --> <service name="createProductStoreFacility" default-entity-name="ProductStoreFacility" engine="entity-auto" invoke="create" auth="true"> <description>Create a ProductStoreFacility</description> + <permission-service service-name="productStoreGenericPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="updateProductStoreFacility" default-entity-name="ProductStoreFacility" engine="entity-auto" invoke="update" auth="true"> <description>Update a ProductStoreFacility</description> + <permission-service service-name="productStoreGenericPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="deleteProductStoreFacility" default-entity-name="ProductStoreFacility" engine="entity-auto" invoke="delete" auth="true"> <description>Delete a ProductStoreFacility</description> + <permission-service service-name="productStoreGenericPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> @@ -349,4 +352,10 @@ under the License. <attribute name="parentGroupId" mode="IN" type="String" optional="true"/> <attribute name="fromDate" mode="IN" type="String" optional="true"/> </service> + + <!-- Permission Services --> + <service name="productStoreGenericPermission" engine="simple" + location="component://product/script/org/ofbiz/product/store/ProductStoreServices.xml" invoke="productStoreGenericPermission"> + <implements service="permissionInterface"/> + </service> </services> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_subscription.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_subscription.xml?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_subscription.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_subscription.xml Mon Sep 8 06:04:39 2014 @@ -30,8 +30,7 @@ under the License. <auto-attributes include="pk" mode="INOUT" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateSubscription" default-entity-name="Subscription" auth="true" engine="simple" - location="component://product/script/org/ofbiz/product/subscription/SubscriptionServices.xml" invoke="updateSubscription"> + <service name="updateSubscription" default-entity-name="Subscription" auth="true" engine="entity-auto" invoke="update"> <description>Update a Subscription Record</description> <permission-service service-name="subscriptionPermissionCheck" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -57,38 +56,33 @@ under the License. <attribute name="subscription" type="org.ofbiz.entity.GenericValue" mode="OUT" optional="true"/> </service> - <service name="createSubscriptionResource" default-entity-name="SubscriptionResource" auth="true" engine="simple" - location="component://product/script/org/ofbiz/product/subscription/SubscriptionServices.xml" invoke="createSubscriptionResource"> + <service name="createSubscriptionResource" default-entity-name="SubscriptionResource" auth="true" engine="entity-auto" invoke="create"> <description>Create a SubscriptionResource Record</description> <permission-service service-name="subscriptionPermissionCheck" main-action="CREATE"/> <auto-attributes include="pk" mode="OUT" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateSubscriptionResource" default-entity-name="SubscriptionResource" auth="true" engine="simple" - location="component://product/script/org/ofbiz/product/subscription/SubscriptionServices.xml" invoke="updateSubscriptionResource"> + <service name="updateSubscriptionResource" default-entity-name="SubscriptionResource" auth="true" engine="entity-auto" invoke="update"> <description>Update a SubscriptionResource Record</description> <permission-service service-name="subscriptionPermissionCheck" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="createProductSubscriptionResource" default-entity-name="ProductSubscriptionResource" auth="true" engine="simple" - location="component://product/script/org/ofbiz/product/subscription/SubscriptionServices.xml" invoke="createProductSubscriptionResource"> + <service name="createProductSubscriptionResource" default-entity-name="ProductSubscriptionResource" auth="true" engine="entity-auto" invoke="create"> <description>Create a ProductSubscriptionResource Record</description> <permission-service service-name="subscriptionPermissionCheck" main-action="CREATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> <override name="fromDate" optional="true"/> </service> - <service name="updateProductSubscriptionResource" default-entity-name="ProductSubscriptionResource" auth="true" engine="simple" - location="component://product/script/org/ofbiz/product/subscription/SubscriptionServices.xml" invoke="updateProductSubscriptionResource"> + <service name="updateProductSubscriptionResource" default-entity-name="ProductSubscriptionResource" auth="true" engine="entity-auto" invoke="update"> <description>Update a ProductSubscriptionResource Record</description> <permission-service service-name="subscriptionPermissionCheck" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="deleteProductSubscriptionResource" default-entity-name="ProductSubscriptionResource" auth="true" engine="simple" - location="component://product/script/org/ofbiz/product/subscription/SubscriptionServices.xml" invoke="deleteProductSubscriptionResource"> + <service name="deleteProductSubscriptionResource" default-entity-name="ProductSubscriptionResource" auth="true" engine="entity-auto" invoke="delete"> <description>Delete a ProductSubscriptionResource Record</description> <permission-service service-name="subscriptionPermissionCheck" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -139,17 +133,15 @@ under the License. <attribute name="attrValue" type="String" mode="IN" optional="true"/> </service> - <service name="createSubscriptionCommEvent" engine="simple" - location="component://product/script/org/ofbiz/product/subscription/SubscriptionServices.xml" invoke="createSubscriptionCommEvent" auth="true"> + <service name="createSubscriptionCommEvent" default-entity-name="SubscriptionCommEvent" engine="entity-auto" invoke="create" auth="true"> <description>Create a Subscription Communication Event</description> <permission-service service-name="subscriptionPermissionCheck" main-action="CREATE"/> - <auto-attributes entity-name="SubscriptionCommEvent" include="pk" mode="IN" optional="false"/> + <auto-attributes include="pk" mode="IN" optional="false"/> </service> - <service name="removeSubscriptionCommEvent" engine="simple" - location="component://product/script/org/ofbiz/product/subscription/SubscriptionServices.xml" invoke="removeSubscriptionCommEvent" auth="true"> + <service name="removeSubscriptionCommEvent" default-entity-name="SubscriptionCommEvent" engine="entity-auto" invoke="delete" auth="true"> <description>Remove a Subscription Communication Event</description> <permission-service service-name="subscriptionPermissionCheck" main-action="DELETE"/> - <auto-attributes entity-name="SubscriptionCommEvent" include="pk" mode="IN" optional="false"/> + <auto-attributes include="pk" mode="IN" optional="false"/> </service> <service name="subscriptionPermissionCheck" engine="simple" Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/facility/CountFacilityInventoryByProduct.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/facility/CountFacilityInventoryByProduct.groovy?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/facility/CountFacilityInventoryByProduct.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/facility/CountFacilityInventoryByProduct.groovy Mon Sep 8 06:04:39 2014 @@ -31,7 +31,6 @@ // need it (but it is slower than this one). import org.ofbiz.base.util.Debug -import org.ofbiz.base.util.ObjectType import org.ofbiz.entity.* import org.ofbiz.entity.condition.* import org.ofbiz.entity.transaction.* @@ -40,12 +39,10 @@ import org.ofbiz.entity.model.DynamicVie import org.ofbiz.entity.model.ModelKeyMap import org.ofbiz.entity.model.ModelViewEntity.ComplexAlias import org.ofbiz.entity.model.ModelViewEntity.ComplexAliasField -import org.ofbiz.entity.model.ModelViewEntity.ComplexAliasMember import org.ofbiz.product.inventory.* action = request.getParameter("action"); -searchParameterString = ""; searchParameterString = "action=Y&facilityId=" + facilityId; offsetQOH = -1; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ConfigScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ConfigScreens.xml?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ConfigScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ConfigScreens.xml Mon Sep 8 06:04:39 2014 @@ -185,8 +185,8 @@ under the License. <not><if-empty field="productId"/></not> </condition> <widgets> - <screenlet title="${uiLabelMap.CommonEdit} ${uiLabelMap.ProductConfigs}"> - <link style="buttontext" text="${uiLabelMap.CommonNew} ${uiLabelMap.ProductConfigs}" target="EditProductConfigOptions"> + <screenlet title="${uiLabelMap.AddProductComponent}"> + <link style="buttontext" text="${uiLabelMap.AddProductComponent}" target="EditProductConfigOptions"> <parameter param-name="configItemId"/> <parameter param-name="configOptionId"/> </link> @@ -194,8 +194,8 @@ under the License. </screenlet> </widgets> <fail-widgets> - <screenlet title="${uiLabelMap.CommonAddA} ${uiLabelMap.ProductConfigs}"> - <link style="buttontext" text="${uiLabelMap.CommonNew} ${uiLabelMap.ProductConfigs}" target="EditProductConfigOptions"> + <screenlet title="${uiLabelMap.AddProductComponent}"> + <link style="buttontext" text="${uiLabelMap.AddProductComponent}" target="EditProductConfigOptions"> <parameter param-name="configItemId"/> <parameter param-name="configOptionId"/> </link> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java Mon Sep 8 06:04:39 2014 @@ -212,6 +212,9 @@ public class LoginEvents { if (useEncryption) { // password encrypted, can't send, generate new password and email to user passwordToSend = RandomStringUtils.randomAlphanumeric(Integer.parseInt(UtilProperties.getPropertyValue("security", "password.length.min", "5"))); + if ("true".equals(UtilProperties.getPropertyValue("security.properties", "password.lowercase"))){ + passwordToSend=passwordToSend.toLowerCase(); + } supposedUserLogin.set("currentPassword", HashCrypt.cryptUTF8(LoginServices.getHashType(), null, passwordToSend)); supposedUserLogin.set("passwordHint", "Auto-Generated Password"); if ("true".equals(UtilProperties.getPropertyValue("security.properties", "password.email_password.require_password_change"))){ Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java?rev=1623295&r1=1623294&r2=1623295&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java Mon Sep 8 06:04:39 2014 @@ -20,7 +20,6 @@ package org.ofbiz.workeffort.workeffort; import java.io.IOException; -import java.io.OutputStreamWriter; import java.io.Writer; import java.util.Date; import java.util.Enumeration; @@ -29,7 +28,6 @@ import java.util.Map; import javax.servlet.ServletContext; import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; @@ -40,7 +38,6 @@ import javolution.util.FastMap; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilHttp; -import org.ofbiz.base.util.UtilJ2eeCompat; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; @@ -142,17 +139,6 @@ public class ICalWorker { } } - protected static Writer getWriter(HttpServletResponse response, ServletContext context) throws IOException { - Writer writer = null; - if (UtilJ2eeCompat.useOutputStreamNotWriter(context)) { - ServletOutputStream ros = response.getOutputStream(); - writer = new OutputStreamWriter(ros, "UTF-8"); - } else { - writer = response.getWriter(); - } - return writer; - } - public static void handleGetRequest(HttpServletRequest request, HttpServletResponse response, ServletContext context) throws ServletException, IOException { if (!isValidRequest(request, response)) { return; @@ -221,7 +207,7 @@ public class ICalWorker { Debug.logVerbose("[handlePropFindRequest] PROPFIND response:\r\n" + UtilXml.writeXmlDocument(responseDocument), module); } ResponseHelper.prepareResponse(response, 207, "Multi-Status"); - Writer writer = getWriter(response, context); + Writer writer = response.getWriter(); try { helper.writeResponse(response, writer); } finally { @@ -332,7 +318,7 @@ public class ICalWorker { } if (responseProps.statusMessage != null) { response.setContentLength(responseProps.statusMessage.length()); - Writer writer = getWriter(response, context); + Writer writer = response.getWriter(); try { writer.write(responseProps.statusMessage); } finally {
