Return-Path: Delivered-To: apmail-ofbiz-commits-archive@www.apache.org Received: (qmail 31798 invoked from network); 2 Feb 2011 18:18:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 2 Feb 2011 18:18:17 -0000 Received: (qmail 80874 invoked by uid 500); 2 Feb 2011 18:18:17 -0000 Delivered-To: apmail-ofbiz-commits-archive@ofbiz.apache.org Received: (qmail 80728 invoked by uid 500); 2 Feb 2011 18:18:15 -0000 Mailing-List: contact commits-help@ofbiz.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ofbiz.apache.org Delivered-To: mailing list commits@ofbiz.apache.org Received: (qmail 80720 invoked by uid 99); 2 Feb 2011 18:18:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Feb 2011 18:18:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_FRT_POSSIBLE X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Feb 2011 18:18:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C739723889E9; Wed, 2 Feb 2011 18:17:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1066563 - in /ofbiz/trunk/framework/service: config/ServiceErrorUiLabels.xml src/org/ofbiz/service/engine/EntityAutoEngine.java src/org/ofbiz/service/test/ServiceEngineTestServices.java src/org/ofbiz/service/test/XmlRpcTests.java Date: Wed, 02 Feb 2011 18:17:46 -0000 To: commits@ofbiz.apache.org From: mrisaliti@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110202181746.C739723889E9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mrisaliti Date: Wed Feb 2 18:17:46 2011 New Revision: 1066563 URL: http://svn.apache.org/viewvc?rev=1066563&view=rev Log: Internationalization of return messages of java services of service component (OFBIZ-4091) Modified: ofbiz/trunk/framework/service/config/ServiceErrorUiLabels.xml ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java ofbiz/trunk/framework/service/src/org/ofbiz/service/test/ServiceEngineTestServices.java ofbiz/trunk/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java Modified: ofbiz/trunk/framework/service/config/ServiceErrorUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/config/ServiceErrorUiLabels.xml?rev=1066563&r1=1066562&r2=1066563&view=diff ============================================================================== --- ofbiz/trunk/framework/service/config/ServiceErrorUiLabels.xml (original) +++ ofbiz/trunk/framework/service/config/ServiceErrorUiLabels.xml Wed Feb 2 18:17:46 2011 @@ -91,4 +91,108 @@ æ æ³åæ¶ä»»å¡éè¯ ç¡æ³åæ¶å·¥ä½éè©¦ + + Error doing entity-auto operation for entity ${entityName} in service ${serviceName}: ${errorString} + Errore mentre faceva l'operazione entity-auto per l'entitÃ ${entityName} nel servizio ${serviceName}: ${errorString} + + + The ID value in the parameter ${parameterName} was not valid: ${errorDetails} + Il valore ID nel parametro ${parameterName} non Ã¨ valido: ${errorDetails} + + + Error running deadlock test services: ${errorString} + Errore durante il test del servizio deadlock: ${errorString} + + + Error(s) running sub-services in testServiceDeadLockRetry + Errore(i) durante l'esecuzione dei sotto-servizi in testServiceDeadLockRetry + + + Error running testServiceDeadLockRetryThreadA: ${errorString} + Errore durante l'esecuzione di testServiceDeadLockRetryThreadA: ${errorString} + + + Error running testServiceDeadLockRetryThreadB: ${errorString} + Errore durante l'esecuzione di testServiceDeadLockRetryThreadB: ${errorString} + + + Entity Engine Exception: ${errorString} + Eccezione Entity Engine: ${errorString} + + + Entity Engine Exception running dead lock test thread A: ${errorString} + Eccezione Entity Engine durante l'esecuzione del test dead lock thread A: ${errorString} + + + Entity Engine Exception running dead lock test thread B: ${errorString} + Eccezione Entity Engine durante l'esecuzione del test dead lock thread B: ${errorString} + + + Entity Engine Exception running dead lock test thread A: ${errorString} + Eccezione Entity Engine durante l'esecuzione del test dead lock thread A: ${errorString} + + + Entity Engine Exception running dead lock test thread B: ${errorString} + Eccezione Entity Engine durante l'esecuzione del test dead lock thread B: ${errorString} + + + Error(s) running sub-services in testServiceLockWaitTimeoutRetry + Errore(i) durante l'esecuzione dei sotto-servizi in testServiceLockWaitTimeoutRetry + + + Entity Engine Exception running lock wait timeout test Grabber thread: ${errorString} + Eccezione Entity Engine durante l'esecuzione del lock wait timeout test Grabber thread: ${errorString} + + + Entity Engine Exception running lock wait timeout test Grabber thread: ${errorString} + Eccezione Entity Engine durante l'esecuzione del lock wait timeout test Grabber thread: ${errorString} + + + Wait Interrupted Exception running lock wait timeout test Grabber thread: ${errorString} + Eccezione Wait Interrupted Exception durante l'esecuzione del lock wait timeout test Grabber thread: ${errorString} + + + Wait Interrupted Exception running lock wait timeout test Waiter thread: ${errorString} + Eccezione Wait Interrupted Exception durante l'esecuzione del lock wait timeout test Waiter thread: ${errorString} + + + Error running testServiceLockWaitTimeoutRetryCantRecoverWaiter + Errore durante l'esecuzione di testServiceLockWaitTimeoutRetryCantRecoverWaiter + + + Error running sub-service with own tx: ${errorString} + Errore durante l'esecuzione del sotto-servizio con proprie transazione: ${errorString} + + + Error running ServiceTestOwnTxSubServiceAfterSetRollbackOnlyInParentErrorCatchWrapper + Errore durante l'esecuzione di ServiceTestOwnTxSubServiceAfterSetRollbackOnlyInParentErrorCatchWrapper + + + Error running sub-service in testServiceOwnTxSubServiceAfterSetRollbackOnlyInParent + Errore durante l'esecuzione di testServiceOwnTxSubServiceAfterSetRollbackOnlyInParent + + + Intentional rollback to test global-rollback + Rollback intenzionale per testare il global-rollback + + + Error calling sub-service, it should return an error but not throw an exception, so something went wrong: ${errorString} + Errore durante l'esecuzione del sotto-servizio, dovrebbe restituire un'errore ma non generare un'eccezione, cosÃ¬ qualcosa Ã¨ andato male: ${errorString} + + + adding integer 125 to 365 yields + aggiungere intero 125 a 365 yields + + + calcul is wrong ! Why ? + calcolo Ã¨ errato ! PerchÃ¨ ? + + + missing parameters + parametri mancanti + + + Value not found, cannot update + Valore non troavato, non Ã¨ possibile aggiornare + Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java?rev=1066563&r1=1066562&r2=1066563&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java Wed Feb 2 18:17:46 2011 @@ -27,6 +27,7 @@ import javolution.util.FastMap; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.UtilDateTime; +import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.GenericValue; @@ -46,6 +47,7 @@ import org.ofbiz.service.ServiceUtil; public final class EntityAutoEngine extends GenericAsyncEngine { public static final String module = EntityAutoEngine.class.getName(); + public static final String resource = "ServiceErrorUiLabels"; public EntityAutoEngine(ServiceDispatcher dispatcher) { super(dispatcher); @@ -66,7 +68,7 @@ public final class EntityAutoEngine exte public Map runSync(String localName, ModelService modelService, Map parameters) throws GenericServiceException { // static java service methods should be: public Map methodName(DispatchContext dctx, Map context) DispatchContext dctx = dispatcher.getLocalContext(localName); - + Locale locale = (Locale) parameters.get("locale"); Map localContext = FastMap.newInstance(); localContext.put("parameters", parameters); Map result = ServiceUtil.returnSuccess(); @@ -175,7 +177,7 @@ public final class EntityAutoEngine exte if (pkValue instanceof String) { StringBuffer errorDetails = new StringBuffer(); if (!UtilValidate.isValidDatabaseId((String) pkValue, errorDetails)) { - return ServiceUtil.returnError("The ID value in the parameter [" + singlePkModelParam.name + "] was not valid: " + errorDetails); + return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ServiceParameterValueNotValid", UtilMisc.toMap("parameterName", singlePkModelParam.name,"errorDetails", errorDetails), locale)); } } } @@ -248,7 +250,7 @@ public final class EntityAutoEngine exte GenericValue lookedUpValue = PrimaryKeyFinder.runFind(modelEntity, parameters, dctx.getDelegator(), false, true, null, null); if (lookedUpValue == null) { - return ServiceUtil.returnError("Value not found, cannot update"); + return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ServiceValueNotFound", locale)); } localContext.put("lookedUpValue", lookedUpValue); @@ -293,7 +295,7 @@ public final class EntityAutoEngine exte GenericValue statusValidChange = dctx.getDelegator().findOne("StatusValidChange", true, "statusId", lookedUpStatusId, "statusIdTo", parameterStatusId); if (statusValidChange == null) { // uh-oh, no valid change... - return ServiceUtil.returnError(UtilProperties.getMessage("CommonUiLabels", "CommonErrorNoStatusValidChange", localContext, (Locale) parameters.get("locale"))); + return ServiceUtil.returnError(UtilProperties.getMessage("CommonUiLabels", "CommonErrorNoStatusValidChange", localContext, locale)); } } } @@ -321,9 +323,8 @@ public final class EntityAutoEngine exte } } } catch (GeneralException e) { - String errMsg = "Error doing entity-auto operation for entity [" + modelEntity.getEntityName() + "] in service [" + modelService.name + "]: " + e.toString(); - Debug.logError(e, errMsg, module); - return ServiceUtil.returnError(errMsg); + Debug.logError(e, "Error doing entity-auto operation for entity [" + modelEntity.getEntityName() + "] in service [" + modelService.name + "]: " + e.toString(), module); + return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ServiceEntityAutoOperation", UtilMisc.toMap("entityName", modelEntity.getEntityName(), "serviceName", modelService.name,"errorString", e.toString()), locale)); } return result; Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/test/ServiceEngineTestServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/test/ServiceEngineTestServices.java?rev=1066563&r1=1066562&r2=1066563&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/test/ServiceEngineTestServices.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/test/ServiceEngineTestServices.java Wed Feb 2 18:17:46 2011 @@ -19,11 +19,14 @@ package org.ofbiz.service.test; import java.util.List; +import java.util.Locale; import java.util.Map; import javolution.util.FastList; import org.ofbiz.base.util.Debug; +import org.ofbiz.base.util.UtilMisc; +import org.ofbiz.base.util.UtilProperties; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; @@ -37,8 +40,10 @@ import org.ofbiz.service.ServiceUtil; public class ServiceEngineTestServices { public static final String module = ServiceEngineTestServices.class.getName(); + public static final String resource = "ServiceErrorUiLabels"; public static Map testServiceDeadLockRetry(DispatchContext dctx, Map context) { + Locale locale = (Locale) context.get("locale"); LocalDispatcher dispatcher = dctx.getDispatcher(); try { // NOTE using persist=false so that the lock retry will have to fix the problem instead of the job poller picking it up again @@ -49,18 +54,17 @@ public class ServiceEngineTestServices { Map threadBResult = threadBWaiter.waitForResult(); List