svn commit: r1646191 [2/2] - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r1646191 [2/2] - in /ofbiz/trunk: applications/accounting/script
 
|
Modified: ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java?rev=1646191&r1=1646190&r2=1646191&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java (original) +++ ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java Wed Dec 17 10:49:41 2014 @@ -82,6 +82,10 @@ public class OagisServices { public static final String resource = "OagisUiLabels"; + public static final String certAlias = UtilProperties.getPropertyValue("oagis.properties", "auth.client.certificate.alias"); + public static final String basicAuthUsername = UtilProperties.getPropertyValue("oagis.properties", "auth.basic.username"); + public static final String basicAuthPassword = UtilProperties.getPropertyValue("oagis.properties", "auth.basic.password"); + public static final boolean debugSaveXmlOut = "true".equals(UtilProperties.getPropertyValue("oagis.properties", "Oagis.Debug.Save.Xml.Out")); public static final boolean debugSaveXmlIn = "true".equals(UtilProperties.getPropertyValue("oagis.properties", "Oagis.Debug.Save.Xml.In")); @@ -104,7 +108,7 @@ public class OagisServices { Locale locale = (Locale) context.get("locale"); String errorReferenceId = (String) context.get("referenceId"); List<Map<String, String>> errorMapList = UtilGenerics.checkList(context.get("errorMapList")); - + String sendToUrl = (String) context.get("sendToUrl"); if (UtilValidate.isEmpty(sendToUrl)) { sendToUrl = EntityUtilProperties.getPropertyValue("oagis.properties", "url.send.confirmBod", delegator); @@ -215,7 +219,7 @@ public class OagisServices { Debug.logError(e, errMsg, module); } - Map<String, Object> sendMessageReturn = OagisServices.sendMessageText(outText, out, sendToUrl, saveToDirectory, saveToFilename, locale, delegator); + Map<String, Object> sendMessageReturn = OagisServices.sendMessageText(outText, out, sendToUrl, saveToDirectory, saveToFilename, locale); if (sendMessageReturn != null) { return sendMessageReturn; } @@ -675,11 +679,8 @@ public class OagisServices { return result; } - public static Map<String, Object> sendMessageText(String outText, OutputStream out, String sendToUrl, String saveToDirectory, String saveToFilename, Locale locale, Delegator delegator) { - final String certAlias = EntityUtilProperties.getPropertyValue("oagis.properties", "auth.client.certificate.alias", delegator); - final String basicAuthUsername = EntityUtilProperties.getPropertyValue("oagis.properties", "auth.basic.username", delegator); - final String basicAuthPassword = EntityUtilProperties.getPropertyValue("oagis.properties", "auth.basic.password", delegator); - if (out != null) { + public static Map<String, Object> sendMessageText(String outText, OutputStream out, String sendToUrl, String saveToDirectory, String saveToFilename, Locale locale) { + if (out != null) { Writer outWriter = new OutputStreamWriter(out); try { outWriter.write(outText); Modified: ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java?rev=1646191&r1=1646190&r2=1646191&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java (original) +++ ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java Wed Dec 17 10:49:41 2014 @@ -80,6 +80,10 @@ public class OagisShipmentServices { public static final String resource = "OagisUiLabels"; + public static final String certAlias = UtilProperties.getPropertyValue("oagis.properties", "auth.client.certificate.alias"); + public static final String basicAuthUsername = UtilProperties.getPropertyValue("oagis.properties", "auth.basic.username"); + public static final String basicAuthPassword = UtilProperties.getPropertyValue("oagis.properties", "auth.basic.password"); + public static final String oagisMainNamespacePrefix = "n"; public static final String oagisSegmentsNamespacePrefix = "os"; public static final String oagisFieldsNamespacePrefix = "of"; @@ -902,7 +906,7 @@ public class OagisShipmentServices { Debug.logError(e, errMsg, module); } - Map<String, Object> sendMessageReturn = OagisServices.sendMessageText(outText, out, sendToUrl, saveToDirectory, saveToFilename, locale, delegator); + Map<String, Object> sendMessageReturn = OagisServices.sendMessageText(outText, out, sendToUrl, saveToDirectory, saveToFilename, locale); if (sendMessageReturn != null && ServiceUtil.isError(sendMessageReturn)) { try { Map<String, Object> uomiCtx = FastMap.newInstance(); @@ -1145,7 +1149,7 @@ public class OagisShipmentServices { Debug.logError(e, errMsg, module); } - Map<String, Object> sendMessageReturn = OagisServices.sendMessageText(outText, out, sendToUrl, saveToDirectory, saveToFilename, locale, delegator); + Map<String, Object> sendMessageReturn = OagisServices.sendMessageText(outText, out, sendToUrl, saveToDirectory, saveToFilename, locale); if (sendMessageReturn != null && ServiceUtil.isError(sendMessageReturn)) { try { Map<String, Object> uomiCtx = FastMap.newInstance(); Modified: ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml?rev=1646191&r1=1646190&r2=1646191&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml (original) +++ ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml Wed Dec 17 10:49:41 2014 @@ -4179,20 +4179,8 @@ <entity-one entity-name="UserLogin" value-field="systemUserLogin"> <field-map field-name="userLoginId" value="system"/> </entity-one> - <call-class-method method-name="getPropertyValue" ret-field="username_lowercase" method-name="getPropertyValue" class-name="org.ofbiz.entity.util.EntityUtilProperties"> - <string value="security"/> - <string value="username.lowercase"/> - <string value="false"/> - <field field="locale" type="java.util.Locale"/> - <field field="delegator" type="org.ofbiz.entity.Delegator"/> - </call-class-method> - <call-class-method method-name="getPropertyValue" ret-field="password_lowercase" class-name="org.ofbiz.entity.util.EntityUtilProperties"> - <string value="security"/> - <string value="password.lowercase"/> - <string value="false"/> - <field field="locale" type="java.util.Locale"/> - <field field="delegator" type="org.ofbiz.entity.Delegator"/> - </call-class-method> + <property-to-field resource="security" property="username.lowercase" default="false" field="username_lowercase"/> + <property-to-field resource="security" property="password.lowercase" default="false" field="password_lowercase"/> <call-simple-method method-name="validateQuickAddPartyInfo"/> <check-errors/> @@ -4240,7 +4228,6 @@ <set field="newUserLogin.userLoginId" from-field="userLoginContext.userLoginId"/> <set field="newUserLogin.currentPassword" from-field="userLoginContext.currentPassword"/> <set field="newUserLogin.passwordHint" from-field="userLoginContext.passwordHint"/> - <set field="delegator" type="org.ofbiz.entity.Delegator"/> <!-- Check the password, etc for validity --> <call-bsh><![CDATA[ @@ -4251,7 +4238,7 @@ ]]></call-bsh> <!-- If password encryption is enabled, encrpyt it now --> <call-bsh><![CDATA[ - boolean useEncryption = "true".equals(org.ofbiz.entity.util.EntityUtilProperties.getPropertyValue("security", "password.encrypt", delegator)); + boolean useEncryption = "true".equals(org.ofbiz.base.util.UtilProperties.getPropertyValue("security", "password.encrypt")); if (useEncryption) { newUserLogin.set("currentPassword", org.ofbiz.base.crypto.HashCrypt.getDigestHash((String) newUserLogin.get("currentPassword"))); } ]]></call-bsh> Modified: ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumServices.xml?rev=1646191&r1=1646190&r2=1646191&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumServices.xml (original) +++ ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumServices.xml Wed Dec 17 10:49:41 2014 @@ -1432,12 +1432,7 @@ <field-map field-name="partyId" value="${invoice.partyId}"/> </entity-one> <if-empty field="party.preferredCurrencyUomId"> - <call-class-method method-name="getMessage" ret-field="party.preferredCurrencyUomId" class-name="org.ofbiz.entity.util.EntityUtilProperties"> - <string value="general"/> - <string value="currency.uom.id.default"/> - <field field="locale" type="java.util.Locale"/> - <field field="delegator" type="org.ofbiz.entity.Delegator"/> - </call-class-method> + <property-to-field resource="general" property="currency.uom.id.default" field="party.preferredCurrencyUomId"/> </if-empty> <set field="updateInvoiceMap.invoiceId" from-field="parameters.invoiceId"/> <set field="updateInvoiceMap.currencyUomId" from-field="party.preferredCurrencyUomId"/> @@ -1448,13 +1443,7 @@ </else> </if-not-empty> <if-empty field="updateInvoiceMap.currencyUomId"> - <call-class-method method-name="getPropertyValue" ret-field="invoice.currencyUomId" class-name="org.ofbiz.entity.util.EntityUtilProperties"> - <string value="general"/> - <string value="currency.uom.id.default"/> - <string value="USD"/> - <field field="locale" type="java.util.Locale"/> - <field field="delegator" type="org.ofbiz.entity.Delegator"/> - </call-class-method> + <property-to-field field="invoice.currencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> </if-empty> <call-service service-name="updateInvoice" in-map-name="updateInvoiceMap"/> <entity-one entity-name="Invoice" value-field="invoice"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |