svn commit: r1094250 [3/4] - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1094250 [3/4] - in /ofbiz/branches/jackrabbit2010
 
|
Modified: ofbiz/branches/jackrabbit20100709/applications/product/config/ProductEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/config/ProductEntityLabels.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/config/ProductEntityLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/config/ProductEntityLabels.xml Mon Apr 18 06:21:43 2011 @@ -451,6 +451,10 @@ <value xml:lang="zh">æµè§æ ¹ (ä¸ä¸ª)</value> <value xml:lang="zh_TW">çè¦½æ ¹ (ä¸å)</value> </property> + <property key="ProdCatalogCategoryType.description.PCCT_EBAY_ROOT"> + <value xml:lang="de">Ebay Root (Eine)</value> + <value xml:lang="en">Ebay Root (One)</value> + </property> <property key="ProdCatalogCategoryType.description.PCCT_MOST_POPULAR"> <value xml:lang="de">Am populärsten (Eine)</value> <value xml:lang="en">Most Popular (One)</value> @@ -500,7 +504,7 @@ <value xml:lang="zh_TW">å 許購買 (ä¸å)</value> </property> <property key="ProdCatalogCategoryType.description.PCCT_QUICK_ADD"> - <value xml:lang="de">Rasches Hinzufügen (mehrere)</value> + <value xml:lang="de">Rasches Hinzufügen (Mehrere)</value> <value xml:lang="en">Quick Add (Many)</value> <value xml:lang="es">Añadir rápido (muchos)</value> <value xml:lang="fr">Ajout rapide (plusieurs)</value> @@ -883,6 +887,10 @@ <value xml:lang="zh">页è</value> <value xml:lang="zh_TW">é è ³</value> </property> + <property key="ProductCategoryContentType.description.GIFT_CARD_CATEGORY"> + <value xml:lang="de">Gutschein</value> + <value xml:lang="en">Gift Card</value> + </property> <property key="ProductCategoryContentType.description.LINK1_ALT_TEXT"> <value xml:lang="de">Link 1 Alternativtext</value> <value xml:lang="en">Link 1 Alt Text</value> @@ -933,6 +941,10 @@ <value xml:lang="zh">交åéå®</value> <value xml:lang="zh_TW">交åé·å®</value> </property> + <property key="ProductCategoryType.description.GIFT_CARD_CATEGORY"> + <value xml:lang="de">Gutscheine</value> + <value xml:lang="en">Gift Cards</value> + </property> <property key="ProductCategoryType.description.INDUSTRY_CATEGORY"> <value xml:lang="de">Industrie</value> <value xml:lang="en">Industry</value> Modified: ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml Mon Apr 18 06:21:43 2011 @@ -19,6 +19,10 @@ under the License. --> <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <property key="AddNewProductFeatureToProduct"> + <value xml:lang="de">Neues Merkmal für dieses Produkt erstellen</value> + <value xml:lang="en">Add new Product Feature to current product</value> + </property> <property key="Approve"> <value xml:lang="en">Approve</value> <value xml:lang="th">ยืà¸à¸¢à¸±à¸</value> @@ -58,6 +62,10 @@ <value xml:lang="en">Choose Replacement Image</value> <value xml:lang="th">à¹à¸¥à¸·à¸à¸à¸ าà¸à¸à¸µà¹à¸à¸°à¹à¸à¸à¸à¸µà¹</value> </property> + <property key="CreateNewProductFeatureType"> + <value xml:lang="de">Neuen Merkmaltyp erstellen</value> + <value xml:lang="en">Create New Product Feature Type</value> + </property> <property key="FacilityActualShippingCharges"> <value xml:lang="en">Actual shipping charges</value> <value xml:lang="it">Ricarico di spedizione attuale</value> @@ -3852,6 +3860,10 @@ <value xml:lang="zh">ä¸ä¸ªåºååºæ</value> <value xml:lang="zh_TW">åè²¨å ´æå</value> </property> + <property key="FormFieldTitle_orderDecimalQuantity"> + <value xml:lang="en">Allow order decimal quantity</value> + <value xml:lang="fr">Accepte les commandes à quantité décimale</value> + </property> <property key="FormFieldTitle_orderFlatPrice"> <value xml:lang="de">Auftrag Pauschalpreis</value> <value xml:lang="en">Order Flat Price</value> @@ -4297,6 +4309,7 @@ <value xml:lang="zh_TW">ç¢åç¹æ§ID</value> </property> <property key="FormFieldTitle_productFeatureIdTo"> + <value xml:lang="de">Produktmerkmal ID zu</value> <value xml:lang="en">Product Feature Id To</value> <value xml:lang="fr">Réf. de caractéristique de produit dest.</value> <value xml:lang="it">Caratteristica prodotto a</value> @@ -5548,7 +5561,7 @@ <value xml:lang="zh_TW">å®ä½å å«å¨å §</value> </property> <property key="FormFieldTitle_useCountLimit"> - <value xml:lang="de">Verwendung Anzahl Limite</value> + <value xml:lang="de">Verwende Anzahlbegrenzung</value> <value xml:lang="en">Use Count Limit</value> <value xml:lang="es">Usar el lÃmite de contador</value> <value xml:lang="fr">Limite d'utilisation du compte</value> @@ -5572,13 +5585,14 @@ <value xml:lang="zh_TW">使ç¨å¤©æ¸éå¶</value> </property> <property key="FormFieldTitle_useLimitPerCode"> + <value xml:lang="de">Verwende "pro Code" Begrenzung</value> <value xml:lang="en">Use Limit Per Code</value> <value xml:lang="it">Usa limite per codice</value> <value xml:lang="zh">æ¯ä¸ªä»£ç 使ç¨éå¶</value> <value xml:lang="zh_TW">æ¯å代碼使ç¨éå¶</value> </property> <property key="FormFieldTitle_useLimitPerCustomer"> - <value xml:lang="de">Verwendung begrenzen pro Kunde</value> + <value xml:lang="de">Verwende "pro Kunde" Begrenzung</value> <value xml:lang="en">Use Limit Per Customer</value> <value xml:lang="es">Usar lÃmite por cliente</value> <value xml:lang="fr">Limite par client</value> @@ -5590,7 +5604,7 @@ <value xml:lang="zh_TW">æ¯å客æ¶ä½¿ç¨éå¶</value> </property> <property key="FormFieldTitle_useLimitPerOrder"> - <value xml:lang="de">Verwendung begrenzen pro Auftrag</value> + <value xml:lang="de">Verwende "pro Auftrag" Begrenzung</value> <value xml:lang="en">Use Limit Per Order</value> <value xml:lang="es">Usar lÃmite por pedido</value> <value xml:lang="fr">Limite par commande</value> @@ -5602,7 +5616,7 @@ <value xml:lang="zh_TW">æ¯åè¨å®ä½¿ç¨éå¶</value> </property> <property key="FormFieldTitle_useLimitPerPromotion"> - <value xml:lang="de">Verwendung begrenzen pro Aktion</value> + <value xml:lang="de">Verwende "pro Aktion" Begrenzung</value> <value xml:lang="en">Use Limit Per Promotion</value> <value xml:lang="es">Usar lÃmite por promoción</value> <value xml:lang="fr">Limite par promotion</value> @@ -5674,7 +5688,8 @@ <value xml:lang="zh_TW">ç¨æ¶è¼¸å ¥</value> </property> <property key="FormFieldTitle_validateGCFinAcct"> - <value xml:lang="en">Validate GC Fin Acct</value> + <value xml:lang="de">Bestätigen Sie das Finanzkonto des Gutscheins</value> + <value xml:lang="en">Validate the Gift Card's financial Account</value> <value xml:lang="fr">Valider le compte financier de la carte cadeau</value> <value xml:lang="it">Valida carta regalo conto finanaza</value> <value xml:lang="zh">éªè¯ç¤¼åå¡éèè´¦æ·</value> @@ -5781,10 +5796,12 @@ <value xml:lang="zh_TW">å·¥é æåè¦ç¯é¡åID</value> </property> <property key="Gallery"> + <value xml:lang="de">Gallerie</value> <value xml:lang="en">Gallery</value> <value xml:lang="th">à¹à¸à¸¥à¸¥à¸à¸£à¸µà¹</value> </property> <property key="ImageApprove"> + <value xml:lang="de">Bestätigen</value> <value xml:lang="en">Approve</value> <value xml:lang="th">ยืà¸à¸¢à¸±à¸à¸£à¸¹à¸à¸ าà¸</value> </property> @@ -10886,10 +10903,12 @@ <value xml:lang="zh_TW">æ¢ä»¶</value> </property> <property key="ProductConditionsActionsRemoveBefore"> + <value xml:lang="de">Um eine Preisregel zu löschen, müssen entweder zuerst alle dazugehörigen Bedingungen und Aktionen entfernt ODER die Regel über das Ablaufdatum deaktiviert werden</value> <value xml:lang="en">To remove a price rule, you must before remove all conditions and actions OR disable it by entering a Thru Date</value> <value xml:lang="fr">Pour supprimer une règle de prix, vous devez d'abord supprimer toutes les conditions et actions. Vous pouvez aussi la désactiver en entrant une date de fin appropriée</value> </property> <property key="ProductConditionsThenActions"> + <value xml:lang="de">Wenn mehrere Bedingungen eingegeben wurde, sind sie logisch UND verknüpft. Daher müssen alle Bedingungen WAHR sein und die Preisregel auszuführen (gleiches für Aktionen)</value> <value xml:lang="en">If multiple conditions are entered they are tested logically as and AND statement. Therefore all Conditions must be TRUE for the price rule to execute (same for actions)</value> <value xml:lang="fr">Si toutes les conditions sont vérifiées, alors les actions sont exécutées (autrement dit ET logique entre conditions, de même pour les actions)</value> </property> @@ -13249,8 +13268,8 @@ <value xml:lang="zh_TW">ç¹æ§åé¡</value> </property> <property key="ProductFeatureCategoryAttach"> - <value xml:lang="de">Merkmale zur Kategorie hinzufügen von Produkten</value> - <value xml:lang="en">Attach Features to Category from Products</value> + <value xml:lang="de">Produktmerkmale zur Kategorie hinzufügen</value> + <value xml:lang="en">Attach Productfeatures to Category</value> <value xml:lang="es">Adjuntar caracterÃsticas a categorÃa de productos</value> <value xml:lang="fr">Associé les caractéristiques à la catégorie depuis les articles</value> <value xml:lang="it">Associa caratteristiche alla categoria di prodotti</value> @@ -17657,6 +17676,10 @@ <value xml:lang="zh">æè è¾å ¥ä¸ä¸ªå®¹å¨æ è¯</value> <value xml:lang="zh_TW">æè è¼¸å ¥ä¸å容å¨ID</value> </property> + <property key="ProductOrderDecimalQuantityExistsToOverride"> + <value xml:lang="en">Allow decimal quantity to order can be define by product</value> + <value xml:lang="fr">La possibilité de commandé une quantité décimal peut être définie par produit</value> + </property> <property key="ProductOrderId"> <value xml:lang="de">Auftrag ID</value> <value xml:lang="en">Order ID</value> @@ -18988,10 +19011,12 @@ <value xml:lang="zh_TW">ç¢ååé¡</value> </property> <property key="ProductProductCategoryName"> + <value xml:lang="de">Produktkategorie Name</value> <value xml:lang="en">Product Category Name</value> <value xml:lang="it">Nome categoria prodotti</value> </property> <property key="ProductProductCategoryDescription"> + <value xml:lang="de">Produktkategorie Beschreibung</value> <value xml:lang="en">Product Category Description</value> <value xml:lang="it">Descrizione categoria prodotti</value> </property> Modified: ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml Mon Apr 18 06:21:43 2011 @@ -2729,6 +2729,7 @@ under the License. <field name="lastModifiedByUserLogin" type="id-vlong"></field> <field name="inShippingBox" type="indicator"></field> <field name="defaultShipmentBoxTypeId" type="id"></field> + <field name="orderDecimalQuantity" type="indicator"><description>use to indicate if decimal quantity can be ordered for this product. Default value is Y</description></field> <prim-key field="productId"/> <relation type="one" fk-name="PROD_TYPE" rel-entity-name="ProductType"> <key-map field-name="productTypeId"/> @@ -3755,6 +3756,7 @@ under the License. <field name="addToCartReplaceUpsell" type="indicator"><description>Default N. If Y then on add to cart remove all products in cart with a ProductAssoc record related from the product and with the PRODUCT_UPGRADE type.</description></field> <field name="splitPayPrefPerShpGrp" type="indicator"><description>Default N. If Y then before the order is stored the OrderPaymentPreference record will be split, one for each OrderItemShipGroup.</description></field> <field name="showOutOfStockProducts" type="indicator"><description>Default Y. If N then out of stock products will not be displayed on site</description></field> + <field name="orderDecimalQuantity" type="indicator"><description>use to indicate if decimal quantity can be ordered for this producStore. Default value is Y</description></field> <!-- old fields, deprecated --> <field name="oldStyleSheet" col-name="STYLE_SHEET" type="url"></field> Propchange: ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/test/InventoryTests.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 18 06:21:43 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-952957 /ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:952958-1044489 /ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264 -/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:962442-1090146 +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:962442-1094239 Modified: ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/product/ProductWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/product/ProductWorker.java?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/product/ProductWorker.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/product/ProductWorker.java Mon Apr 18 06:21:43 2011 @@ -1171,4 +1171,22 @@ nextProd: } } + /** + * worker to test if product can be order with a decimal quantity + * @param delegator : access to DB + * @param poductId : ref. of product + * * @param productStoreId : ref. of store + * @return true if it can be ordered by decimal quantity + * @throws GenericEntityException to catch + */ + public static Boolean isDecimalQuantityOrderAllowed(Delegator delegator, String poductId, String productStoreId) throws GenericEntityException{ + String allowDecimalStore = delegator.findOne("ProductStore", Boolean.TRUE, UtilMisc.toMap("productStoreId", productStoreId)).getString("orderDecimalQuantity"); + String allowDecimalProduct = delegator.findOne("Product", Boolean.TRUE, UtilMisc.toMap("productId", poductId)).getString("orderDecimalQuantity"); + + if("N".equals(allowDecimalProduct) || (UtilValidate.isEmpty(allowDecimalProduct) && "N".equals(allowDecimalStore))){ + return Boolean.FALSE; + } + return Boolean.TRUE; + } + } Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductForms.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductForms.xml Mon Apr 18 06:21:43 2011 @@ -257,6 +257,9 @@ under the License. <field use-when="product!=null" position="2" name="createdByText" title="${uiLabelMap.CommonCreatedBy}:"> <display description="[${product.createdByUserLogin}] ${uiLabelMap.CommonOn} ${product.createdDate}" also-hidden="false"/> </field> + <field name="orderDecimalQuantity" > + <drop-down allow-empty="true" ><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> + </field> <sort-order> <field-group> <sort-field name="productId"/> @@ -322,6 +325,9 @@ under the License. <sort-field name="defaultShipmentBoxTypeId"/> <sort-field name="chargeShipping"/> </field-group> + <field-group title="${uiLabelMap.CommonShoppingCart}" collapsible="true" initially-collapsed="true"> + <sort-field name="orderDecimalQuantity"/> + </field-group> <field-group title="${uiLabelMap.CommonMiscellaneous}" collapsible="true" initially-collapsed="true"> <sort-field name="returnable"/> <sort-field name="includeInPromotions"/> Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductStoreForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductStoreForms.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductStoreForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductStoreForms.xml Mon Apr 18 06:21:43 2011 @@ -305,6 +305,9 @@ <field name="reqReturnInventoryReceive"> <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> + <field name="orderDecimalQuantity" tooltip="${uiLabelMap.ProductOrderDecimalQuantityExistsToOverride}"> + <drop-down allow-empty="true" ><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> + </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> <sort-order> <field-group> @@ -336,6 +339,7 @@ <sort-field name="addToCartRemoveIncompat"/> <sort-field name="showCheckoutGiftOptions"/> <sort-field name="prodSearchExcludeVariants"/> + <sort-field name="orderDecimalQuantity"/> </field-group> <field-group title="${uiLabelMap.CommonShipping}" collapsible="true" initially-collapsed="true"> <sort-field name="prorateShipping"/> Modified: ofbiz/branches/jackrabbit20100709/framework/base/config/DateTimeLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/config/DateTimeLabels.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/base/config/DateTimeLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/base/config/DateTimeLabels.xml Mon Apr 18 06:21:43 2011 @@ -23,6 +23,7 @@ <value xml:lang="en">hours</value> <value xml:lang="es">horas</value> <value xml:lang="fr">Heures</value> + <value xml:lang="it">ore</value> <value xml:lang="pt">horas</value> <value xml:lang="ru">ÑаÑÑ</value> <value xml:lang="th">à¸à¸±à¹à¸§à¹à¸¡à¸</value> @@ -34,6 +35,7 @@ <value xml:lang="en">hour</value> <value xml:lang="es">hora</value> <value xml:lang="fr">Heure</value> + <value xml:lang="it">ora</value> <value xml:lang="pt">hora</value> <value xml:lang="ru">ÑаÑ</value> <value xml:lang="th">à¸à¸±à¹à¸§à¹à¸¡à¸</value> @@ -45,6 +47,7 @@ <value xml:lang="en">millliseconds</value> <value xml:lang="es">milisegundos</value> <value xml:lang="fr">Milllisecondes</value> + <value xml:lang="it">millisecondi</value> <value xml:lang="pt">milisegundos</value> <value xml:lang="ru">миллиÑекÑндÑ</value> <value xml:lang="th">หà¸à¸¶à¹à¸à¹à¸à¸à¸±à¸à¸à¸à¸à¸«à¸à¸¶à¹à¸à¸§à¸´à¸à¸²à¸à¸µ</value> @@ -56,6 +59,7 @@ <value xml:lang="en">milllisecond</value> <value xml:lang="es">milisegundo</value> <value xml:lang="fr">Millliseconde</value> + <value xml:lang="it">millisecondo</value> <value xml:lang="pt">milisegundo</value> <value xml:lang="ru">миллиÑекÑнда</value> <value xml:lang="th">หà¸à¸¶à¹à¸à¹à¸à¸à¸±à¸à¸à¸à¸à¸«à¸à¸¶à¹à¸à¸§à¸´à¸à¸²à¸à¸µ</value> @@ -67,6 +71,7 @@ <value xml:lang="en">minutes</value> <value xml:lang="es">minutos</value> <value xml:lang="fr">Minutes</value> + <value xml:lang="it">minuti</value> <value xml:lang="pt">minutos</value> <value xml:lang="ru">минÑÑÑ</value> <value xml:lang="th">à¸à¸²à¸à¸µ</value> @@ -78,6 +83,7 @@ <value xml:lang="en">minute</value> <value xml:lang="es">minuto</value> <value xml:lang="fr">Minute</value> + <value xml:lang="it">minuto</value> <value xml:lang="pt">minuto</value> <value xml:lang="ru">минÑÑа</value> <value xml:lang="th">à¸à¸²à¸à¸µ</value> @@ -89,6 +95,7 @@ <value xml:lang="en">seconds</value> <value xml:lang="es">segundos</value> <value xml:lang="fr">Secondes</value> + <value xml:lang="it">secondi</value> <value xml:lang="pt">segundos</value> <value xml:lang="ru">ÑекÑндÑ</value> <value xml:lang="th">วิà¸à¸²à¸à¸µ</value> @@ -100,6 +107,7 @@ <value xml:lang="en">second</value> <value xml:lang="es">segundo</value> <value xml:lang="fr">seconde</value> + <value xml:lang="it">secondo</value> <value xml:lang="pt">segundo</value> <value xml:lang="ru">ÑекÑнда</value> <value xml:lang="th">วิà¸à¸²à¸à¸µ</value> @@ -111,6 +119,7 @@ <value xml:lang="en">weeks</value> <value xml:lang="es">semanas</value> <value xml:lang="fr">Semaines</value> + <value xml:lang="it">settimane</value> <value xml:lang="pt">semanas</value> <value xml:lang="ru">недели</value> <value xml:lang="th">สัà¸à¸à¸²à¸«à¹</value> @@ -122,6 +131,7 @@ <value xml:lang="en">week</value> <value xml:lang="es">semana</value> <value xml:lang="fr">Semaine</value> + <value xml:lang="it">settimana</value> <value xml:lang="pt">semana</value> <value xml:lang="ru">неделÑ</value> <value xml:lang="th">สัà¸à¸à¸²à¸«à¹</value> Modified: ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/location/ComponentLocationResolver.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/location/ComponentLocationResolver.java?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/location/ComponentLocationResolver.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/location/ComponentLocationResolver.java Mon Apr 18 06:21:43 2011 @@ -39,12 +39,8 @@ public class ComponentLocationResolver i StringBuffer baseLocation = ComponentLocationResolver.getBaseLocation(location); URL fileUrl = UtilURL.fromFilename(baseLocation.toString()); - if (fileUrl == null) { - if (location.indexOf("jquery.ui.datepicker") > -1) { - Debug.logWarning("A jquery.ui.datepicker i18n file is missing for the language.country couple you want. Simply add it there: [" + baseLocation + "]. Else anyway the 'en' default will be used", module); - } else { - Debug.logWarning("Unable to get file URL for component location; expanded location was [" + baseLocation + "], original location was [" + location + "]", module); - } + if (fileUrl == null) { + Debug.logWarning("Unable to get file URL for component location; expanded location was [" + baseLocation + "], original location was [" + location + "]", module); } return fileUrl; } Modified: ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml Mon Apr 18 06:21:43 2011 @@ -1329,7 +1329,7 @@ <value xml:lang="es">Limpiar</value> <value xml:lang="fr">Effacer</value> <value xml:lang="hi_IN">साफ़ à¤à¤°à¥à¤</value> - <value xml:lang="it">Azzera</value> + <value xml:lang="it">Pulisci</value> <value xml:lang="nl">Wis</value> <value xml:lang="pt">Limpar</value> <value xml:lang="ro">Azereaza</value> @@ -1345,7 +1345,7 @@ <value xml:lang="es">Limpiar todo</value> <value xml:lang="fr">Tout effacer</value> <value xml:lang="hi_IN">सà¤à¥ साफ à¤à¤°à¥à¤</value> - <value xml:lang="it">Azzera tutto</value> + <value xml:lang="it">Pulisci tutto</value> <value xml:lang="pt">Limpar Tudo</value> <value xml:lang="ru">ÐÑÑиÑÑиÑÑ Ð²Ñе</value> <value xml:lang="th">à¹à¸à¸¥à¸µà¸¢à¸£à¹à¸à¸±à¹à¸à¸«à¸¡à¸</value> @@ -1356,7 +1356,7 @@ <value xml:lang="en">Clear Current</value> <value xml:lang="fr">Vider l'en cours</value> <value xml:lang="hi_IN">वरà¥à¤¤à¤®à¤¾à¤¨ à¤à¥ साफ़ à¤à¤°à¥à¤</value> - <value xml:lang="it">Pulisci Attuale</value> + <value xml:lang="it">Pulisci attuale</value> <value xml:lang="pt_BR">Limpar atual</value> <value xml:lang="th">ยà¸à¹à¸¥à¸´à¸à¸à¸µà¹à¹à¸à¹à¸à¸à¸±à¸à¸à¸¸à¸à¸±à¸</value> <value xml:lang="zh">æ¸ é¤å½åç</value> @@ -2254,6 +2254,7 @@ <value xml:lang="zh_TW">ç¡æ</value> </property> <property key="CommonDisplaying"> + <value xml:lang="de">Zeige ${lowCount} - ${highCount} von ${total}</value> <value xml:lang="en">Displaying ${lowCount} - ${highCount} of ${total}</value> <value xml:lang="es">Mostrando ${lowCount} - ${highCount} de ${total}</value> <value xml:lang="fr">Affichage de ${lowCount} à ${highCount} sur ${total}</value> @@ -3117,7 +3118,7 @@ <value xml:lang="es">Los siguientes errores ocurrieron</value> <value xml:lang="fr">Erreur(s) </value> <value xml:lang="hi_IN">निमà¥à¤¨à¤²à¤¿à¤à¤¿à¤¤ तà¥à¤°à¥à¤à¤¿à¤¯à¤¾à¤ à¤à¤à¤¿à¤¤ हà¥à¤</value> - <value xml:lang="it">Il seguente errore è accaduto</value> + <value xml:lang="it">Errore</value> <value xml:lang="nl">De volgende fouten kwamen voor</value> <value xml:lang="pt">Ocorreram os Seguintes Erros</value> <value xml:lang="pt_BR">Os seguintes erros ocorreram</value> @@ -3135,7 +3136,7 @@ <value xml:lang="es">Ocurrió lo siguiente</value> <value xml:lang="fr">Information sur l'action effectuée</value> <value xml:lang="hi_IN">निमà¥à¤¨à¤²à¤¿à¤à¤¿à¤¤ हà¥à¤</value> - <value xml:lang="it">Informazioni sul comando eseguito</value> + <value xml:lang="it">Informazione</value> <value xml:lang="nl">Het volgende gebeurde</value> <value xml:lang="pt">Ocorreu o seguinte</value> <value xml:lang="ro">S-au intamplat urmatoarele</value> @@ -4159,6 +4160,7 @@ <value xml:lang="zh_TW">æç´°</value> </property> <property key="CommonItemsPerPage"> + <value xml:lang="de">Elemente pro Seite</value> <value xml:lang="en">Items per page</value> <value xml:lang="fr">Ãléments par page</value> <value xml:lang="it">Righe per pagina</value> @@ -9102,7 +9104,7 @@ <value xml:lang="es">Código de usuario</value> <value xml:lang="fr">Identifiant de connexion</value> <value xml:lang="hi_IN">पà¥à¤°à¤¯à¥à¤à¥à¤¤à¤¾ लà¥à¤à¤¿à¤¨ à¤à¥à¤°à¤®à¤¾à¤à¤</value> - <value xml:lang="it">Codice utente login</value> + <value xml:lang="it">Codice utente</value> <value xml:lang="nl">User Login Id</value> <value xml:lang="pt_BR">ID de nome de usuário</value> <value xml:lang="pt_PT">Identificação de InÃcio de Secção</value> @@ -10968,7 +10970,7 @@ <value xml:lang="es">Participante</value> <value xml:lang="fr">Acteurs</value> <value xml:lang="hi_IN">पारà¥à¤à¥</value> - <value xml:lang="it">Soggetto</value> + <value xml:lang="it">Soggetti</value> <value xml:lang="nl">Partij</value> <value xml:lang="pt">Participante</value> <value xml:lang="ro">Subiecti</value> @@ -11002,7 +11004,7 @@ <value xml:lang="es">Proyecto</value> <value xml:lang="fr">Projets</value> <value xml:lang="hi_IN">परियà¥à¤à¤¨à¤¾</value> - <value xml:lang="it">Progetto</value> + <value xml:lang="it">Progetti</value> <value xml:lang="pt_BR">Projeto</value> <value xml:lang="th">à¹à¸à¸£à¹à¸à¸</value> <value xml:lang="zh">项ç®</value> Modified: ofbiz/branches/jackrabbit20100709/framework/common/config/SecurityUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/config/SecurityUiLabels.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/config/SecurityUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/config/SecurityUiLabels.xml Mon Apr 18 06:21:43 2011 @@ -25,7 +25,7 @@ <value xml:lang="es">Añadir permiso (manualmente) al grupo de seguridad</value> <value xml:lang="fr">Ajouter une autorisation (manuellement) au groupe de sécurité</value> <value xml:lang="hi_IN">सà¥à¤°à¤à¥à¤·à¤¾ समà¥à¤¹ मà¥à¤ ठनà¥à¤®à¤¤à¤¿(सà¥à¤µà¤¯à¤) à¤à¥à¤¡à¤¼à¥à¤</value> - <value xml:lang="it">Aggiungi Permesso (manualmente) al Gruppo Sicurezza</value> + <value xml:lang="it">Aggiungi permesso (manualmente) al gruppo sicurezza</value> <value xml:lang="nl">Handmatig rechten aan deze beveiligingsgroep toevoegen</value> <value xml:lang="pt_BR">Adicionar permissão (manualmente) ao SecurityGroup</value> <value xml:lang="pt_PT">Adicionar Permissão (manualmente) ao Grupo de Segurança</value> @@ -41,7 +41,7 @@ <value xml:lang="es">Añadir permiso (desde lista) a grupo de seguridad</value> <value xml:lang="fr">Ajouter une autorisation (à partir de la liste) au groupe de sécurité</value> <value xml:lang="hi_IN">सà¥à¤°à¤à¥à¤·à¤¾ समà¥à¤¹ मà¥à¤ ठनà¥à¤®à¤¤à¤¿(सà¥à¤à¥ सà¥) à¤à¥à¤¡à¤¼à¥à¤</value> - <value xml:lang="it">Aggiungi Permesso (dalla lista) al Gruppo Sicurezza</value> + <value xml:lang="it">Aggiungi permesso (dalla lista) al gruppo sicurezza</value> <value xml:lang="nl">Rechten vanaf lijst aan beveiligingsgroep toevoegen</value> <value xml:lang="pt_BR">Adicionar permissão (da lista) ao SecurityGroup</value> <value xml:lang="pt_PT">Adicionar Permissão (da lista)ao Grupo de Segurança</value> @@ -66,7 +66,7 @@ <value xml:lang="es">Añadir usuario a grupo de seguridad</value> <value xml:lang="fr">Ajouter un identifiant de connexion à ce groupe de sécurité</value> <value xml:lang="hi_IN">सà¥à¤°à¤à¥à¤·à¤¾ समà¥à¤¹ मà¥à¤ पà¥à¤°à¤¯à¥à¤à¥à¤¤à¤¾à¤²à¥à¤à¤¿à¤¨ à¤à¥à¤¡à¤¼à¥à¤</value> - <value xml:lang="it">Aggiungi Utente al Gruppo Sicurezza</value> + <value xml:lang="it">Aggiungi utente al gruppo sicurezza</value> <value xml:lang="nl">Loginnaam gebruiker aan beveiligingsgroep toevoegen</value> <value xml:lang="pt_BR">Adicionar usuário e senha ao Grupo de Segurança</value> <value xml:lang="pt_PT">Adicionar InÃcio de Utilizador a Este Grupo de Segurança</value> @@ -228,6 +228,7 @@ </property> <property key="FindUserLogin"> <value xml:lang="en">Find User Login</value> + <value xml:lang="it">Ricerca utenti</value> <value xml:lang="pt_BR">Encontrar Nome de Usuário</value> </property> <property key="FormFieldTitle_currentPassword"> @@ -236,7 +237,7 @@ <value xml:lang="es">Clave actual</value> <value xml:lang="fr">Mot de passe actuel</value> <value xml:lang="hi_IN">वरà¥à¤¤à¤®à¤¾à¤¨ पासवरà¥à¤¡</value> - <value xml:lang="it">Password Attuale</value> + <value xml:lang="it">Password attuale</value> <value xml:lang="nl">Huidig wachtwoord</value> <value xml:lang="pt_BR">Senha atual</value> <value xml:lang="ro">Parola Actuala</value> @@ -251,7 +252,7 @@ <value xml:lang="es">Verificar clave actual</value> <value xml:lang="fr">Vérification du mot de passe actuel</value> <value xml:lang="hi_IN">वरà¥à¤¤à¤®à¤¾à¤¨ पासवरà¥à¤¡ सतà¥à¤¯à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥à¤</value> - <value xml:lang="it">Password Attuale Verifica</value> + <value xml:lang="it">Verifica password attuale</value> <value xml:lang="nl">Verificatie huidig wachtwoord</value> <value xml:lang="pt_BR">Verificação da senha atual</value> <value xml:lang="ro">Verifica Parola Actuala </value> @@ -260,6 +261,36 @@ <value xml:lang="zh">å½åå¯ç éªè¯</value> <value xml:lang="zh_TW">ç®åå¯ç¢¼é©è¨¼</value> </property> + <property key="FormFieldTitle_disabledDateTime"> + <value xml:lang="en">Disabled Date Time</value> + <value xml:lang="it">Disabilitato dal</value> + </property> + <property key="FormFieldTitle_enabled"> + <value xml:lang="ar">شغاÙ</value> + <value xml:lang="de">Aktiviert</value> + <value xml:lang="en">Enabled</value> + <value xml:lang="es">Habilitado</value> + <value xml:lang="fr">Disponible</value> + <value xml:lang="hi_IN">सà¤à¥à¤°à¤¿à¤¯</value> + <value xml:lang="it">Abilitato</value> + <value xml:lang="nl">Beschikbaar</value> + <value xml:lang="pt">Activado</value> + <value xml:lang="pt_BR">Habilitado</value> + <value xml:lang="ro">Abilitat</value> + <value xml:lang="ru">ÐоÑÑÑпно</value> + <value xml:lang="th">สามารà¸</value> + <value xml:lang="zh">ææ</value> + <value xml:lang="zh_CN">å¯ç¨</value> + <value xml:lang="zh_TW">ææ</value> + </property> + <property key="FormFieldTitle_externalAuthId"> + <value xml:lang="en">External Auth Id</value> + <value xml:lang="it">Codice autenticazione esterna</value> + </property> + <property key="FormFieldTitle_hasLoggedOut"> + <value xml:lang="en">Has Logged Out</value> + <value xml:lang="it">Uscito dal sistema</value> + </property> <property key="FormFieldTitle_maxHits"> <value xml:lang="en">Maximum number of visits</value> <value xml:lang="fr">Nombre maximum de visites</value> @@ -285,7 +316,7 @@ <value xml:lang="es">Nueva clave</value> <value xml:lang="fr">Nouveau mot de passe</value> <value xml:lang="hi_IN">नया पासवरà¥à¤¡</value> - <value xml:lang="it">Password Nuova</value> + <value xml:lang="it">Nuova password</value> <value xml:lang="nl">Nieuw wachtwoord</value> <value xml:lang="pt_BR">Nova senha</value> <value xml:lang="ro">Parola Noua</value> @@ -300,7 +331,7 @@ <value xml:lang="es">Validar nueva clave</value> <value xml:lang="fr">Vérification du nouveau mot de passe</value> <value xml:lang="hi_IN">नया पासवरà¥à¤¡ सतà¥à¤¯à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥à¤</value> - <value xml:lang="it">Verifica Password Nuova</value> + <value xml:lang="it">Verifica nuova password</value> <value xml:lang="pt_BR">Verificação da nova senha</value> <value xml:lang="ro">Verifica Parola Noua</value> <value xml:lang="ru">ÐовÑй паÑÐ¾Ð»Ñ Ð¿Ð¾Ð²ÑоÑно</value> @@ -308,6 +339,10 @@ <value xml:lang="zh">æ°å¯ç éªè¯</value> <value xml:lang="zh_TW">æ°å¯ç¢¼é©è¨¼</value> </property> + <property key="FormFieldTitle_passwordHint"> + <value xml:lang="en">Password Hint</value> + <value xml:lang="it">Suggerimento password</value> + </property> <property key="FormFieldTitle_requirePasswordChange"> <value xml:lang="en">Require Password Change</value> <value xml:lang="fr">Changement mot de passe obligatoire</value> @@ -317,11 +352,15 @@ <value xml:lang="zh">å¿ é¡»ä¿®æ¹å¯ç </value> <value xml:lang="zh_TW">å¿ é ä¿®æ¹å¯ç¢¼</value> </property> + <property key="FormFieldTitle_successiveFailedLogins"> + <value xml:lang="en">Successive Failed Logins</value> + <value xml:lang="it">Accessi falliti consecutivi</value> + </property> <property key="FormFieldTitle_tarpitDuration"> <value xml:lang="en">Duration during which the view will not be accessible (in seconds)</value> <value xml:lang="fr">Durée pendant laquelle la vue ne sera plus accessible (en secondes)</value> <value xml:lang="hi_IN">ठवधि à¤à¤¿à¤¸à¤à¥ दà¥à¤°à¤¾à¤¨ दà¥à¤à¤¨à¤¾ सà¥à¤²à¤ नहà¥à¤ हà¥à¤à¤¾ (सà¥à¤à¤à¤¡ मà¥à¤)</value> - <value xml:lang="it">Durata durante la quale la vista non è accessibile (in secondi)</value> + <value xml:lang="it">Tempo durante il quale la vista non è accessibile (in secondi)</value> <value xml:lang="pt_BR">PerÃodo durante o qual a vista não poderá ser acessada (em segundos)</value> <value xml:lang="zh">è§å¾ä¸è½è®¿é®çæ¶é¿(ç§)</value> <value xml:lang="zh_TW">è¦åä¸è½è¨ªåçæé·(ç§)</value> @@ -344,7 +383,7 @@ <value xml:lang="es">Código de usuario para conexión</value> <value xml:lang="fr">Identifiant de connexion</value> <value xml:lang="hi_IN">पà¥à¤°à¤¯à¥à¤à¥à¤¤à¤¾ लà¥à¤à¤¿à¤¨ à¤à¥à¤°à¤®à¤¾à¤à¤</value> - <value xml:lang="it">Utente login</value> + <value xml:lang="it">Codice utente</value> <value xml:lang="nl">Loginnaam gebruiker</value> <value xml:lang="pt_BR">Id de login do usuário</value> <value xml:lang="ro">Utilizator Login</value> @@ -357,7 +396,7 @@ <value xml:lang="en">View Name</value> <value xml:lang="fr">Nom de la vue</value> <value xml:lang="hi_IN">नाम दà¥à¤à¥à¤</value> - <value xml:lang="it">Mostra nome</value> + <value xml:lang="it">Nome della vista</value> <value xml:lang="pt_BR">Ver nome</value> <value xml:lang="zh">æµè§å称</value> <value xml:lang="zh_TW">ç覽å稱</value> @@ -388,7 +427,7 @@ <value xml:lang="es">Añadir condiciones de emisor</value> <value xml:lang="fr">Ajoutez les dispositions d'émetteur</value> <value xml:lang="hi_IN">à¤à¤¾à¤°à¥à¤à¤°à¥à¤¤à¤¾ à¤à¥ पà¥à¤°à¤¾à¤µà¤§à¤¾à¤¨ à¤à¥à¤¡à¤¼à¥à¤</value> - <value xml:lang="it">Aggiorni Fornitore di Certificati</value> + <value xml:lang="it">Aggiungi fornitore di certificati</value> <value xml:lang="nl">Provisies uitgever toevoegen</value> <value xml:lang="pt_BR">Adicionar emissor de provisões</value> <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸à¸²à¸£à¸à¸³à¹à¸à¸à¹à¸à¸·à¹à¸à¸à¹à¸</value> @@ -462,7 +501,7 @@ <value xml:lang="es">Buscar grupo de seguridad</value> <value xml:lang="fr">Recherche de groupes de sécurité</value> <value xml:lang="hi_IN">सà¥à¤°à¤à¥à¤·à¤¾ समà¥à¤¹ à¤à¥à¤à¥à¤</value> - <value xml:lang="it">Ricerca Gruppo Sicurezza</value> + <value xml:lang="it">Ricerca gruppi sicurezza</value> <value xml:lang="nl">Beveiligingsgroep(en) vinden</value> <value xml:lang="pt_BR">Procurar grupo de segurança</value> <value xml:lang="ro">Cauta Grup Siguranta</value> @@ -491,7 +530,7 @@ <value xml:lang="es">Código de permiso</value> <value xml:lang="fr">Autorisation</value> <value xml:lang="hi_IN">ठनà¥à¤®à¤¤à¤¿ à¤à¥à¤°à¤®à¤¾à¤à¤</value> - <value xml:lang="it">Codice Permesso</value> + <value xml:lang="it">Codice permesso</value> <value xml:lang="nl">Permissie</value> <value xml:lang="pt_BR">ID de permissão</value> <value xml:lang="pt_PT">ID de Permissão</value> @@ -532,7 +571,7 @@ <value xml:lang="es">Grupos de seguridad</value> <value xml:lang="fr">Groupes de sécurité</value> <value xml:lang="hi_IN">सà¥à¤°à¤à¥à¤·à¤¾ समà¥à¤¹</value> - <value xml:lang="it">Gruppi Sicurezza</value> + <value xml:lang="it">Gruppo di sicurezza</value> <value xml:lang="nl">Beveiligingsgroepen</value> <value xml:lang="pt_BR">Grupos de segurança</value> <value xml:lang="pt_PT">Grupos de Segurança</value> @@ -576,6 +615,7 @@ </property> <property key="UserLogin"> <value xml:lang="en">User Login</value> + <value xml:lang="it">Utente</value> <value xml:lang="pt_BR">Nome de Usuário</value> </property> <property key="UserLoginChangePassword"> @@ -584,7 +624,7 @@ <value xml:lang="es">Cambiar clave de conexión</value> <value xml:lang="fr">Changer le mot de passe de connexion</value> <value xml:lang="hi_IN">पà¥à¤°à¤¯à¥à¤à¥à¤¤à¤¾à¤²à¥à¤à¤¿à¤¨ à¤à¤¾ पासवरà¥à¤¡ बदलà¥à¤</value> - <value xml:lang="it">Cambio Password Utente Login</value> + <value xml:lang="it">Cambio password utente</value> <value xml:lang="nl">Wachtwoord wijzigen</value> <value xml:lang="pt_BR">Alterar senha do nome de usuário</value> <value xml:lang="ro">Schimb Parola Utilizator Login</value> @@ -598,7 +638,7 @@ <value xml:lang="en">Update User Login Security Settings</value> <value xml:lang="fr">Mise à jour des paramètres de sécurité pour l'identifiant de connexion</value> <value xml:lang="hi_IN">पà¥à¤°à¤¯à¥à¤à¥à¤¤à¤¾ लà¥à¤à¤¿à¤¨ सà¥à¤°à¤à¥à¤·à¤¾ सà¥à¤à¤¿à¤à¤à¥à¤¸ नवà¥à¤¨à¤¤à¤® à¤à¤°à¥</value> - <value xml:lang="it">Aggiorna Impostazioni Sicurezza Utente Login</value> + <value xml:lang="it">Aggiorna impostazioni sicurezza utente</value> <value xml:lang="nl">UserLogin Security Settings wijzigen</value> <value xml:lang="pt_BR">Atualizar configurações de segurança do nome de usuário</value> <value xml:lang="ro">Actualizare Setari De Siguranta Utilizator Login</value> @@ -613,7 +653,7 @@ <value xml:lang="es">Usuarios</value> <value xml:lang="fr">Utilisateurs de connexion</value> <value xml:lang="hi_IN">पà¥à¤°à¤¯à¥à¤à¥à¤¤à¤¾ लà¥à¤à¤¿à¤¨</value> - <value xml:lang="it">Utenti Logins</value> + <value xml:lang="it">Utenti</value> <value xml:lang="nl">User logins</value> <value xml:lang="pt_BR">Nomes de usuário</value> <value xml:lang="pt_PT">InÃcios de Secção</value> Modified: ofbiz/branches/jackrabbit20100709/framework/common/config/SecurityextUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/config/SecurityextUiLabels.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/config/SecurityextUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/config/SecurityextUiLabels.xml Mon Apr 18 06:21:43 2011 @@ -90,7 +90,7 @@ <value xml:lang="en">following error occurred during login: ${errorMessage}</value> <value xml:lang="es">Error al hacer login</value> <value xml:lang="fr">${errorMessage}</value> - <value xml:lang="it">Il seguente errore è accaduto durante l'autenticazione: ${errorMessage}</value> + <value xml:lang="it">${errorMessage}</value> <value xml:lang="nl">De volgende fout kwam voor tijdens het inloggen: ${errorMessage}</value> <value xml:lang="pt_BR"> ${errorMessage}</value> <value xml:lang="ro">A aparut urmatoarea eroare in timpul logarii: ${errorMessage}</value> @@ -173,6 +173,7 @@ <value xml:lang="de">Ihr Passwort wurde erfolgreich geändert</value> <value xml:lang="en">Your password has been changed successfully</value> <value xml:lang="fr">Votre mot de passe a été changé avec succès</value> + <value xml:lang="it">La password è stata cambiata con successo</value> <value xml:lang="nl">Uw wachtwoord is aangepast</value> <value xml:lang="pt_BR">Sua senha foi alterada com sucesso</value> <value xml:lang="zh_TW">ä½ çå¯ç¢¼å·²æåè®æ´ã</value> @@ -239,7 +240,7 @@ <value xml:lang="zh_TW">æ¤ä½¿ç¨è å·²ç¶ç»å ¥ã</value> </property> <property key="loginevents.user_with_the_username_not_found"> - <value xml:lang="de">Ein User mit dem Usernamen "${userLoginId}" konnte nicht gefunden werden, bitte erneut eingeben.</value> + <value xml:lang="de">Ein Benutzer mit dem Namen "${userLoginId}" konnte nicht gefunden werden. Bitte erneut eingeben.</value> <value xml:lang="en">A user with the Username "${userLoginId}" was not found, please re-enter.</value> <value xml:lang="es">El usuario "${userLoginId}" no fue encontrado, por favor intente de nuevo.</value> <value xml:lang="fr">Le nom d'utilisateur "${userLoginId}" est inconnu, entrez le de nouveau SVP.</value> @@ -253,7 +254,7 @@ <value xml:lang="zh_TW">æ²æåçº "${userLoginId}" ç使ç¨è , è«éæ°è¼¸å ¥ã</value> </property> <property key="loginevents.username_not_found_reenter"> - <value xml:lang="de">Username konnte nicht gefunden werden, bitte erneut eingeben.</value> + <value xml:lang="de">Benutzername konnte nicht gefunden werden. Bitte erneut eingeben.</value> <value xml:lang="en">The Username was not found, please re-enter.</value> <value xml:lang="es">El usuario "${userLoginId}" no fue encontrado, por favor intente de nuevo.</value> <value xml:lang="fr">Le nom d'utilisateur est inconnu, entrez le de nouveau, SVP.</value> @@ -355,7 +356,7 @@ <value xml:lang="en">The account for user login id "${username}" has been disabled.</value> <value xml:lang="es">La cuenta "${username}" ha sido deshabilitada</value> <value xml:lang="fr">Le compte de l'utilisateur "${username}" a été neutralisé.</value> - <value xml:lang="it">L'utente "${username}" è stato disabilitato.</value> + <value xml:lang="it">L'utente "${username}" è stato disabilitato</value> <value xml:lang="nl">De gebruikersnaam: "${username}" is geblokkeerd.</value> <value xml:lang="pt_BR">A conta de logon user id "$ {nome}" foi desativada.</value> <value xml:lang="ro">Utilizatorul "${username}" a fost dezactivat.</value> @@ -751,7 +752,7 @@ <value xml:lang="en">It will be re-enabled ${reEnableTime}.</value> <value xml:lang="es">Será reactivado en ${reEnableTime}.</value> <value xml:lang="fr">Il sera renouvellé : ${reEnableTime}.</value> - <value xml:lang="it">Sarà riabilitata ${reEnableTime}.</value> + <value xml:lang="it">Sarà riabilitato il ${reEnableTime}.</value> <value xml:lang="nl">Hij zal weer geactiveerd zijn op ${reEnableTime}.</value> <value xml:lang="pt_BR">Será reativado ${reEnableTime}.</value> <value xml:lang="ro">Aceasta a fost re-abilitata in ${reEnableTime}.</value> Modified: ofbiz/branches/jackrabbit20100709/framework/common/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/ofbiz-component.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/ofbiz-component.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/ofbiz-component.xml Mon Apr 18 06:21:43 2011 @@ -45,6 +45,7 @@ under the License. <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_IN.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_IRL.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_NL.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_PL.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_UK.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_US.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_MX.xml"/> Modified: ofbiz/branches/jackrabbit20100709/framework/common/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/servicedef/services.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/servicedef/services.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/servicedef/services.xml Mon Apr 18 06:21:43 2011 @@ -404,6 +404,7 @@ under the License. <attribute name="successiveFailedLogins" type="Long" mode="IN" optional="true"/> <attribute name="externalAuthId" type="String" mode="IN" optional="true"/> <attribute name="userLdapDn" type="String" mode="IN" optional="true"/> + <attribute name="requirePasswordChange" type="String" mode="IN" optional="true"/> </service> <!-- common permission services --> @@ -777,5 +778,9 @@ under the License. <attribute name="geoAssocTypeId" mode="IN" type="String"/> <attribute name="geoList" mode="OUT" type="java.util.List"/> </service> - + + <service name="createJsLanguageFileMapping" engine="java" auth="false" use-transaction="false" + location="org.ofbiz.common.JsLanguageFileMappingCreator" invoke="createJsLanguageFileMapping"> + </service> + </services> Modified: ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/login/LoginServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/login/LoginServices.java?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/login/LoginServices.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/login/LoginServices.java Mon Apr 18 06:21:43 2011 @@ -879,6 +879,9 @@ public class LoginServices { if (context.containsKey("userLdapDn")) { userLoginToUpdate.set("userLdapDn", context.get("userLdapDn"), true); } + if (context.containsKey("requirePasswordChange")) { + userLoginToUpdate.set("requirePasswordChange", context.get("requirePasswordChange"), true); + } // if was disabled and we are enabling it, clear disabledDateTime if (!wasEnabled && "Y".equals(context.get("enabled"))) { Modified: ofbiz/branches/jackrabbit20100709/framework/common/webcommon/WEB-INF/common-controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/webcommon/WEB-INF/common-controller.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/webcommon/WEB-INF/common-controller.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/webcommon/WEB-INF/common-controller.xml Mon Apr 18 06:21:43 2011 @@ -95,6 +95,10 @@ under the License. <response name="success" type="view" value="forgotPassword"/> <response name="error" type="view" value="forgotPassword"/> </request-map> + <request-map uri="passwordChange"> + <security https="true" auth="false"/> + <response name="success" type="view" value="requirePasswordChange"/> + </request-map> <request-map uri="view"> <security https="false" auth="false"/> <response name="success" type="request" value="main"/> Modified: ofbiz/branches/jackrabbit20100709/framework/common/webcommon/portal/listPortalPortlets.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/webcommon/portal/listPortalPortlets.ftl?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/webcommon/portal/listPortalPortlets.ftl (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/webcommon/portal/listPortalPortlets.ftl Mon Apr 18 06:21:43 2011 @@ -36,29 +36,27 @@ under the License. <tr> </#if> <td> - <table> - <tr> - <td> - <div class="h2"> - <form method="post" action="<@ofbizUrl>createPortalPagePortlet</@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="createPortalPortlet_${portalPortlet.portalPortletId}"><input name="portalPortletId" value="${portalPortlet.portalPortletId}" type="hidden"/><input name="portalPageId" value="${parameters.portalPageId}" type="hidden"/><input name="columnSeqId" value="${parameters.columnSeqId}" type="hidden"/></form><a class="buttontext" href="javascript:document.createPortalPortlet_${portalPortlet.portalPortletId}.submit()">${uiLabelMap.CommonAdd}: ${portalPortlet.portletName}</a> - </div> - <div class="tabletext"> - ${portalPortlet.description?if_exists} - </div> - <div class="tabletext"> - ${parameters.portletCategoryId} - </div> - </td> - <td> - <#if portalPortlet.screenshot?has_content> - <div class="screenshot"> - <a href="<@ofbizContentUrl>${portalPortlet.screenshot}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${portalPortlet.screenshot}</@ofbizContentUrl>" width="250" alt=""/></a> - </div> - </#if> - </td> - </tr> - </table> + <div class="h3"> + <form method="post" action="<@ofbizUrl>createPortalPagePortlet</@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="createPortalPortlet_${portalPortlet.portalPortletId}"><input name="portalPortletId" value="${portalPortlet.portalPortletId}" type="hidden"/><input name="portalPageId" value="${parameters.portalPageId}" type="hidden"/><input name="columnSeqId" value="${parameters.columnSeqId}" type="hidden"/></form><a class="buttontext" href="javascript:document.createPortalPortlet_${portalPortlet.portalPortletId}.submit()">${uiLabelMap.CommonAdd}: ${portalPortlet.portletName}</a> + </div> + <div class="tabletext"> + ${portalPortlet.description?if_exists} + </div> + <div class="tabletext"> + ${parameters.portletCategoryId} + </div> </td> + <td> + <#if portalPortlet.screenshot?has_content> + <div class="screenshot"> + <a href="<@ofbizContentUrl>${portalPortlet.screenshot}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${portalPortlet.screenshot}</@ofbizContentUrl>" width="250" alt=""/></a> + </div> + </#if> + </td> + <#if leftColumn==true> + <td width="10%"> + </td> + </#if> <#if leftColumn==false> </tr> </#if> Modified: ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml Mon Apr 18 06:21:43 2011 @@ -116,17 +116,11 @@ under the License. <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/fjTimer/jquerytimer-min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true"/> - <!-- What a mess? OK a Groovy script could be used, but anyway we need this to have real locale for calendar... --> + <!-- Load available JS Language Files --> <set field="initialLocaleComplete" type="String" value="${groovy:parameters?.userLogin?.lastLocale}" default-value="${groovy:locale.toString()}"/> - <set field="initialLocale" type="String" value="${groovy:parameters?.userLogin?.lastLocale?.substring(0,2)}" default-value="${groovy:locale.toString()?.substring(0,2)?:'en'}"/> - <set field="localeFileNameComplete" type="String" value="/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-${initialLocaleComplete}.js"/> - <set field="localeFileNameComplete" type="String" value="${groovy: localeFileNameComplete.replace('_', '-')}"/> <!-- those files are build this way OOTB (ie a - not a _ between language and country --> - <set field="fileNameComplete" type="String" value="${groovy: org.ofbiz.base.location.FlexibleLocation.resolveLocation('component://images/webapp' + localeFileNameComplete)}"/> - <set field="localeFileName" type="String" value="/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-${initialLocale}.js"/> - <set field="localeJsFile" type="String" value="${groovy: fileNameComplete ? localeFileNameComplete : localeFileName}"/> - <set field="layoutSettings.javaScripts[+0]" value="${localeJsFile}" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.datejs.getFilePath(initialLocaleComplete)}" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.jquery.getFilePath(initialLocaleComplete)}" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.2.min.js" global="true"/> <!-- jQuery CSSs --> <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" global="true"/> @@ -354,12 +348,16 @@ under the License. <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/fjTimer/jquerytimer-min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true"/> - <set field="initialLocale" type="String" value="${groovy:parameters?.userLogin?.lastLocale?.substring(0,2)}" default-value="${groovy:locale.toString()?.substring(0,2)?:'en'}"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-${initialLocale}.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.2.min.js" global="true"/> <!-- jQuery CSSs --> <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" global="true"/> + <!-- Load available JS Language Files --> + <set field="initialLocaleComplete" type="String" value="${groovy:parameters?.userLogin?.lastLocale}" default-value="${groovy:locale.toString()}"/> + <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.datejs.getFilePath(initialLocaleComplete)}" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.jquery.getFilePath(initialLocaleComplete)}" global="true"/> + + <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/> <set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/> <set field="layoutSettings.javaScripts[]" value="/images/GooglemapSimple.js" global="true"/> Propchange: ofbiz/branches/jackrabbit20100709/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 18 06:21:43 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/framework/common/widget/HelpScreens.xml:951708-952957 /ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml:952958-1044489 /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264 -/ofbiz/trunk/framework/common/widget/HelpScreens.xml:962442-1090146 +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:962442-1094239 Modified: ofbiz/branches/jackrabbit20100709/framework/common/widget/SecurityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/widget/SecurityForms.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/widget/SecurityForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/widget/SecurityForms.xml Mon Apr 18 06:21:43 2011 @@ -175,15 +175,20 @@ under the License. <form name="ListSecurityGroupUserLogins" type="list" list-name="userLoginSecurityGroups" target="updateUserLoginToSecurityGroup" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> + <set field="sortField" from-field="parameters.sortField" default-value="userLoginId"/> <entity-condition entity-name="UserLoginAndSecurityGroup"> <condition-expr field-name="groupId" from-field="groupId"/> - <order-by field-name="userLoginId"/> + <order-by field-name="${sortField}"/> </entity-condition> </actions> <field name="groupId"><hidden/></field> - <field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}"><display/></field> - <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> - <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field> + <field name="userLoginId" sort-field="true"> + <hyperlink also-hidden="false" description="${userLoginId}" target="editlogin"> + <parameter param-name="userLoginId"/> + </hyperlink> + </field> + <field name="fromDate" title="${uiLabelMap.CommonFromDate}" sort-field="true"><display/></field> + <field name="thruDate" title="${uiLabelMap.CommonThruDate}" sort-field="true"><date-time/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink description="${uiLabelMap.CommonRemove}" target="removeUserLoginFromSecurityGroup" also-hidden="false"> @@ -197,18 +202,19 @@ under the License. <form name="ListUserLogins" type="list" list-name="securityGroups" paginate-target="FindUserLogin" header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> + <set field="sortField" from-field="parameters.sortField" default-value="userLoginId"/> <entity-condition entity-name="UserLogin"> - <order-by field-name="userLoginId"/> + <order-by field-name="${sortField}"/> </entity-condition> </actions> - <field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}" widget-style="buttontext"> + <field name="userLoginId" widget-style="buttontext" sort-field="true"> <hyperlink also-hidden="false" description="${userLoginId}" target="editlogin"> <parameter param-name="userLoginId"/> </hyperlink> </field> - <field name="enabled"><display/></field> - <field name="hasLoggedOut"><display/></field> - <field name="disabledDateTime"><display/></field> + <field name="enabled" sort-field="true"><display/></field> + <field name="hasLoggedOut" sort-field="true"><display/></field> + <field name="disabledDateTime" sort-field="true"><display/></field> </form> <form name="ListUserLoginSecurityGroups" type="list" Modified: ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/Delegator.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/Delegator.java?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/Delegator.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/Delegator.java Mon Apr 18 06:21:43 2011 @@ -796,6 +796,8 @@ public interface Delegator { public void initEntityEcaHandler(); + public void initDistributedCacheClear(); + public GenericPK makePK(Element element); /** Creates a Primary Key in the form of a GenericPK without persisting it */ Modified: ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/DelegatorFactory.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/DelegatorFactory.java?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/DelegatorFactory.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/DelegatorFactory.java Mon Apr 18 06:21:43 2011 @@ -41,6 +41,10 @@ public abstract class DelegatorFactory i // setup the Entity ECA Handler delegator.initEntityEcaHandler(); //Debug.logInfo("got delegator(" + delegatorName + ") from cache", module); + + // setup the distributed CacheClear + delegator.initDistributedCacheClear(); + return delegator; } try { Modified: ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/GenericDelegator.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/GenericDelegator.java?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/GenericDelegator.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/GenericDelegator.java Mon Apr 18 06:21:43 2011 @@ -276,38 +276,11 @@ public class GenericDelegator implements // setup the crypto class; this also after the delegator is in the cache otherwise we get infinite recursion this.crypto = new EntityCrypto(this); - - //time to do some tricks with manual class loading that resolves circular dependencies, like calling services... - ClassLoader loader = Thread.currentThread().getContextClassLoader(); - - // if useDistributedCacheClear is false do nothing since the - // distributedCacheClear member field with a null value will cause the - // dcc code to do nothing - if (getDelegatorInfo().useDistributedCacheClear) { - // initialize the distributedCacheClear mechanism - String distributedCacheClearClassName = getDelegatorInfo().distributedCacheClearClassName; - - try { - Class<?> dccClass = loader.loadClass(distributedCacheClearClassName); - this.distributedCacheClear = (DistributedCacheClear) dccClass.newInstance(); - this.distributedCacheClear.setDelegator(this, getDelegatorInfo().distributedCacheClearUserLoginId); - } catch (ClassNotFoundException e) { - Debug.logWarning(e, "DistributedCacheClear class with name " + distributedCacheClearClassName + " was not found, distributed cache clearing will be disabled", module); - } catch (InstantiationException e) { - Debug.logWarning(e, "DistributedCacheClear class with name " + distributedCacheClearClassName + " could not be instantiated, distributed cache clearing will be disabled", module); - } catch (IllegalAccessException e) { - Debug.logWarning(e, "DistributedCacheClear class with name " + distributedCacheClearClassName + " could not be accessed (illegal), distributed cache clearing will be disabled", module); - } catch (ClassCastException e) { - Debug.logWarning(e, "DistributedCacheClear class with name " + distributedCacheClearClassName + " does not implement the DistributedCacheClear interface, distributed cache clearing will be disabled", module); - } - } else { - Debug.logInfo("Distributed Cache Clear System disabled for delegator [" + delegatorFullName + "]", module); - } } - + protected void setDelegatorNames(String delegatorFullName) { this.delegatorFullName = delegatorFullName; - + int hashSymbolIndex = delegatorFullName.indexOf('#'); if (hashSymbolIndex == -1) { this.delegatorBaseName = delegatorFullName; @@ -321,10 +294,13 @@ public class GenericDelegator implements * @see org.ofbiz.entity.Delegator#initEntityEcaHandler() */ public synchronized void initEntityEcaHandler() { - if (!getDelegatorInfo().useEntityEca || this.entityEcaHandler != null) { + // Nothing to do if already assigned: the class loader has already been called, the class instantiated and casted to EntityEcaHandler + if (this.entityEcaHandler != null) { return; } + // If useEntityEca is false do nothing: the entityEcaHandler member field with a null value would cause its code to do nothing if (getDelegatorInfo().useEntityEca) { + //time to do some tricks with manual class loading that resolves circular dependencies, like calling services ClassLoader loader = Thread.currentThread().getContextClassLoader(); // initialize the entity eca handler String entityEcaHandlerClassName = getDelegatorInfo().entityEcaHandlerClassName; @@ -777,7 +753,7 @@ public class GenericDelegator implements } catch (GenericEntityException e) { // see if this was caused by an existing record before resetting the sequencer and trying again // NOTE: use the helper directly so ECA rules, etc won't be run - + GenericValue existingValue = null; try { existingValue = helper.findByPrimaryKey(value.getPrimaryKey()); @@ -2822,4 +2798,38 @@ public class GenericDelegator implements this.value = value; } } + + /* (non-Javadoc) + * @see org.ofbiz.entity.Delegator#initDistributedCacheClear() + */ + public void initDistributedCacheClear() { + // Nothing to do if already assigned: the class loader has already been called, the class instantiated and casted to DistributedCacheClear + if (this.distributedCacheClear != null) { + return; + } + + // If useDistributedCacheClear is false do nothing: the distributedCacheClear member field with a null value would cause dcc code to do nothing + if (getDelegatorInfo().useDistributedCacheClear) { + //time to do some tricks with manual class loading that resolves circular dependencies, like calling services + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + // initialize the distributedCacheClear mechanism + String distributedCacheClearClassName = getDelegatorInfo().distributedCacheClearClassName; + + try { + Class<?> dccClass = loader.loadClass(distributedCacheClearClassName); + this.distributedCacheClear = UtilGenerics.cast(dccClass.newInstance()); + this.distributedCacheClear.setDelegator(this, getDelegatorInfo().distributedCacheClearUserLoginId); + } catch (ClassNotFoundException e) { + Debug.logWarning(e, "DistributedCacheClear class with name " + distributedCacheClearClassName + " was not found, distributed cache clearing will be disabled", module); + } catch (InstantiationException e) { + Debug.logWarning(e, "DistributedCacheClear class with name " + distributedCacheClearClassName + " could not be instantiated, distributed cache clearing will be disabled", module); + } catch (IllegalAccessException e) { + Debug.logWarning(e, "DistributedCacheClear class with name " + distributedCacheClearClassName + " could not be accessed (illegal), distributed cache clearing will be disabled", module); + } catch (ClassCastException e) { + Debug.logWarning(e, "DistributedCacheClear class with name " + distributedCacheClearClassName + " does not implement the DistributedCacheClear interface, distributed cache clearing will be disabled", module); + } + } else { + Debug.logVerbose("Distributed Cache Clear System disabled for delegator [" + delegatorFullName + "]", module); + } + } } Modified: ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java Mon Apr 18 06:21:43 2011 @@ -286,7 +286,7 @@ public class GenericDAO { } if (retVal == 0) { - throw new GenericEntityNotFoundException("Tried to update an entity that does not exist."); + throw new GenericEntityNotFoundException("Tried to update an entity that does not exist, entity: " + entity.toString()); } return retVal; } Modified: ofbiz/branches/jackrabbit20100709/framework/example/data/ExampleDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/example/data/ExampleDemoData.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/example/data/ExampleDemoData.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/example/data/ExampleDemoData.xml Mon Apr 18 06:21:43 2011 @@ -66,4 +66,5 @@ under the License. <!-- example test suite --> <SeleniumTestSuitePath testSuiteId="EXAMPLE_TESTSUITE" testSuiteName="example_testsuite" testSuiteType="XML" testSuitePath="framework/testtools/testdef/seleniumxml/example/example_testsuite.xml" description="test suite for example component"/> + <SeleniumTestSuitePath testSuiteId="EX_HTML_TESTSUITE" testSuiteName="example_html_testsuite" testSuiteType="HTML" testSuitePath="framework/example/testdef/selenium/testSuite.html" description="HTML test suite for example component"/> </entity-engine-xml> Modified: ofbiz/branches/jackrabbit20100709/framework/example/data/helpdata/HELP_EXAMPLE_FR.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/example/data/helpdata/HELP_EXAMPLE_FR.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/example/data/helpdata/HELP_EXAMPLE_FR.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/example/data/helpdata/HELP_EXAMPLE_FR.xml Mon Apr 18 06:21:43 2011 @@ -36,6 +36,7 @@ License. Pour avoir la liste complète, cliquez sur le bouton "Index" et regardez l'arborescence de l'aide. Voici aussi une liste de raccourcis : <itemizedlist> + <listitem><para>Comment fonctionne <link xl:href="showHelp?helpTopic=DOCUMENTATION_SYSTEM">le système de documentation d'Apache OFBiz</link></para></listitem> <listitem><para><link xl:href="showHelp?helpTopic=EXAMPLE_docbook">Ce qu'il est possible de faire dans les fichiers d'aide</link></para></listitem> </itemizedlist> </para> Modified: ofbiz/branches/jackrabbit20100709/framework/example/widget/example/FormWidgetExampleForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/example/widget/example/FormWidgetExampleForms.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/example/widget/example/FormWidgetExampleForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/example/widget/example/FormWidgetExampleForms.xml Mon Apr 18 06:21:43 2011 @@ -96,7 +96,7 @@ under the License. entry-name="exampleDateField" title="${uiLabelMap.ExampleDateField6Title}" tooltip="${uiLabelMap.ExampleToDo}"> - <display/> + <display type="date-time"/> </field> <!-- ***************** --> <!-- *** field7 *** --> Propchange: ofbiz/branches/jackrabbit20100709/framework/security/data/PasswordSecurityData.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 18 06:21:43 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/applications/securityext/data/PasswordSecurityData.xml:951708-952957 /ofbiz/branches/jquery/applications/securityext/data/PasswordSecurityData.xml:952958-1044489 /ofbiz/branches/multitenant20100310/applications/securityext/data/PasswordSecurityData.xml:921280-927264 -/ofbiz/trunk/framework/security/data/PasswordSecurityData.xml:962442-1090146 +/ofbiz/trunk/framework/security/data/PasswordSecurityData.xml:962442-1094239 |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |