You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Adrian Crum <ad...@sandglass-software.com> on 2011/12/06 21:25:43 UTC
Re: svn commit: r1211073 - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
framework/common/src/org/ofbiz/common/CommonServices.java framework/security/src/org/ofbiz/security/OFBizSecurity.java
Please revert this. It does not compile on Sun/Oracle JDK.
-Adrian
On 12/6/2011 7:51 PM, jaz@apache.org wrote:
> Author: jaz
> Date: Tue Dec 6 19:51:28 2011
> New Revision: 1211073
>
> URL: http://svn.apache.org/viewvc?rev=1211073&view=rev
> Log:
> few minor changes to fix compiling with openjdk icetea6 1.7.9
>
> Modified:
> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
> ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
> ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
>
> Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java?rev=1211073&r1=1211072&r2=1211073&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java (original)
> +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java Tue Dec 6 19:51:28 2011
> @@ -399,7 +399,7 @@ public class WorldPayEvents {
> // attempt to release the offline hold on the order (workflow)
> OrderChangeHelper.releaseInitialOrderHold(dispatcher, orderId);
> // call the email confirm service
> - Map<String, String> emailContext = UtilMisc.toMap("orderId", orderId, "userLogin", userLogin);
> + Map<String, Object> emailContext = UtilMisc.toMap("orderId", orderId, "userLogin", userLogin);
> try {
> dispatcher.runSync("sendOrderConfirmation", emailContext);
> } catch (GenericServiceException e) {
>
> Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java?rev=1211073&r1=1211072&r2=1211073&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java (original)
> +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java Tue Dec 6 19:51:28 2011
> @@ -184,7 +184,7 @@ public class CommonServices {
> partyId = userLogin.getString("partyId");
> }
>
> - Map<String, String> fields = UtilMisc.toMap("noteId", noteId, "noteName", noteName, "noteInfo", note,
> + Map<String, Object> fields = UtilMisc.toMap("noteId", noteId, "noteName", noteName, "noteInfo", note,
> "noteParty", partyId, "noteDateTime", noteDate);
>
> try {
>
> Modified: ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java?rev=1211073&r1=1211072&r2=1211073&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java (original)
> +++ ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java Tue Dec 6 19:51:28 2011
> @@ -49,7 +49,7 @@ public class OFBizSecurity implements Se
>
> protected Delegator delegator = null;
>
> - protected static final Map<String, Map<String, String>> simpleRoleEntity = UtilMisc.toMap(
> + protected static final Map<String, Map<String, Object>> simpleRoleEntity = UtilMisc.toMap(
> "ORDERMGR", UtilMisc.toMap("name", "OrderRole", "pkey", "orderId"),
> "FACILITY", UtilMisc.toMap("name", "FacilityParty", "pkey", "facilityId"),
> "MARKETING", UtilMisc.toMap("name", "MarketingCampaignRole", "pkey", "marketingCampaignId"));
> @@ -208,10 +208,10 @@ public class OFBizSecurity implements Se
> if (hasEntityPermission(application + "_ROLE", action, userLogin)) return true;
> }
>
> - Map<String, String> simpleRoleMap = OFBizSecurity.simpleRoleEntity.get(application);
> + Map<String, Object> simpleRoleMap = OFBizSecurity.simpleRoleEntity.get(application);
> if (simpleRoleMap != null&& roles != null) {
> - entityName = simpleRoleMap.get("name");
> - String pkey = simpleRoleMap.get("pkey");
> + entityName = (String) simpleRoleMap.get("name");
> + String pkey = (String) simpleRoleMap.get("pkey");
> if (pkey != null) {
> List<EntityExpr> expressions = new ArrayList<EntityExpr>();
> for (String role: roles) {
>
>
Re: svn commit: r1211073 - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java framework/common/src/org/ofbiz/common/CommonServices.java framework/security/src/org/ofbiz/security/OFBizSecurity.java
Posted by Jacques Le Roux <ja...@les7arts.com>.
Hi Andrew,
Since we encountered an issue with the previous JDK version we used in December 2010 on demo server, we have forced to a more recent
version then. I will try to see if using a newer version now works with your changes. Anyway we need to get ahead with JDK on demo
server.
Cheers
Jacques
From: "Andrew Zeneski" <an...@andrewzeneski.com>
> Yeah, I noticed that right after I checked it in. Its been reverted.
>
> Andrew
>
> On Dec 6, 2011, at 3:25 PM, Adrian Crum wrote:
>
>> Please revert this. It does not compile on Sun/Oracle JDK.
>>
>> -Adrian
>>
>> On 12/6/2011 7:51 PM, jaz@apache.org wrote:
>>> Author: jaz
>>> Date: Tue Dec 6 19:51:28 2011
>>> New Revision: 1211073
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1211073&view=rev
>>> Log:
>>> few minor changes to fix compiling with openjdk icetea6 1.7.9
>>>
>>> Modified:
>>> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
>>> ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
>>> ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
>>>
>>> Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java?rev=1211073&r1=1211072&r2=1211073&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java (original)
>>> +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java Tue Dec 6 19:51:28
>>> 2011
>>> @@ -399,7 +399,7 @@ public class WorldPayEvents {
>>> // attempt to release the offline hold on the order (workflow)
>>> OrderChangeHelper.releaseInitialOrderHold(dispatcher, orderId);
>>> // call the email confirm service
>>> - Map<String, String> emailContext = UtilMisc.toMap("orderId", orderId, "userLogin", userLogin);
>>> + Map<String, Object> emailContext = UtilMisc.toMap("orderId", orderId, "userLogin", userLogin);
>>> try {
>>> dispatcher.runSync("sendOrderConfirmation", emailContext);
>>> } catch (GenericServiceException e) {
>>>
>>> Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java?rev=1211073&r1=1211072&r2=1211073&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java (original)
>>> +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java Tue Dec 6 19:51:28 2011
>>> @@ -184,7 +184,7 @@ public class CommonServices {
>>> partyId = userLogin.getString("partyId");
>>> }
>>>
>>> - Map<String, String> fields = UtilMisc.toMap("noteId", noteId, "noteName", noteName, "noteInfo", note,
>>> + Map<String, Object> fields = UtilMisc.toMap("noteId", noteId, "noteName", noteName, "noteInfo", note,
>>> "noteParty", partyId, "noteDateTime", noteDate);
>>>
>>> try {
>>>
>>> Modified: ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java?rev=1211073&r1=1211072&r2=1211073&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java (original)
>>> +++ ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java Tue Dec 6 19:51:28 2011
>>> @@ -49,7 +49,7 @@ public class OFBizSecurity implements Se
>>>
>>> protected Delegator delegator = null;
>>>
>>> - protected static final Map<String, Map<String, String>> simpleRoleEntity = UtilMisc.toMap(
>>> + protected static final Map<String, Map<String, Object>> simpleRoleEntity = UtilMisc.toMap(
>>> "ORDERMGR", UtilMisc.toMap("name", "OrderRole", "pkey", "orderId"),
>>> "FACILITY", UtilMisc.toMap("name", "FacilityParty", "pkey", "facilityId"),
>>> "MARKETING", UtilMisc.toMap("name", "MarketingCampaignRole", "pkey", "marketingCampaignId"));
>>> @@ -208,10 +208,10 @@ public class OFBizSecurity implements Se
>>> if (hasEntityPermission(application + "_ROLE", action, userLogin)) return true;
>>> }
>>>
>>> - Map<String, String> simpleRoleMap = OFBizSecurity.simpleRoleEntity.get(application);
>>> + Map<String, Object> simpleRoleMap = OFBizSecurity.simpleRoleEntity.get(application);
>>> if (simpleRoleMap != null&& roles != null) {
>>> - entityName = simpleRoleMap.get("name");
>>> - String pkey = simpleRoleMap.get("pkey");
>>> + entityName = (String) simpleRoleMap.get("name");
>>> + String pkey = (String) simpleRoleMap.get("pkey");
>>> if (pkey != null) {
>>> List<EntityExpr> expressions = new ArrayList<EntityExpr>();
>>> for (String role: roles) {
>>>
>>>
>
>
Re: svn commit: r1211073 - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java framework/common/src/org/ofbiz/common/CommonServices.java framework/security/src/org/ofbiz/security/OFBizSecurity.java
Posted by Andrew Zeneski <an...@andrewzeneski.com>.
Yeah, I noticed that right after I checked it in. Its been reverted.
Andrew
On Dec 6, 2011, at 3:25 PM, Adrian Crum wrote:
> Please revert this. It does not compile on Sun/Oracle JDK.
>
> -Adrian
>
> On 12/6/2011 7:51 PM, jaz@apache.org wrote:
>> Author: jaz
>> Date: Tue Dec 6 19:51:28 2011
>> New Revision: 1211073
>>
>> URL: http://svn.apache.org/viewvc?rev=1211073&view=rev
>> Log:
>> few minor changes to fix compiling with openjdk icetea6 1.7.9
>>
>> Modified:
>> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
>> ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
>> ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
>>
>> Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java?rev=1211073&r1=1211072&r2=1211073&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java (original)
>> +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java Tue Dec 6 19:51:28 2011
>> @@ -399,7 +399,7 @@ public class WorldPayEvents {
>> // attempt to release the offline hold on the order (workflow)
>> OrderChangeHelper.releaseInitialOrderHold(dispatcher, orderId);
>> // call the email confirm service
>> - Map<String, String> emailContext = UtilMisc.toMap("orderId", orderId, "userLogin", userLogin);
>> + Map<String, Object> emailContext = UtilMisc.toMap("orderId", orderId, "userLogin", userLogin);
>> try {
>> dispatcher.runSync("sendOrderConfirmation", emailContext);
>> } catch (GenericServiceException e) {
>>
>> Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java?rev=1211073&r1=1211072&r2=1211073&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java (original)
>> +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java Tue Dec 6 19:51:28 2011
>> @@ -184,7 +184,7 @@ public class CommonServices {
>> partyId = userLogin.getString("partyId");
>> }
>>
>> - Map<String, String> fields = UtilMisc.toMap("noteId", noteId, "noteName", noteName, "noteInfo", note,
>> + Map<String, Object> fields = UtilMisc.toMap("noteId", noteId, "noteName", noteName, "noteInfo", note,
>> "noteParty", partyId, "noteDateTime", noteDate);
>>
>> try {
>>
>> Modified: ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java?rev=1211073&r1=1211072&r2=1211073&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java (original)
>> +++ ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java Tue Dec 6 19:51:28 2011
>> @@ -49,7 +49,7 @@ public class OFBizSecurity implements Se
>>
>> protected Delegator delegator = null;
>>
>> - protected static final Map<String, Map<String, String>> simpleRoleEntity = UtilMisc.toMap(
>> + protected static final Map<String, Map<String, Object>> simpleRoleEntity = UtilMisc.toMap(
>> "ORDERMGR", UtilMisc.toMap("name", "OrderRole", "pkey", "orderId"),
>> "FACILITY", UtilMisc.toMap("name", "FacilityParty", "pkey", "facilityId"),
>> "MARKETING", UtilMisc.toMap("name", "MarketingCampaignRole", "pkey", "marketingCampaignId"));
>> @@ -208,10 +208,10 @@ public class OFBizSecurity implements Se
>> if (hasEntityPermission(application + "_ROLE", action, userLogin)) return true;
>> }
>>
>> - Map<String, String> simpleRoleMap = OFBizSecurity.simpleRoleEntity.get(application);
>> + Map<String, Object> simpleRoleMap = OFBizSecurity.simpleRoleEntity.get(application);
>> if (simpleRoleMap != null&& roles != null) {
>> - entityName = simpleRoleMap.get("name");
>> - String pkey = simpleRoleMap.get("pkey");
>> + entityName = (String) simpleRoleMap.get("name");
>> + String pkey = (String) simpleRoleMap.get("pkey");
>> if (pkey != null) {
>> List<EntityExpr> expressions = new ArrayList<EntityExpr>();
>> for (String role: roles) {
>>
>>