svn commit: r899812 [7/8] - in /ofbiz/trunk: applications/accounting/src/or
Locked
svn commit: r899812 [7/8] - in /ofbiz/trunk: applications/accounting/src/or
 
|
Modified: ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidAuthorizationTokenException.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidAuthorizationTokenException.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidAuthorizationTokenException.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidAuthorizationTokenException.java Fri Jan 15 21:00:23 2010 @@ -75,10 +75,10 @@ * Get Custom Serializer */ public static org.apache.axis.encoding.Serializer getSerializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanSerializer( _javaType, _xmlType, typeDesc); } @@ -87,10 +87,10 @@ * Get Custom Deserializer */ public static org.apache.axis.encoding.Deserializer getDeserializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanDeserializer( _javaType, _xmlType, typeDesc); } Modified: ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidCredentialException.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidCredentialException.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidCredentialException.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidCredentialException.java Fri Jan 15 21:00:23 2010 @@ -75,10 +75,10 @@ * Get Custom Serializer */ public static org.apache.axis.encoding.Serializer getSerializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanSerializer( _javaType, _xmlType, typeDesc); } @@ -87,10 +87,10 @@ * Get Custom Deserializer */ public static org.apache.axis.encoding.Deserializer getDeserializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanDeserializer( _javaType, _xmlType, typeDesc); } Modified: ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidGroupException.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidGroupException.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidGroupException.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidGroupException.java Fri Jan 15 21:00:23 2010 @@ -75,10 +75,10 @@ * Get Custom Serializer */ public static org.apache.axis.encoding.Serializer getSerializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanSerializer( _javaType, _xmlType, typeDesc); } @@ -87,10 +87,10 @@ * Get Custom Deserializer */ public static org.apache.axis.encoding.Deserializer getDeserializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanDeserializer( _javaType, _xmlType, typeDesc); } Modified: ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidPrincipalException.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidPrincipalException.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidPrincipalException.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidPrincipalException.java Fri Jan 15 21:00:23 2010 @@ -75,10 +75,10 @@ * Get Custom Serializer */ public static org.apache.axis.encoding.Serializer getSerializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanSerializer( _javaType, _xmlType, typeDesc); } @@ -87,10 +87,10 @@ * Get Custom Deserializer */ public static org.apache.axis.encoding.Deserializer getDeserializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanDeserializer( _javaType, _xmlType, typeDesc); } Modified: ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidRoleException.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidRoleException.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidRoleException.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidRoleException.java Fri Jan 15 21:00:23 2010 @@ -75,10 +75,10 @@ * Get Custom Serializer */ public static org.apache.axis.encoding.Serializer getSerializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanSerializer( _javaType, _xmlType, typeDesc); } @@ -87,10 +87,10 @@ * Get Custom Deserializer */ public static org.apache.axis.encoding.Deserializer getDeserializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanDeserializer( _javaType, _xmlType, typeDesc); } Modified: ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidTokenException.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidTokenException.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidTokenException.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidTokenException.java Fri Jan 15 21:00:23 2010 @@ -75,10 +75,10 @@ * Get Custom Serializer */ public static org.apache.axis.encoding.Serializer getSerializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanSerializer( _javaType, _xmlType, typeDesc); } @@ -87,10 +87,10 @@ * Get Custom Deserializer */ public static org.apache.axis.encoding.Deserializer getDeserializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanDeserializer( _javaType, _xmlType, typeDesc); } Modified: ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ObjectNotFoundException.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ObjectNotFoundException.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ObjectNotFoundException.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ObjectNotFoundException.java Fri Jan 15 21:00:23 2010 @@ -75,10 +75,10 @@ * Get Custom Serializer */ public static org.apache.axis.encoding.Serializer getSerializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanSerializer( _javaType, _xmlType, typeDesc); } @@ -87,10 +87,10 @@ * Get Custom Deserializer */ public static org.apache.axis.encoding.Deserializer getDeserializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanDeserializer( _javaType, _xmlType, typeDesc); } Modified: ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPAttribute.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPAttribute.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPAttribute.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPAttribute.java Fri Jan 15 21:00:23 2010 @@ -43,7 +43,7 @@ /** * Gets the name value for this SOAPAttribute. - * + * * @return name */ public java.lang.String getName() { @@ -53,7 +53,7 @@ /** * Sets the name value for this SOAPAttribute. - * + * * @param name */ public void setName(java.lang.String name) { @@ -63,7 +63,7 @@ /** * Gets the values value for this SOAPAttribute. - * + * * @return values */ public java.lang.String[] getValues() { @@ -73,7 +73,7 @@ /** * Sets the values value for this SOAPAttribute. - * + * * @param values */ public void setValues(java.lang.String[] values) { @@ -91,11 +91,11 @@ } __equalsCalc = obj; boolean _equals; - _equals = true && - ((this.name==null && other.getName()==null) || + _equals = true && + ((this.name==null && other.getName()==null) || (this.name!=null && this.name.equals(other.getName()))) && - ((this.values==null && other.getValues()==null) || + ((this.values==null && other.getValues()==null) || (this.values!=null && java.util.Arrays.equals(this.values, other.getValues()))); __equalsCalc = null; @@ -161,10 +161,10 @@ * Get Custom Serializer */ public static org.apache.axis.encoding.Serializer getSerializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanSerializer( _javaType, _xmlType, typeDesc); } @@ -173,10 +173,10 @@ * Get Custom Deserializer */ public static org.apache.axis.encoding.Deserializer getDeserializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanDeserializer( _javaType, _xmlType, typeDesc); } Modified: ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPCookieInfo.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPCookieInfo.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPCookieInfo.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPCookieInfo.java Fri Jan 15 21:00:23 2010 @@ -43,7 +43,7 @@ /** * Gets the domain value for this SOAPCookieInfo. - * + * * @return domain */ public java.lang.String getDomain() { @@ -53,7 +53,7 @@ /** * Sets the domain value for this SOAPCookieInfo. - * + * * @param domain */ public void setDomain(java.lang.String domain) { @@ -63,7 +63,7 @@ /** * Gets the secure value for this SOAPCookieInfo. - * + * * @return secure */ public java.lang.Boolean getSecure() { @@ -73,7 +73,7 @@ /** * Sets the secure value for this SOAPCookieInfo. - * + * * @param secure */ public void setSecure(java.lang.Boolean secure) { @@ -91,11 +91,11 @@ } __equalsCalc = obj; boolean _equals; - _equals = true && - ((this.domain==null && other.getDomain()==null) || + _equals = true && + ((this.domain==null && other.getDomain()==null) || (this.domain!=null && this.domain.equals(other.getDomain()))) && - ((this.secure==null && other.getSecure()==null) || + ((this.secure==null && other.getSecure()==null) || (this.secure!=null && this.secure.equals(other.getSecure()))); __equalsCalc = null; @@ -152,10 +152,10 @@ * Get Custom Serializer */ public static org.apache.axis.encoding.Serializer getSerializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanSerializer( _javaType, _xmlType, typeDesc); } @@ -164,10 +164,10 @@ * Get Custom Deserializer */ public static org.apache.axis.encoding.Deserializer getDeserializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanDeserializer( _javaType, _xmlType, typeDesc); } Modified: ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPGroup.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPGroup.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPGroup.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPGroup.java Fri Jan 15 21:00:23 2010 @@ -71,7 +71,7 @@ /** * Gets the ID value for this SOAPGroup. - * + * * @return ID */ public java.lang.Long getID() { @@ -81,7 +81,7 @@ /** * Sets the ID value for this SOAPGroup. - * + * * @param ID */ public void setID(java.lang.Long ID) { @@ -91,7 +91,7 @@ /** * Gets the active value for this SOAPGroup. - * + * * @return active */ public java.lang.Boolean getActive() { @@ -101,7 +101,7 @@ /** * Sets the active value for this SOAPGroup. - * + * * @param active */ public void setActive(java.lang.Boolean active) { @@ -111,7 +111,7 @@ /** * Gets the attributes value for this SOAPGroup. - * + * * @return attributes */ public com.atlassian.crowd.integration.soap.SOAPAttribute[] getAttributes() { @@ -121,7 +121,7 @@ /** * Sets the attributes value for this SOAPGroup. - * + * * @param attributes */ public void setAttributes(com.atlassian.crowd.integration.soap.SOAPAttribute[] attributes) { @@ -131,7 +131,7 @@ /** * Gets the conception value for this SOAPGroup. - * + * * @return conception */ public java.util.Calendar getConception() { @@ -141,7 +141,7 @@ /** * Sets the conception value for this SOAPGroup. - * + * * @param conception */ public void setConception(java.util.Calendar conception) { @@ -151,7 +151,7 @@ /** * Gets the description value for this SOAPGroup. - * + * * @return description */ public java.lang.String getDescription() { @@ -161,7 +161,7 @@ /** * Sets the description value for this SOAPGroup. - * + * * @param description */ public void setDescription(java.lang.String description) { @@ -171,7 +171,7 @@ /** * Gets the directoryID value for this SOAPGroup. - * + * * @return directoryID */ public java.lang.Long getDirectoryID() { @@ -181,7 +181,7 @@ /** * Sets the directoryID value for this SOAPGroup. - * + * * @param directoryID */ public void setDirectoryID(java.lang.Long directoryID) { @@ -191,7 +191,7 @@ /** * Gets the lastModified value for this SOAPGroup. - * + * * @return lastModified */ public java.util.Calendar getLastModified() { @@ -201,7 +201,7 @@ /** * Sets the lastModified value for this SOAPGroup. - * + * * @param lastModified */ public void setLastModified(java.util.Calendar lastModified) { @@ -211,7 +211,7 @@ /** * Gets the members value for this SOAPGroup. - * + * * @return members */ public java.lang.String[] getMembers() { @@ -221,7 +221,7 @@ /** * Sets the members value for this SOAPGroup. - * + * * @param members */ public void setMembers(java.lang.String[] members) { @@ -231,7 +231,7 @@ /** * Gets the name value for this SOAPGroup. - * + * * @return name */ public java.lang.String getName() { @@ -241,7 +241,7 @@ /** * Sets the name value for this SOAPGroup. - * + * * @param name */ public void setName(java.lang.String name) { @@ -259,32 +259,32 @@ } __equalsCalc = obj; boolean _equals; - _equals = true && - ((this.ID==null && other.getID()==null) || + _equals = true && + ((this.ID==null && other.getID()==null) || (this.ID!=null && this.ID.equals(other.getID()))) && - ((this.active==null && other.getActive()==null) || + ((this.active==null && other.getActive()==null) || (this.active!=null && this.active.equals(other.getActive()))) && - ((this.attributes==null && other.getAttributes()==null) || + ((this.attributes==null && other.getAttributes()==null) || (this.attributes!=null && java.util.Arrays.equals(this.attributes, other.getAttributes()))) && - ((this.conception==null && other.getConception()==null) || + ((this.conception==null && other.getConception()==null) || (this.conception!=null && this.conception.equals(other.getConception()))) && - ((this.description==null && other.getDescription()==null) || + ((this.description==null && other.getDescription()==null) || (this.description!=null && this.description.equals(other.getDescription()))) && - ((this.directoryID==null && other.getDirectoryID()==null) || + ((this.directoryID==null && other.getDirectoryID()==null) || (this.directoryID!=null && this.directoryID.equals(other.getDirectoryID()))) && - ((this.lastModified==null && other.getLastModified()==null) || + ((this.lastModified==null && other.getLastModified()==null) || (this.lastModified!=null && this.lastModified.equals(other.getLastModified()))) && - ((this.members==null && other.getMembers()==null) || + ((this.members==null && other.getMembers()==null) || (this.members!=null && java.util.Arrays.equals(this.members, other.getMembers()))) && - ((this.name==null && other.getName()==null) || + ((this.name==null && other.getName()==null) || (this.name!=null && this.name.equals(other.getName()))); __equalsCalc = null; @@ -429,10 +429,10 @@ * Get Custom Serializer */ public static org.apache.axis.encoding.Serializer getSerializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanSerializer( _javaType, _xmlType, typeDesc); } @@ -441,10 +441,10 @@ * Get Custom Deserializer */ public static org.apache.axis.encoding.Deserializer getDeserializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanDeserializer( _javaType, _xmlType, typeDesc); } Modified: ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPNestableGroup.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPNestableGroup.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPNestableGroup.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPNestableGroup.java Fri Jan 15 21:00:23 2010 @@ -71,7 +71,7 @@ /** * Gets the ID value for this SOAPNestableGroup. - * + * * @return ID */ public java.lang.Long getID() { @@ -81,7 +81,7 @@ /** * Sets the ID value for this SOAPNestableGroup. - * + * * @param ID */ public void setID(java.lang.Long ID) { @@ -91,7 +91,7 @@ /** * Gets the active value for this SOAPNestableGroup. - * + * * @return active */ public java.lang.Boolean getActive() { @@ -101,7 +101,7 @@ /** * Sets the active value for this SOAPNestableGroup. - * + * * @param active */ public void setActive(java.lang.Boolean active) { @@ -111,7 +111,7 @@ /** * Gets the attributes value for this SOAPNestableGroup. - * + * * @return attributes */ public com.atlassian.crowd.integration.soap.SOAPAttribute[] getAttributes() { @@ -121,7 +121,7 @@ /** * Sets the attributes value for this SOAPNestableGroup. - * + * * @param attributes */ public void setAttributes(com.atlassian.crowd.integration.soap.SOAPAttribute[] attributes) { @@ -131,7 +131,7 @@ /** * Gets the conception value for this SOAPNestableGroup. - * + * * @return conception */ public java.util.Calendar getConception() { @@ -141,7 +141,7 @@ /** * Sets the conception value for this SOAPNestableGroup. - * + * * @param conception */ public void setConception(java.util.Calendar conception) { @@ -151,7 +151,7 @@ /** * Gets the description value for this SOAPNestableGroup. - * + * * @return description */ public java.lang.String getDescription() { @@ -161,7 +161,7 @@ /** * Sets the description value for this SOAPNestableGroup. - * + * * @param description */ public void setDescription(java.lang.String description) { @@ -171,7 +171,7 @@ /** * Gets the directoryID value for this SOAPNestableGroup. - * + * * @return directoryID */ public java.lang.Long getDirectoryID() { @@ -181,7 +181,7 @@ /** * Sets the directoryID value for this SOAPNestableGroup. - * + * * @param directoryID */ public void setDirectoryID(java.lang.Long directoryID) { @@ -191,7 +191,7 @@ /** * Gets the groupMembers value for this SOAPNestableGroup. - * + * * @return groupMembers */ public java.lang.String[] getGroupMembers() { @@ -201,7 +201,7 @@ /** * Sets the groupMembers value for this SOAPNestableGroup. - * + * * @param groupMembers */ public void setGroupMembers(java.lang.String[] groupMembers) { @@ -211,7 +211,7 @@ /** * Gets the lastModified value for this SOAPNestableGroup. - * + * * @return lastModified */ public java.util.Calendar getLastModified() { @@ -221,7 +221,7 @@ /** * Sets the lastModified value for this SOAPNestableGroup. - * + * * @param lastModified */ public void setLastModified(java.util.Calendar lastModified) { @@ -231,7 +231,7 @@ /** * Gets the name value for this SOAPNestableGroup. - * + * * @return name */ public java.lang.String getName() { @@ -241,7 +241,7 @@ /** * Sets the name value for this SOAPNestableGroup. - * + * * @param name */ public void setName(java.lang.String name) { @@ -259,32 +259,32 @@ } __equalsCalc = obj; boolean _equals; - _equals = true && - ((this.ID==null && other.getID()==null) || + _equals = true && + ((this.ID==null && other.getID()==null) || (this.ID!=null && this.ID.equals(other.getID()))) && - ((this.active==null && other.getActive()==null) || + ((this.active==null && other.getActive()==null) || (this.active!=null && this.active.equals(other.getActive()))) && - ((this.attributes==null && other.getAttributes()==null) || + ((this.attributes==null && other.getAttributes()==null) || (this.attributes!=null && java.util.Arrays.equals(this.attributes, other.getAttributes()))) && - ((this.conception==null && other.getConception()==null) || + ((this.conception==null && other.getConception()==null) || (this.conception!=null && this.conception.equals(other.getConception()))) && - ((this.description==null && other.getDescription()==null) || + ((this.description==null && other.getDescription()==null) || (this.description!=null && this.description.equals(other.getDescription()))) && - ((this.directoryID==null && other.getDirectoryID()==null) || + ((this.directoryID==null && other.getDirectoryID()==null) || (this.directoryID!=null && this.directoryID.equals(other.getDirectoryID()))) && - ((this.groupMembers==null && other.getGroupMembers()==null) || + ((this.groupMembers==null && other.getGroupMembers()==null) || (this.groupMembers!=null && java.util.Arrays.equals(this.groupMembers, other.getGroupMembers()))) && - ((this.lastModified==null && other.getLastModified()==null) || + ((this.lastModified==null && other.getLastModified()==null) || (this.lastModified!=null && this.lastModified.equals(other.getLastModified()))) && - ((this.name==null && other.getName()==null) || + ((this.name==null && other.getName()==null) || (this.name!=null && this.name.equals(other.getName()))); __equalsCalc = null; @@ -429,10 +429,10 @@ * Get Custom Serializer */ public static org.apache.axis.encoding.Serializer getSerializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanSerializer( _javaType, _xmlType, typeDesc); } @@ -441,10 +441,10 @@ * Get Custom Deserializer */ public static org.apache.axis.encoding.Deserializer getDeserializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanDeserializer( _javaType, _xmlType, typeDesc); } Modified: ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPPrincipal.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPPrincipal.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPPrincipal.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPPrincipal.java Fri Jan 15 21:00:23 2010 @@ -67,7 +67,7 @@ /** * Gets the ID value for this SOAPPrincipal. - * + * * @return ID */ public java.lang.Long getID() { @@ -77,7 +77,7 @@ /** * Sets the ID value for this SOAPPrincipal. - * + * * @param ID */ public void setID(java.lang.Long ID) { @@ -87,7 +87,7 @@ /** * Gets the active value for this SOAPPrincipal. - * + * * @return active */ public java.lang.Boolean getActive() { @@ -97,7 +97,7 @@ /** * Sets the active value for this SOAPPrincipal. - * + * * @param active */ public void setActive(java.lang.Boolean active) { @@ -107,7 +107,7 @@ /** * Gets the attributes value for this SOAPPrincipal. - * + * * @return attributes */ public com.atlassian.crowd.integration.soap.SOAPAttribute[] getAttributes() { @@ -117,7 +117,7 @@ /** * Sets the attributes value for this SOAPPrincipal. - * + * * @param attributes */ public void setAttributes(com.atlassian.crowd.integration.soap.SOAPAttribute[] attributes) { @@ -127,7 +127,7 @@ /** * Gets the conception value for this SOAPPrincipal. - * + * * @return conception */ public java.util.Calendar getConception() { @@ -137,7 +137,7 @@ /** * Sets the conception value for this SOAPPrincipal. - * + * * @param conception */ public void setConception(java.util.Calendar conception) { @@ -147,7 +147,7 @@ /** * Gets the description value for this SOAPPrincipal. - * + * * @return description */ public java.lang.String getDescription() { @@ -157,7 +157,7 @@ /** * Sets the description value for this SOAPPrincipal. - * + * * @param description */ public void setDescription(java.lang.String description) { @@ -167,7 +167,7 @@ /** * Gets the directoryID value for this SOAPPrincipal. - * + * * @return directoryID */ public java.lang.Long getDirectoryID() { @@ -177,7 +177,7 @@ /** * Sets the directoryID value for this SOAPPrincipal. - * + * * @param directoryID */ public void setDirectoryID(java.lang.Long directoryID) { @@ -187,7 +187,7 @@ /** * Gets the lastModified value for this SOAPPrincipal. - * + * * @return lastModified */ public java.util.Calendar getLastModified() { @@ -197,7 +197,7 @@ /** * Sets the lastModified value for this SOAPPrincipal. - * + * * @param lastModified */ public void setLastModified(java.util.Calendar lastModified) { @@ -207,7 +207,7 @@ /** * Gets the name value for this SOAPPrincipal. - * + * * @return name */ public java.lang.String getName() { @@ -217,7 +217,7 @@ /** * Sets the name value for this SOAPPrincipal. - * + * * @param name */ public void setName(java.lang.String name) { @@ -235,29 +235,29 @@ } __equalsCalc = obj; boolean _equals; - _equals = true && - ((this.ID==null && other.getID()==null) || + _equals = true && + ((this.ID==null && other.getID()==null) || (this.ID!=null && this.ID.equals(other.getID()))) && - ((this.active==null && other.getActive()==null) || + ((this.active==null && other.getActive()==null) || (this.active!=null && this.active.equals(other.getActive()))) && - ((this.attributes==null && other.getAttributes()==null) || + ((this.attributes==null && other.getAttributes()==null) || (this.attributes!=null && java.util.Arrays.equals(this.attributes, other.getAttributes()))) && - ((this.conception==null && other.getConception()==null) || + ((this.conception==null && other.getConception()==null) || (this.conception!=null && this.conception.equals(other.getConception()))) && - ((this.description==null && other.getDescription()==null) || + ((this.description==null && other.getDescription()==null) || (this.description!=null && this.description.equals(other.getDescription()))) && - ((this.directoryID==null && other.getDirectoryID()==null) || + ((this.directoryID==null && other.getDirectoryID()==null) || (this.directoryID!=null && this.directoryID.equals(other.getDirectoryID()))) && - ((this.lastModified==null && other.getLastModified()==null) || + ((this.lastModified==null && other.getLastModified()==null) || (this.lastModified!=null && this.lastModified.equals(other.getLastModified()))) && - ((this.name==null && other.getName()==null) || + ((this.name==null && other.getName()==null) || (this.name!=null && this.name.equals(other.getName()))); __equalsCalc = null; @@ -383,10 +383,10 @@ * Get Custom Serializer */ public static org.apache.axis.encoding.Serializer getSerializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanSerializer( _javaType, _xmlType, typeDesc); } @@ -395,10 +395,10 @@ * Get Custom Deserializer */ public static org.apache.axis.encoding.Deserializer getDeserializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanDeserializer( _javaType, _xmlType, typeDesc); } Modified: ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPRole.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPRole.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPRole.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPRole.java Fri Jan 15 21:00:23 2010 @@ -71,7 +71,7 @@ /** * Gets the ID value for this SOAPRole. - * + * * @return ID */ public java.lang.Long getID() { @@ -81,7 +81,7 @@ /** * Sets the ID value for this SOAPRole. - * + * * @param ID */ public void setID(java.lang.Long ID) { @@ -91,7 +91,7 @@ /** * Gets the active value for this SOAPRole. - * + * * @return active */ public java.lang.Boolean getActive() { @@ -101,7 +101,7 @@ /** * Sets the active value for this SOAPRole. - * + * * @param active */ public void setActive(java.lang.Boolean active) { @@ -111,7 +111,7 @@ /** * Gets the attributes value for this SOAPRole. - * + * * @return attributes */ public com.atlassian.crowd.integration.soap.SOAPAttribute[] getAttributes() { @@ -121,7 +121,7 @@ /** * Sets the attributes value for this SOAPRole. - * + * * @param attributes */ public void setAttributes(com.atlassian.crowd.integration.soap.SOAPAttribute[] attributes) { @@ -131,7 +131,7 @@ /** * Gets the conception value for this SOAPRole. - * + * * @return conception */ public java.util.Calendar getConception() { @@ -141,7 +141,7 @@ /** * Sets the conception value for this SOAPRole. - * + * * @param conception */ public void setConception(java.util.Calendar conception) { @@ -151,7 +151,7 @@ /** * Gets the description value for this SOAPRole. - * + * * @return description */ public java.lang.String getDescription() { @@ -161,7 +161,7 @@ /** * Sets the description value for this SOAPRole. - * + * * @param description */ public void setDescription(java.lang.String description) { @@ -171,7 +171,7 @@ /** * Gets the directoryID value for this SOAPRole. - * + * * @return directoryID */ public java.lang.Long getDirectoryID() { @@ -181,7 +181,7 @@ /** * Sets the directoryID value for this SOAPRole. - * + * * @param directoryID */ public void setDirectoryID(java.lang.Long directoryID) { @@ -191,7 +191,7 @@ /** * Gets the lastModified value for this SOAPRole. - * + * * @return lastModified */ public java.util.Calendar getLastModified() { @@ -201,7 +201,7 @@ /** * Sets the lastModified value for this SOAPRole. - * + * * @param lastModified */ public void setLastModified(java.util.Calendar lastModified) { @@ -211,7 +211,7 @@ /** * Gets the members value for this SOAPRole. - * + * * @return members */ public java.lang.String[] getMembers() { @@ -221,7 +221,7 @@ /** * Sets the members value for this SOAPRole. - * + * * @param members */ public void setMembers(java.lang.String[] members) { @@ -231,7 +231,7 @@ /** * Gets the name value for this SOAPRole. - * + * * @return name */ public java.lang.String getName() { @@ -241,7 +241,7 @@ /** * Sets the name value for this SOAPRole. - * + * * @param name */ public void setName(java.lang.String name) { @@ -259,32 +259,32 @@ } __equalsCalc = obj; boolean _equals; - _equals = true && - ((this.ID==null && other.getID()==null) || + _equals = true && + ((this.ID==null && other.getID()==null) || (this.ID!=null && this.ID.equals(other.getID()))) && - ((this.active==null && other.getActive()==null) || + ((this.active==null && other.getActive()==null) || (this.active!=null && this.active.equals(other.getActive()))) && - ((this.attributes==null && other.getAttributes()==null) || + ((this.attributes==null && other.getAttributes()==null) || (this.attributes!=null && java.util.Arrays.equals(this.attributes, other.getAttributes()))) && - ((this.conception==null && other.getConception()==null) || + ((this.conception==null && other.getConception()==null) || (this.conception!=null && this.conception.equals(other.getConception()))) && - ((this.description==null && other.getDescription()==null) || + ((this.description==null && other.getDescription()==null) || (this.description!=null && this.description.equals(other.getDescription()))) && - ((this.directoryID==null && other.getDirectoryID()==null) || + ((this.directoryID==null && other.getDirectoryID()==null) || (this.directoryID!=null && this.directoryID.equals(other.getDirectoryID()))) && - ((this.lastModified==null && other.getLastModified()==null) || + ((this.lastModified==null && other.getLastModified()==null) || (this.lastModified!=null && this.lastModified.equals(other.getLastModified()))) && - ((this.members==null && other.getMembers()==null) || + ((this.members==null && other.getMembers()==null) || (this.members!=null && java.util.Arrays.equals(this.members, other.getMembers()))) && - ((this.name==null && other.getName()==null) || + ((this.name==null && other.getName()==null) || (this.name!=null && this.name.equals(other.getName()))); __equalsCalc = null; @@ -429,10 +429,10 @@ * Get Custom Serializer */ public static org.apache.axis.encoding.Serializer getSerializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanSerializer( _javaType, _xmlType, typeDesc); } @@ -441,10 +441,10 @@ * Get Custom Deserializer */ public static org.apache.axis.encoding.Deserializer getDeserializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanDeserializer( _javaType, _xmlType, typeDesc); } Modified: ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SearchRestriction.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SearchRestriction.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SearchRestriction.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SearchRestriction.java Fri Jan 15 21:00:23 2010 @@ -43,7 +43,7 @@ /** * Gets the name value for this SearchRestriction. - * + * * @return name */ public java.lang.String getName() { @@ -53,7 +53,7 @@ /** * Sets the name value for this SearchRestriction. - * + * * @param name */ public void setName(java.lang.String name) { @@ -63,7 +63,7 @@ /** * Gets the value value for this SearchRestriction. - * + * * @return value */ public java.lang.String getValue() { @@ -73,7 +73,7 @@ /** * Sets the value value for this SearchRestriction. - * + * * @param value */ public void setValue(java.lang.String value) { @@ -91,11 +91,11 @@ } __equalsCalc = obj; boolean _equals; - _equals = true && - ((this.name==null && other.getName()==null) || + _equals = true && + ((this.name==null && other.getName()==null) || (this.name!=null && this.name.equals(other.getName()))) && - ((this.value==null && other.getValue()==null) || + ((this.value==null && other.getValue()==null) || (this.value!=null && this.value.equals(other.getValue()))); __equalsCalc = null; @@ -152,10 +152,10 @@ * Get Custom Serializer */ public static org.apache.axis.encoding.Serializer getSerializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanSerializer( _javaType, _xmlType, typeDesc); } @@ -164,10 +164,10 @@ * Get Custom Deserializer */ public static org.apache.axis.encoding.Deserializer getDeserializer( - java.lang.String mechType, - java.lang.Class _javaType, + java.lang.String mechType, + java.lang.Class _javaType, javax.xml.namespace.QName _xmlType) { - return + return new org.apache.axis.encoding.ser.BeanDeserializer( _javaType, _xmlType, typeDesc); } Modified: ofbiz/trunk/specialpurpose/crowd/src/org/ofbiz/crowd/CrowdAuthenticator.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/org/ofbiz/crowd/CrowdAuthenticator.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/org/ofbiz/crowd/CrowdAuthenticator.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/org/ofbiz/crowd/CrowdAuthenticator.java Fri Jan 15 21:00:23 2010 @@ -217,7 +217,7 @@ } catch (GenericEntityException e) { Debug.logError(e, e.getMessage(), module); } - + // add it to the user if it exists if (secGroup != null) { Map<String, Serializable> createSecGrpMap = FastMap.newInstance(); @@ -225,7 +225,7 @@ createSecGrpMap.put("groupId", securityGroup); createSecGrpMap.put("fromDate", now); createSecGrpMap.put("userLogin", system); - + Map<String, Object> createSecGrpResult; try { createSecGrpResult = dispatcher.runSync("addUserLoginToSecurityGroup", createSecGrpMap); Modified: ofbiz/trunk/specialpurpose/crowd/src/org/ofbiz/crowd/security/SecurityServerLocator.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/org/ofbiz/crowd/security/SecurityServerLocator.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/org/ofbiz/crowd/security/SecurityServerLocator.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/org/ofbiz/crowd/security/SecurityServerLocator.java Fri Jan 15 21:00:23 2010 @@ -142,11 +142,11 @@ * Set the endpoint address for the specified port name. */ public void setEndpointAddress(java.lang.String portName, java.lang.String address) throws javax.xml.rpc.ServiceException { - + if ("SecurityServerHttpPort".equals(portName)) { setSecurityServerHttpPortEndpointAddress(address); } - else + else { // Unknown Port Name throw new javax.xml.rpc.ServiceException(" Cannot set Endpoint Address for Unknown Port" + portName); } Modified: ofbiz/trunk/specialpurpose/crowd/src/org/ofbiz/crowd/user/UserAttributeMapper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/crowd/src/org/ofbiz/crowd/user/UserAttributeMapper.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/crowd/src/org/ofbiz/crowd/user/UserAttributeMapper.java (original) +++ ofbiz/trunk/specialpurpose/crowd/src/org/ofbiz/crowd/user/UserAttributeMapper.java Fri Jan 15 21:00:23 2010 @@ -97,14 +97,14 @@ private String getCrowdKey(String name) { Properties props = UtilProperties.getProperties("crowd.properties"); - return (String) props.get("crowd.attribute.map." + name); + return (String) props.get("crowd.attribute.map." + name); } private SOAPAttribute makeAttribute(String name, String value) { SOAPAttribute attr = new SOAPAttribute(); attr.setName(getCrowdKey(name)); - attr.setValues(new String[] {value}); - + attr.setValues(new String[] {value}); + removeAttributeByName(attr.getName()); attributes.add(attr); return attr; Modified: ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java (original) +++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java Fri Jan 15 21:00:23 2010 @@ -57,7 +57,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -public class EbayHelper { +public class EbayHelper { private static final String configFileName = "ebayExport.properties"; private static final String module = EbayHelper.class.getName(); public static final String resource = "EbayUiLabels"; @@ -91,9 +91,9 @@ buildEbayConfigContext.put("compatibilityLevel", UtilProperties.getPropertyValue(configFileName, "eBayExport.compatibilityLevel")); buildEbayConfigContext.put("siteID", UtilProperties.getPropertyValue(configFileName, "eBayExport.siteID")); buildEbayConfigContext.put("xmlGatewayUri", UtilProperties.getPropertyValue(configFileName, "eBayExport.xmlGatewayUri")); - } + } return buildEbayConfigContext; - } + } public static void appendRequesterCredentials(Element elem, Document doc, String token) { Element requesterCredentialsElem = UtilXml.addChildElement(elem, "RequesterCredentials", doc); @@ -164,7 +164,7 @@ } return outputBuilder.toString(); } - + public static void setShipmentMethodType(ShoppingCart cart, String shippingService, String productStoreId, Delegator delegator) { String partyId = "_NA_"; String shipmentMethodTypeId = "NO_SHIPPING"; @@ -180,7 +180,7 @@ cart.setCarrierPartyId(partyId); cart.setShipmentMethodTypeId(shipmentMethodTypeId); } - + public static boolean createPaymentFromPaymentPreferences(Delegator delegator, LocalDispatcher dispatcher, GenericValue userLogin, String orderId, String externalId, Timestamp orderDate, String partyIdFrom) { List<GenericValue> paymentPreferences = null; @@ -412,7 +412,7 @@ return emailContactMechId; } - public static void createEbayCustomer(LocalDispatcher dispatcher, String partyId, String ebayUserIdBuyer, String eias, + public static void createEbayCustomer(LocalDispatcher dispatcher, String partyId, String ebayUserIdBuyer, String eias, GenericValue userLogin) { Map<String, Object> context = FastMap.newInstance(); Map<String, Object> summaryResult = FastMap.newInstance(); @@ -578,7 +578,7 @@ Debug.logInfo("Unable to find matching postal address for partyId " + partyId + ". Creating a new one.", module); return createPartyPhone(dispatcher, partyId, (String) context.get("shippingAddressPhone"), userLogin); } - + public static String retrieveProductIdFromTitle(Delegator delegator, String title) { String productId = ""; try { @@ -604,5 +604,5 @@ productId = ""; } return productId; - } + } } \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java?rev=899812&r1=899811&r2=899812&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java (original) +++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java Fri Jan 15 21:00:23 2010 @@ -54,17 +54,17 @@ import org.w3c.dom.Element; public class EbayOrderServices { - + private static final String resource = "EbayUiLabels"; private static final String module = EbayOrderServices.class.getName(); private static boolean isGetSellerTransactionsCall = false; private static boolean isGetOrdersCall = false; private static boolean isGetMyeBaySellingCall = false; private static List<Map<String, Object>> orderList = FastList.newInstance(); - private static List<String> getSellerTransactionsContainingOrderList = FastList.newInstance(); + private static List<String> getSellerTransactionsContainingOrderList = FastList.newInstance(); private static List<String> orderImportSuccessMessageList = FastList.newInstance(); private static List<String> orderImportFailureMessageList = FastList.newInstance(); - + public static Map<String, Object> getEbayOrders(DispatchContext dctx, Map<String, Object> context) { Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); @@ -79,7 +79,7 @@ String eBayConfigErrorMsg = "Configuration settings are missing for connecting to eBay server."; return ServiceUtil.returnError(eBayConfigErrorMsg); } - + StringBuffer sellerTransactionsItemsXml = new StringBuffer(); if (!ServiceUtil.isFailure(buildGetSellerTransactionsRequest(context, sellerTransactionsItemsXml, eBayConfigResult.get("token").toString()))) { result = EbayHelper.postItem(eBayConfigResult.get("xmlGatewayUri").toString(), sellerTransactionsItemsXml, eBayConfigResult.get("devID").toString(), eBayConfigResult.get("appID").toString(), eBayConfigResult.get("certID").toString(), "GetSellerTransactions", eBayConfigResult.get("compatibilityLevel").toString(), eBayConfigResult.get("siteID").toString()); @@ -89,7 +89,7 @@ result = checkOrders(delegator, dispatcher, locale, context, getSellerTransactionSuccessMsg); } } - + StringBuffer getOrdersXml = new StringBuffer(); if (!ServiceUtil.isFailure(buildGetOrdersRequest(context, getOrdersXml, eBayConfigResult.get("token").toString()))) { result = EbayHelper.postItem(eBayConfigResult.get("xmlGatewayUri").toString(), getOrdersXml, eBayConfigResult.get("devID").toString(), eBayConfigResult.get("appID").toString(), eBayConfigResult.get("certID").toString(), "GetOrders", eBayConfigResult.get("compatibilityLevel").toString(), eBayConfigResult.get("siteID").toString()); @@ -99,7 +99,7 @@ result = checkOrders(delegator, dispatcher, locale, context, getOrdersSuccessMsg); } } - + StringBuffer getMyeBaySellingXml = new StringBuffer(); if (!ServiceUtil.isFailure(buildGetMyeBaySellingRequest(context, getMyeBaySellingXml, eBayConfigResult.get("token").toString()))) { result = EbayHelper.postItem(eBayConfigResult.get("xmlGatewayUri").toString(), getMyeBaySellingXml, eBayConfigResult.get("devID").toString(), eBayConfigResult.get("appID").toString(), eBayConfigResult.get("certID").toString(), "GetMyeBaySelling", eBayConfigResult.get("compatibilityLevel").toString(), eBayConfigResult.get("siteID").toString()); @@ -133,7 +133,7 @@ context.putAll(orderMapCtx); break; } - } + } } result = createShoppingCart(delegator, dispatcher, locale, context, true); } catch (Exception e) { @@ -144,14 +144,14 @@ result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS); result.put(ModelService.SUCCESS_MESSAGE_LIST, orderImportSuccessMessageList); } - + if (UtilValidate.isNotEmpty(orderImportSuccessMessageList)) { result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_FAIL); result.put(ModelService.ERROR_MESSAGE_LIST, orderImportFailureMessageList); } return result; } - + private static Map<String, Object> buildGetOrdersRequest(Map<String, Object> context, StringBuffer dataItemsXml, String token) { Locale locale = (Locale) context.get("locale"); String fromDate = (String) context.get("fromDate"); @@ -163,7 +163,7 @@ UtilXml.addChildElementValue(transElem, "DetailLevel", "ReturnAll", transDoc); EbayHelper.appendRequesterCredentials(transElem, transDoc, token); - + if (UtilValidate.isNotEmpty(getSellerTransactionsContainingOrderList)) { Element orderIdArrayElem = UtilXml.addChildElement(transElem, "OrderIDArray", transDoc); Iterator<String> orderIdListIter = getSellerTransactionsContainingOrderList.iterator(); @@ -171,10 +171,10 @@ String orderId = (String) orderIdListIter.next(); UtilXml.addChildElementValue(orderIdArrayElem, "OrderID", orderId, transDoc); } - } else { + } else { UtilXml.addChildElementValue(transElem, "OrderRole", "Seller", transDoc); UtilXml.addChildElementValue(transElem, "OrderStatus", "Completed", transDoc); - + String fromDateOut = EbayHelper.convertDate(fromDate, "yyyy-MM-dd HH:mm:ss.SSS", "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); if (fromDateOut != null) { UtilXml.addChildElementValue(transElem, "CreateTimeFrom", fromDateOut, transDoc); @@ -198,7 +198,7 @@ } return ServiceUtil.returnSuccess(); } - + private static Map<String, Object> buildGetSellerTransactionsRequest(Map<String, Object> context, StringBuffer sellerTransactionsItemsXml, String token) { Locale locale = (Locale)context.get("locale"); String fromDate = (String)context.get("fromDate"); @@ -244,7 +244,7 @@ transElem.setAttribute("xmlns", "urn:ebay:apis:eBLBaseComponents"); EbayHelper.appendRequesterCredentials(transElem, transDoc, token); - + Element deletedFromSoldListElem = UtilXml.addChildElement(transElem, "DeletedFromSoldList", transDoc); UtilXml.addChildElementValue(deletedFromSoldListElem, "Sort", "ItemID", transDoc); //Debug.logInfo("The value of generated string is ======= " + UtilXml.writeXmlDocument(transDoc), module); @@ -255,7 +255,7 @@ } return ServiceUtil.returnSuccess(); } - + private static Map<String, Object> checkOrders(Delegator delegator, LocalDispatcher dispatcher, Locale locale, Map<String, Object> context, String responseMsg) { StringBuffer errorMessage = new StringBuffer(); Map<String, Object> result = FastMap.newInstance(); @@ -270,7 +270,7 @@ } else if (isGetOrdersCall) { List<Map<String, Object>> getOrdersList = readGetOrdersResponse(responseMsg, locale, (String) context.get("productStoreId"), delegator, dispatcher, errorMessage, userLogin); if (UtilValidate.isNotEmpty(getOrdersList)) { - orderList.addAll(getOrdersList); + orderList.addAll(getOrdersList); } isGetOrdersCall = false; return ServiceUtil.returnSuccess(); @@ -298,9 +298,9 @@ } return result; } - -// Sample xml data that is being generated from GetOrders request -// + +// Sample xml data that is being generated from GetOrders request +// // <?xml version="1.0" encoding="UTF-8"?><GetOrdersResponse xmlns="urn:ebay:apis:eBLBaseComponents"> // <Timestamp>2009-09-10T11:17:53.529Z</Timestamp> // <Ack>Success</Ack> @@ -417,8 +417,8 @@ // </Order> // </OrderArray> //</GetOrdersResponse> - - + + private static List<Map<String, Object>> readGetOrdersResponse(String responseMsg, Locale locale, String productStoreId, Delegator delegator, LocalDispatcher dispatcher, StringBuffer errorMessage, GenericValue userLogin) { List<Map<String, Object>> fetchedOrders = FastList.newInstance(); try { @@ -428,7 +428,7 @@ String ack = UtilXml.childElementValue(elemResponse, "Ack", "Failure"); int totalOrders = 0; - + if (ack != null && "Success".equals(ack)) { List<? extends Element> orderArrays = UtilXml.childElementList(elemResponse, "OrderArray"); if (UtilValidate.isNotEmpty(orderArrays)) { @@ -443,9 +443,9 @@ // retrieve transaction List<? extends Element> orders = UtilXml.childElementList(orderArraysElement, "Order"); Iterator<? extends Element> ordersElemIter = orders.iterator(); - + while (ordersElemIter.hasNext()) { - Map<String, Object> orderCtx = FastMap.newInstance(); + Map<String, Object> orderCtx = FastMap.newInstance(); Element ordersElement = (Element) ordersElemIter.next(); String externalOrderId = UtilXml.childElementValue(ordersElement, "OrderID"); GenericValue orderExist = externalOrderExists(delegator, externalOrderId); @@ -454,7 +454,7 @@ } else { orderCtx.put("orderId", ""); } - + orderCtx.put("externalId", externalOrderId); orderCtx.put("amountPaid", UtilXml.childElementValue(ordersElement, "Total", "0")); String createdDate = UtilXml.childElementValue(ordersElement, "CreatedTime"); @@ -466,8 +466,8 @@ orderCtx.put("shippedTime", UtilXml.childElementValue(ordersElement, "ShippedTime")); orderCtx.put("ebayUserIdBuyer", UtilXml.childElementValue(ordersElement, "BuyerUserID")); orderCtx.put("productStoreId", productStoreId); - - // Retrieve shipping address + + // Retrieve shipping address Map<String, Object> shippingAddressCtx = FastMap.newInstance(); List<? extends Element> shippingAddressList = UtilXml.childElementList(ordersElement, "ShippingAddress"); Iterator<? extends Element> shippingAddressElemIter = shippingAddressList.iterator(); @@ -484,12 +484,12 @@ shippingAddressCtx.put("shippingAddressPostalCode", UtilXml.childElementValue(shippingAddressElement, "PostalCode")); } orderCtx.put("shippingAddressCtx", shippingAddressCtx); - + if (UtilValidate.isEmpty(shippingAddressCtx)) { String shippingAddressMissingMsg = "Shipping Address is missing for eBay Order ID (" + externalOrderId + ")"; orderImportFailureMessageList.add(shippingAddressMissingMsg); } - + // Retrieve shipping service selected Map<String, Object> shippingServiceSelectedCtx = FastMap.newInstance(); List<? extends Element> shippingServiceSelectedList = UtilXml.childElementList(ordersElement, "ShippingServiceSelected"); @@ -504,12 +504,12 @@ } } orderCtx.put("shippingServiceSelectedCtx", shippingServiceSelectedCtx); - + if (UtilValidate.isEmpty(shippingServiceSelectedCtx.get("shippingService").toString())) { String shippingServiceMissingMsg = "Shipping Method is missing for eBay Order ID (" + externalOrderId + ")"; orderImportFailureMessageList.add(shippingServiceMissingMsg); } - + // Retrieve shipping details Map<String, Object> shippingDetailsCtx = FastMap.newInstance(); List<? extends Element> shippingDetailsList = UtilXml.childElementList(ordersElement, "ShippingDetails"); @@ -532,7 +532,7 @@ } } orderCtx.put("shippingDetailsCtx", shippingDetailsCtx); - + // Retrieve checkout status Map<String, Object> checkoutStatusCtx = FastMap.newInstance(); List<? extends Element> checkoutStatusList = UtilXml.childElementList(ordersElement, "CheckoutStatus"); @@ -544,7 +544,7 @@ checkoutStatusCtx.put("completeStatus", UtilXml.childElementValue(statusElement, "Status")); } orderCtx.put("checkoutStatusCtx", checkoutStatusCtx); - + // Retrieve external transaction Map<String, Object> externalTransactionCtx = FastMap.newInstance(); List<? extends Element> externalTransactionList = UtilXml.childElementList(ordersElement, "ExternalTransaction"); @@ -557,22 +557,22 @@ externalTransactionCtx.put("paymentOrRefundAmount", UtilXml.childElementValue(externalTransactionElement, "PaymentOrRefundAmount", "0")); } orderCtx.put("externalTransactionCtx", externalTransactionCtx); - + // Retrieve Transactions Array --> Transactions | Order Items List<Map<String, Object>> orderItemList = FastList.newInstance(); String buyersEmailId = null; List<? extends Element> transactionArrayList = UtilXml.childElementList(ordersElement, "TransactionArray"); Iterator<? extends Element> transactionArrayElemIter = transactionArrayList.iterator(); - while (transactionArrayElemIter.hasNext()) { + while (transactionArrayElemIter.hasNext()) { Element transactionArrayElement = (Element) transactionArrayElemIter.next(); - + boolean buyerEmailExists = false; List<? extends Element> transactionList = UtilXml.childElementList(transactionArrayElement, "Transaction"); Iterator<? extends Element> transactionElemIter = transactionList.iterator(); - while (transactionElemIter.hasNext()) { + while (transactionElemIter.hasNext()) { Map<String, Object> transactionCtx = FastMap.newInstance(); Element transactionElement = (Element) transactionElemIter.next(); - + // Retrieve Buyer email if (!buyerEmailExists) { List<? extends Element> buyerList = UtilXml.childElementList(transactionElement, "Buyer"); @@ -585,7 +585,7 @@ } } } - + // Retrieve Order Item info List<? extends Element> itemList = UtilXml.childElementList(transactionElement, "Item"); Iterator<? extends Element> itemElemIter = itemList.iterator(); @@ -607,7 +607,7 @@ orderCtx.put("userLogin", userLogin); orderCtx.put("isEbayOrder", "Y"); orderCtx.put("isEbayTransaction", ""); - + //Map<String, Object> result = dispatcher.runSync("importEbayOrders", orderCtx); fetchedOrders.add(orderCtx); } @@ -627,7 +627,7 @@ } return fetchedOrders; } - + private static List<Map<String, Object>> readGetSellerTransactionResponse(String responseMsg, Locale locale, String productStoreId, Delegator delegator, LocalDispatcher dispatcher, StringBuffer errorMessage, GenericValue userLogin) { List<Map<String, Object>> fetchedOrders = FastList.newInstance(); try { @@ -659,7 +659,7 @@ while (transactionElemIter.hasNext()) { Element transactionElement = (Element) transactionElemIter.next(); Map<String, Object> orderCtx = FastMap.newInstance(); - + orderCtx.put("amountPaid", UtilXml.childElementValue(transactionElement, "AmountPaid", "0")); String createdDate = UtilXml.childElementValue(transactionElement, "CreatedDate"); if (UtilValidate.isNotEmpty(createdDate)) { @@ -669,7 +669,7 @@ orderCtx.put("paidTime", UtilXml.childElementValue(transactionElement, "PaidTime")); orderCtx.put("shippedTime", UtilXml.childElementValue(transactionElement, "ShippedTime")); orderCtx.put("productStoreId", productStoreId); - + // if any transaction contains order then add it in the list and give it to GetOrders request. List<? extends Element> containingOrders = UtilXml.childElementList(transactionElement, "ContainingOrder"); Iterator<? extends Element> containingOrdersIter = containingOrders.iterator(); @@ -679,11 +679,11 @@ if (getSellerTransactionsContainingOrderList != null && ! getSellerTransactionsContainingOrderList.contains(orderId)) { getSellerTransactionsContainingOrderList.add(orderId); } - } + } if (UtilValidate.isNotEmpty(containingOrders)) { continue; } - + // retrieve buyer Map<String, Object> shippingAddressCtx = FastMap.newInstance(); Map<String, Object> buyerCtx = FastMap.newInstance(); @@ -721,9 +721,9 @@ } orderCtx.put("buyerCtx", buyerCtx); orderCtx.put("shippingAddressCtx", shippingAddressCtx); - + // retrieve shipping service selected - Map<String, Object> shippingServiceSelectedCtx = FastMap.newInstance(); + Map<String, Object> shippingServiceSelectedCtx = FastMap.newInstance(); List<? extends Element> shippingServiceSelected = UtilXml.childElementList(transactionElement, "ShippingServiceSelected"); Iterator<? extends Element> shippingServiceSelectedElemIter = shippingServiceSelected.iterator(); while (shippingServiceSelectedElemIter.hasNext()) { @@ -753,7 +753,7 @@ shippingServiceSelectedCtx.put("shippingTotalAdditionalCost", totalAdditionalCost); } orderCtx.put("shippingServiceSelectedCtx", shippingServiceSelectedCtx); - + // retrieve shipping details Map<String, Object> shippingDetailsCtx = FastMap.newInstance(); List<? extends Element> shippingDetails = UtilXml.childElementList(transactionElement, "ShippingDetails"); @@ -793,7 +793,7 @@ } } orderCtx.put("shippingDetailsCtx", shippingDetailsCtx); - + // retrieve status Map<String, Object> checkoutStatusCtx = FastMap.newInstance(); List<? extends Element> status = UtilXml.childElementList(transactionElement, "Status"); @@ -807,7 +807,7 @@ checkoutStatusCtx.put("buyerSelectedShipping", UtilXml.childElementValue(statusElement, "BuyerSelectedShipping", "")); } orderCtx.put("checkoutStatusCtx", checkoutStatusCtx); - + // retrieve external transaction Map<String, Object> externalTransactionCtx = FastMap.newInstance(); List<? extends Element> externalTransaction = UtilXml.childElementList(transactionElement, "ExternalTransaction"); @@ -820,7 +820,7 @@ externalTransactionCtx.put("paymentOrRefundAmount", UtilXml.childElementValue(externalTransactionElement, "PaymentOrRefundAmount", "0")); } orderCtx.put("externalTransactionCtx", externalTransactionCtx); - + // retrieve item List<Map<String, Object>> orderItemList = FastList.newInstance(); String itemId = ""; @@ -872,20 +872,20 @@ // retrieve transaction price orderCtx.put("transactionPrice", UtilXml.childElementValue(transactionElement, "TransactionPrice", "0")); - + if (UtilValidate.isEmpty(shippingServiceSelectedCtx.get("shippingService").toString())) { String shippingServiceMissingMsg = "Shipping Method is missing for eBay Order ID (" + orderCtx.get("externalId").toString() + ")"; orderImportFailureMessageList.add(shippingServiceMissingMsg); } - + // Lets put emailAddress & userId on the root similiar to that of GetOrders request orderCtx.put("emailBuyer", buyerCtx.get("emailBuyer").toString()); orderCtx.put("ebayUserIdBuyer", buyerCtx.get("ebayUserIdBuyer").toString()); - + orderCtx.put("userLogin", userLogin); orderCtx.put("isEbayTransaction", "Y"); orderCtx.put("isEbayOrder", ""); - + // Now finally put the root map in the fetched orders list. fetchedOrders.add(orderCtx); } @@ -904,7 +904,7 @@ } return fetchedOrders; } - + private static List<String> readGetMyeBaySellingResponse(String responseMsg, Locale locale, String productStoreId, Delegator delegator, LocalDispatcher dispatcher, StringBuffer errorMessage, GenericValue userLogin) { List<String> fetchDeletedOrdersAndTransactions = FastList.newInstance(); try { @@ -937,12 +937,12 @@ if (UtilValidate.isNotEmpty(orderId)) { fetchDeletedOrdersAndTransactions.add(orderId); } - } + } List<? extends Element> transactionList = UtilXml.childElementList(orderTransactionElement, "Transaction"); Iterator<? extends Element> transactionElemIter = transactionList.iterator(); while (transactionElemIter.hasNext()) { Element transactionElement = (Element) transactionElemIter.next(); - + List<? extends Element> itemList = UtilXml.childElementList(transactionElement, "Item"); Iterator<? extends Element> itemElemIter = itemList.iterator(); while (itemElemIter.hasNext()) { @@ -954,7 +954,7 @@ } } } - } + } } } else { List<? extends Element> errorList = UtilXml.childElementList(elemResponse, "Errors"); @@ -969,7 +969,7 @@ } return fetchDeletedOrdersAndTransactions; } - + private static Map<String, Object> createShoppingCart(Delegator delegator, LocalDispatcher dispatcher, Locale locale, Map<String, Object> context, boolean create) { try { String productStoreId = (String) context.get("productStoreId"); @@ -1035,21 +1035,21 @@ if (UtilValidate.isEmpty(paidTime)) { return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.paymentIsStillNotReceived", locale)); } - + List orderItemList = (List) context.get("orderItemList"); Iterator<Map<String, Object>> orderItemIter = orderItemList.iterator(); while (orderItemIter.hasNext()) { Map<String, Object> orderItem = (Map<String, Object>) orderItemIter.next(); addItem(cart, orderItem, dispatcher, delegator, 0); } - + // set partyId from if (UtilValidate.isNotEmpty(payToPartyId)) { cart.setBillFromVendorPartyId(payToPartyId); } // Apply shipping costs as order adjustment Map shippingServiceSelectedCtx = (Map) context.get("shippingServiceSelectedCtx"); - + String shippingCost = (String) shippingServiceSelectedCtx.get("shippingServiceCost"); if (UtilValidate.isNotEmpty(shippingCost)) { double shippingAmount = new Double(shippingCost).doubleValue(); @@ -1094,20 +1094,20 @@ // set partyId to String partyId = null; String contactMechId = null; - + Map shippingAddressCtx = (Map) context.get("shippingAddressCtx"); if (UtilValidate.isNotEmpty(shippingAddressCtx)) { String buyerName = (String) shippingAddressCtx.get("buyerName"); String firstName = (String) buyerName.substring(0, buyerName.indexOf(" ")); String lastName = (String) buyerName.substring(buyerName.indexOf(" ")+1); - + String country = (String) shippingAddressCtx.get("shippingAddressCountry"); String state = (String) shippingAddressCtx.get("shippingAddressStateOrProvince"); String city = (String) shippingAddressCtx.get("shippingAddressCityName"); EbayHelper.correctCityStateCountry(dispatcher, shippingAddressCtx, city, state, country); - - List<GenericValue> shipInfo = PartyWorker.findMatchingPartyAndPostalAddress(delegator, shippingAddressCtx.get("shippingAddressStreet1").toString(), - (UtilValidate.isEmpty(shippingAddressCtx.get("shippingAddressStreet2")) ? null : shippingAddressCtx.get("shippingAddressStreet2").toString()), shippingAddressCtx.get("city").toString(), shippingAddressCtx.get("stateProvinceGeoId").toString(), + + List<GenericValue> shipInfo = PartyWorker.findMatchingPartyAndPostalAddress(delegator, shippingAddressCtx.get("shippingAddressStreet1").toString(), + (UtilValidate.isEmpty(shippingAddressCtx.get("shippingAddressStreet2")) ? null : shippingAddressCtx.get("shippingAddressStreet2").toString()), shippingAddressCtx.get("city").toString(), shippingAddressCtx.get("stateProvinceGeoId").toString(), shippingAddressCtx.get("shippingAddressPostalCode").toString(), null, shippingAddressCtx.get("countryGeoId").toString(), firstName, null, lastName); if (UtilValidate.isNotEmpty(shipInfo)) { GenericValue first = EntityUtil.getFirst(shipInfo); @@ -1115,16 +1115,16 @@ Debug.logInfo("Existing shipping address found for : (party: " + partyId + ")", module); } } - + // If matching party not found then try to find partyId from PartyAttribute entity. GenericValue partyAttribute = null; if (UtilValidate.isNotEmpty(context.get("eiasTokenBuyer"))) { partyAttribute = EntityUtil.getFirst(delegator.findByAnd("PartyAttribute", UtilMisc.toMap("attrValue", (String) context.get("eiasTokenBuyer")))); if (UtilValidate.isNotEmpty(partyAttribute)) { partyId = (String) partyAttribute.get("partyId"); - } + } } - + // if we get a party, check its contact information. if (UtilValidate.isNotEmpty(partyId)) { Debug.logInfo("Found existing party associated to the eBay buyer: " + partyId, module); @@ -1154,7 +1154,7 @@ String eiasTokenBuyer = null; if (UtilValidate.isNotEmpty(buyerCtx)) { eiasTokenBuyer = (String) buyerCtx.get("eiasTokenBuyer"); - } + } Debug.logInfo("Creating new postal address for party: " + partyId, module); contactMechId = EbayHelper.createAddress(dispatcher, partyId, userLogin, "SHIPPING_LOCATION", shippingAddressCtx); if (UtilValidate.isEmpty(contactMechId)) { @@ -1198,7 +1198,7 @@ } String orderId = (String) orderCreate.get("orderId"); Debug.logInfo("Created order with id: " + orderId, module); - + if (UtilValidate.isNotEmpty(orderId)) { String orderCreatedMsg = "Order created successfully with ID (" + orderId + ") & eBay Order ID associated with this order is (" + externalId + ")."; orderImportSuccessMessageList.add(orderCreatedMsg); @@ -1224,7 +1224,7 @@ } return ServiceUtil.returnSuccess(); } - + // Made some changes transactionId removed. private static GenericValue externalOrderExists(Delegator delegator, String externalId) throws GenericEntityException { Debug.logInfo("Checking for existing externalId: " + externalId, module); @@ -1235,7 +1235,7 @@ } return orderHeader; } - + private static void addItem(ShoppingCart cart, Map<String, Object> orderItem, LocalDispatcher dispatcher, Delegator delegator, int groupIdx) throws GeneralException { String productId = (String) orderItem.get("productId"); GenericValue product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), false); @@ -1250,7 +1250,7 @@ } BigDecimal price = new BigDecimal(itemPrice); price = price.setScale(ShoppingCart.scale, ShoppingCart.rounding); - + HashMap<Object, Object> attrs = new HashMap<Object, Object>(); attrs.put("shipGroup", groupIdx); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |