You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by sa...@apache.org on 2011/03/24 08:23:50 UTC
svn commit: r1084863 [10/11] - in /ofbiz/branches/jackrabbit20100709: ./
applications/accounting/data/
applications/accounting/src/org/ofbiz/accounting/invoice/
applications/accounting/src/org/ofbiz/accounting/payment/
applications/accounting/src/org/o...
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/ValidationFactor.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/ValidationFactor.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/ValidationFactor.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/authentication/ValidationFactor.java Thu Mar 24 07:23:42 2011
@@ -25,6 +25,7 @@
package com.atlassian.crowd.integration.authentication;
+@SuppressWarnings("serial")
public class ValidationFactor implements java.io.Serializable {
private java.lang.String name;
@@ -153,7 +154,7 @@ public class ValidationFactor implement
*/
public static org.apache.axis.encoding.Serializer getSerializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanSerializer(
@@ -165,7 +166,7 @@ public class ValidationFactor implement
*/
public static org.apache.axis.encoding.Deserializer getDeserializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanDeserializer(
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ApplicationAccessDeniedException.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ApplicationAccessDeniedException.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ApplicationAccessDeniedException.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ApplicationAccessDeniedException.java Thu Mar 24 07:23:42 2011
@@ -25,6 +25,7 @@
package com.atlassian.crowd.integration.exception;
+@SuppressWarnings("serial")
public class ApplicationAccessDeniedException extends org.apache.axis.AxisFault implements java.io.Serializable {
public ApplicationAccessDeniedException() {
}
@@ -32,7 +33,6 @@ public class ApplicationAccessDeniedExce
private java.lang.Object __equalsCalc = null;
public synchronized boolean equals(java.lang.Object obj) {
if (!(obj instanceof ApplicationAccessDeniedException)) return false;
- ApplicationAccessDeniedException other = (ApplicationAccessDeniedException) obj;
if (obj == null) return false;
if (this == obj) return true;
if (__equalsCalc != null) {
@@ -76,7 +76,7 @@ public class ApplicationAccessDeniedExce
*/
public static org.apache.axis.encoding.Serializer getSerializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanSerializer(
@@ -88,7 +88,7 @@ public class ApplicationAccessDeniedExce
*/
public static org.apache.axis.encoding.Deserializer getDeserializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanDeserializer(
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ApplicationPermissionException.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ApplicationPermissionException.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ApplicationPermissionException.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ApplicationPermissionException.java Thu Mar 24 07:23:42 2011
@@ -25,6 +25,7 @@
package com.atlassian.crowd.integration.exception;
+@SuppressWarnings("serial")
public class ApplicationPermissionException extends org.apache.axis.AxisFault implements java.io.Serializable {
public ApplicationPermissionException() {
}
@@ -32,7 +33,6 @@ public class ApplicationPermissionExcept
private java.lang.Object __equalsCalc = null;
public synchronized boolean equals(java.lang.Object obj) {
if (!(obj instanceof ApplicationPermissionException)) return false;
- ApplicationPermissionException other = (ApplicationPermissionException) obj;
if (obj == null) return false;
if (this == obj) return true;
if (__equalsCalc != null) {
@@ -76,7 +76,7 @@ public class ApplicationPermissionExcept
*/
public static org.apache.axis.encoding.Serializer getSerializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanSerializer(
@@ -88,7 +88,7 @@ public class ApplicationPermissionExcept
*/
public static org.apache.axis.encoding.Deserializer getDeserializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanDeserializer(
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InactiveAccountException.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InactiveAccountException.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InactiveAccountException.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InactiveAccountException.java Thu Mar 24 07:23:42 2011
@@ -25,6 +25,7 @@
package com.atlassian.crowd.integration.exception;
+@SuppressWarnings("serial")
public class InactiveAccountException extends org.apache.axis.AxisFault implements java.io.Serializable {
public InactiveAccountException() {
}
@@ -32,7 +33,6 @@ public class InactiveAccountException e
private java.lang.Object __equalsCalc = null;
public synchronized boolean equals(java.lang.Object obj) {
if (!(obj instanceof InactiveAccountException)) return false;
- InactiveAccountException other = (InactiveAccountException) obj;
if (obj == null) return false;
if (this == obj) return true;
if (__equalsCalc != null) {
@@ -76,7 +76,7 @@ public class InactiveAccountException e
*/
public static org.apache.axis.encoding.Serializer getSerializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanSerializer(
@@ -88,7 +88,7 @@ public class InactiveAccountException e
*/
public static org.apache.axis.encoding.Deserializer getDeserializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanDeserializer(
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidAuthenticationException.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidAuthenticationException.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidAuthenticationException.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidAuthenticationException.java Thu Mar 24 07:23:42 2011
@@ -25,6 +25,7 @@
package com.atlassian.crowd.integration.exception;
+@SuppressWarnings("serial")
public class InvalidAuthenticationException extends org.apache.axis.AxisFault implements java.io.Serializable {
public InvalidAuthenticationException() {
}
@@ -32,7 +33,6 @@ public class InvalidAuthenticationExcept
private java.lang.Object __equalsCalc = null;
public synchronized boolean equals(java.lang.Object obj) {
if (!(obj instanceof InvalidAuthenticationException)) return false;
- InvalidAuthenticationException other = (InvalidAuthenticationException) obj;
if (obj == null) return false;
if (this == obj) return true;
if (__equalsCalc != null) {
@@ -76,7 +76,7 @@ public class InvalidAuthenticationExcept
*/
public static org.apache.axis.encoding.Serializer getSerializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanSerializer(
@@ -88,7 +88,7 @@ public class InvalidAuthenticationExcept
*/
public static org.apache.axis.encoding.Deserializer getDeserializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanDeserializer(
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidAuthorizationTokenException.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidAuthorizationTokenException.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidAuthorizationTokenException.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidAuthorizationTokenException.java Thu Mar 24 07:23:42 2011
@@ -25,6 +25,7 @@
package com.atlassian.crowd.integration.exception;
+@SuppressWarnings("serial")
public class InvalidAuthorizationTokenException extends org.apache.axis.AxisFault implements java.io.Serializable {
public InvalidAuthorizationTokenException() {
}
@@ -32,7 +33,6 @@ public class InvalidAuthorizationTokenEx
private java.lang.Object __equalsCalc = null;
public synchronized boolean equals(java.lang.Object obj) {
if (!(obj instanceof InvalidAuthorizationTokenException)) return false;
- InvalidAuthorizationTokenException other = (InvalidAuthorizationTokenException) obj;
if (obj == null) return false;
if (this == obj) return true;
if (__equalsCalc != null) {
@@ -76,7 +76,7 @@ public class InvalidAuthorizationTokenEx
*/
public static org.apache.axis.encoding.Serializer getSerializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanSerializer(
@@ -88,7 +88,7 @@ public class InvalidAuthorizationTokenEx
*/
public static org.apache.axis.encoding.Deserializer getDeserializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanDeserializer(
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidCredentialException.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidCredentialException.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidCredentialException.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidCredentialException.java Thu Mar 24 07:23:42 2011
@@ -25,6 +25,7 @@
package com.atlassian.crowd.integration.exception;
+@SuppressWarnings("serial")
public class InvalidCredentialException extends org.apache.axis.AxisFault implements java.io.Serializable {
public InvalidCredentialException() {
}
@@ -32,7 +33,6 @@ public class InvalidCredentialException
private java.lang.Object __equalsCalc = null;
public synchronized boolean equals(java.lang.Object obj) {
if (!(obj instanceof InvalidCredentialException)) return false;
- InvalidCredentialException other = (InvalidCredentialException) obj;
if (obj == null) return false;
if (this == obj) return true;
if (__equalsCalc != null) {
@@ -76,7 +76,7 @@ public class InvalidCredentialException
*/
public static org.apache.axis.encoding.Serializer getSerializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanSerializer(
@@ -88,7 +88,7 @@ public class InvalidCredentialException
*/
public static org.apache.axis.encoding.Deserializer getDeserializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanDeserializer(
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidGroupException.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidGroupException.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidGroupException.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidGroupException.java Thu Mar 24 07:23:42 2011
@@ -25,6 +25,7 @@
package com.atlassian.crowd.integration.exception;
+@SuppressWarnings("serial")
public class InvalidGroupException extends org.apache.axis.AxisFault implements java.io.Serializable {
public InvalidGroupException() {
}
@@ -32,7 +33,6 @@ public class InvalidGroupException exte
private java.lang.Object __equalsCalc = null;
public synchronized boolean equals(java.lang.Object obj) {
if (!(obj instanceof InvalidGroupException)) return false;
- InvalidGroupException other = (InvalidGroupException) obj;
if (obj == null) return false;
if (this == obj) return true;
if (__equalsCalc != null) {
@@ -76,7 +76,7 @@ public class InvalidGroupException exte
*/
public static org.apache.axis.encoding.Serializer getSerializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanSerializer(
@@ -88,7 +88,7 @@ public class InvalidGroupException exte
*/
public static org.apache.axis.encoding.Deserializer getDeserializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanDeserializer(
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidPrincipalException.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidPrincipalException.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidPrincipalException.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidPrincipalException.java Thu Mar 24 07:23:42 2011
@@ -25,6 +25,7 @@
package com.atlassian.crowd.integration.exception;
+@SuppressWarnings("serial")
public class InvalidPrincipalException extends org.apache.axis.AxisFault implements java.io.Serializable {
public InvalidPrincipalException() {
}
@@ -32,7 +33,6 @@ public class InvalidPrincipalException
private java.lang.Object __equalsCalc = null;
public synchronized boolean equals(java.lang.Object obj) {
if (!(obj instanceof InvalidPrincipalException)) return false;
- InvalidPrincipalException other = (InvalidPrincipalException) obj;
if (obj == null) return false;
if (this == obj) return true;
if (__equalsCalc != null) {
@@ -76,7 +76,7 @@ public class InvalidPrincipalException
*/
public static org.apache.axis.encoding.Serializer getSerializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanSerializer(
@@ -88,7 +88,7 @@ public class InvalidPrincipalException
*/
public static org.apache.axis.encoding.Deserializer getDeserializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanDeserializer(
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidRoleException.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidRoleException.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidRoleException.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidRoleException.java Thu Mar 24 07:23:42 2011
@@ -25,6 +25,7 @@
package com.atlassian.crowd.integration.exception;
+@SuppressWarnings("serial")
public class InvalidRoleException extends org.apache.axis.AxisFault implements java.io.Serializable {
public InvalidRoleException() {
}
@@ -32,7 +33,6 @@ public class InvalidRoleException exten
private java.lang.Object __equalsCalc = null;
public synchronized boolean equals(java.lang.Object obj) {
if (!(obj instanceof InvalidRoleException)) return false;
- InvalidRoleException other = (InvalidRoleException) obj;
if (obj == null) return false;
if (this == obj) return true;
if (__equalsCalc != null) {
@@ -76,7 +76,7 @@ public class InvalidRoleException exten
*/
public static org.apache.axis.encoding.Serializer getSerializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanSerializer(
@@ -88,7 +88,7 @@ public class InvalidRoleException exten
*/
public static org.apache.axis.encoding.Deserializer getDeserializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanDeserializer(
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidTokenException.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidTokenException.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidTokenException.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/InvalidTokenException.java Thu Mar 24 07:23:42 2011
@@ -25,6 +25,7 @@
package com.atlassian.crowd.integration.exception;
+@SuppressWarnings("serial")
public class InvalidTokenException extends org.apache.axis.AxisFault implements java.io.Serializable {
public InvalidTokenException() {
}
@@ -32,7 +33,6 @@ public class InvalidTokenException exte
private java.lang.Object __equalsCalc = null;
public synchronized boolean equals(java.lang.Object obj) {
if (!(obj instanceof InvalidTokenException)) return false;
- InvalidTokenException other = (InvalidTokenException) obj;
if (obj == null) return false;
if (this == obj) return true;
if (__equalsCalc != null) {
@@ -76,7 +76,7 @@ public class InvalidTokenException exte
*/
public static org.apache.axis.encoding.Serializer getSerializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanSerializer(
@@ -88,7 +88,7 @@ public class InvalidTokenException exte
*/
public static org.apache.axis.encoding.Deserializer getDeserializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanDeserializer(
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ObjectNotFoundException.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ObjectNotFoundException.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ObjectNotFoundException.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/exception/ObjectNotFoundException.java Thu Mar 24 07:23:42 2011
@@ -25,6 +25,7 @@
package com.atlassian.crowd.integration.exception;
+@SuppressWarnings("serial")
public class ObjectNotFoundException extends org.apache.axis.AxisFault implements java.io.Serializable {
public ObjectNotFoundException() {
}
@@ -32,7 +33,6 @@ public class ObjectNotFoundException ex
private java.lang.Object __equalsCalc = null;
public synchronized boolean equals(java.lang.Object obj) {
if (!(obj instanceof ObjectNotFoundException)) return false;
- ObjectNotFoundException other = (ObjectNotFoundException) obj;
if (obj == null) return false;
if (this == obj) return true;
if (__equalsCalc != null) {
@@ -76,7 +76,7 @@ public class ObjectNotFoundException ex
*/
public static org.apache.axis.encoding.Serializer getSerializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanSerializer(
@@ -88,7 +88,7 @@ public class ObjectNotFoundException ex
*/
public static org.apache.axis.encoding.Deserializer getDeserializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanDeserializer(
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPAttribute.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPAttribute.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPAttribute.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPAttribute.java Thu Mar 24 07:23:42 2011
@@ -25,6 +25,7 @@
package com.atlassian.crowd.integration.soap;
+@SuppressWarnings("serial")
public class SOAPAttribute implements java.io.Serializable {
private java.lang.String name;
@@ -162,7 +163,7 @@ public class SOAPAttribute implements j
*/
public static org.apache.axis.encoding.Serializer getSerializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanSerializer(
@@ -174,7 +175,7 @@ public class SOAPAttribute implements j
*/
public static org.apache.axis.encoding.Deserializer getDeserializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanDeserializer(
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPCookieInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPCookieInfo.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPCookieInfo.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPCookieInfo.java Thu Mar 24 07:23:42 2011
@@ -25,6 +25,7 @@
package com.atlassian.crowd.integration.soap;
+@SuppressWarnings("serial")
public class SOAPCookieInfo implements java.io.Serializable {
private java.lang.String domain;
@@ -153,7 +154,7 @@ public class SOAPCookieInfo implements
*/
public static org.apache.axis.encoding.Serializer getSerializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanSerializer(
@@ -165,7 +166,7 @@ public class SOAPCookieInfo implements
*/
public static org.apache.axis.encoding.Deserializer getDeserializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanDeserializer(
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPGroup.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPGroup.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPGroup.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPGroup.java Thu Mar 24 07:23:42 2011
@@ -25,6 +25,7 @@
package com.atlassian.crowd.integration.soap;
+@SuppressWarnings("serial")
public class SOAPGroup implements java.io.Serializable {
private java.lang.Long ID;
@@ -430,7 +431,7 @@ public class SOAPGroup implements java.
*/
public static org.apache.axis.encoding.Serializer getSerializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanSerializer(
@@ -442,7 +443,7 @@ public class SOAPGroup implements java.
*/
public static org.apache.axis.encoding.Deserializer getDeserializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanDeserializer(
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPNestableGroup.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPNestableGroup.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPNestableGroup.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPNestableGroup.java Thu Mar 24 07:23:42 2011
@@ -25,6 +25,7 @@
package com.atlassian.crowd.integration.soap;
+@SuppressWarnings("serial")
public class SOAPNestableGroup implements java.io.Serializable {
private java.lang.Long ID;
@@ -430,7 +431,7 @@ public class SOAPNestableGroup implemen
*/
public static org.apache.axis.encoding.Serializer getSerializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanSerializer(
@@ -442,7 +443,7 @@ public class SOAPNestableGroup implemen
*/
public static org.apache.axis.encoding.Deserializer getDeserializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanDeserializer(
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPPrincipal.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPPrincipal.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPPrincipal.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPPrincipal.java Thu Mar 24 07:23:42 2011
@@ -25,6 +25,7 @@
package com.atlassian.crowd.integration.soap;
+@SuppressWarnings("serial")
public class SOAPPrincipal implements java.io.Serializable {
private java.lang.Long ID;
@@ -384,7 +385,7 @@ public class SOAPPrincipal implements j
*/
public static org.apache.axis.encoding.Serializer getSerializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanSerializer(
@@ -396,7 +397,7 @@ public class SOAPPrincipal implements j
*/
public static org.apache.axis.encoding.Deserializer getDeserializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanDeserializer(
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPRole.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPRole.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPRole.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SOAPRole.java Thu Mar 24 07:23:42 2011
@@ -25,6 +25,7 @@
package com.atlassian.crowd.integration.soap;
+@SuppressWarnings("serial")
public class SOAPRole implements java.io.Serializable {
private java.lang.Long ID;
@@ -430,7 +431,7 @@ public class SOAPRole implements java.i
*/
public static org.apache.axis.encoding.Serializer getSerializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanSerializer(
@@ -442,7 +443,7 @@ public class SOAPRole implements java.i
*/
public static org.apache.axis.encoding.Deserializer getDeserializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanDeserializer(
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SearchRestriction.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SearchRestriction.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SearchRestriction.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/com/atlassian/crowd/integration/soap/SearchRestriction.java Thu Mar 24 07:23:42 2011
@@ -25,6 +25,7 @@
package com.atlassian.crowd.integration.soap;
+@SuppressWarnings("serial")
public class SearchRestriction implements java.io.Serializable {
private java.lang.String name;
@@ -153,7 +154,7 @@ public class SearchRestriction implemen
*/
public static org.apache.axis.encoding.Serializer getSerializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanSerializer(
@@ -165,7 +166,7 @@ public class SearchRestriction implemen
*/
public static org.apache.axis.encoding.Deserializer getDeserializer(
java.lang.String mechType,
- java.lang.Class _javaType,
+ java.lang.Class<?> _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.BeanDeserializer(
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/org/ofbiz/crowd/security/SecurityServerHttpBindingStub.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/org/ofbiz/crowd/security/SecurityServerHttpBindingStub.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/org/ofbiz/crowd/security/SecurityServerHttpBindingStub.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/org/ofbiz/crowd/security/SecurityServerHttpBindingStub.java Thu Mar 24 07:23:42 2011
@@ -26,10 +26,10 @@
package org.ofbiz.crowd.security;
public class SecurityServerHttpBindingStub extends org.apache.axis.client.Stub implements org.ofbiz.crowd.security.SecurityServerPortType {
- private java.util.Vector cachedSerClasses = new java.util.Vector();
- private java.util.Vector cachedSerQNames = new java.util.Vector();
- private java.util.Vector cachedSerFactories = new java.util.Vector();
- private java.util.Vector cachedDeserFactories = new java.util.Vector();
+ private java.util.Vector<Object> cachedSerClasses = new java.util.Vector<Object>();
+ private java.util.Vector<Object> cachedSerQNames = new java.util.Vector<Object>();
+ private java.util.Vector<Object> cachedSerFactories = new java.util.Vector<Object>();
+ private java.util.Vector<Object> cachedDeserFactories = new java.util.Vector<Object>();
static org.apache.axis.description.OperationDesc [] _operations;
@@ -1543,19 +1543,21 @@ public class SecurityServerHttpBindingSt
super.service = service;
}
((org.apache.axis.client.Service)super.service).setTypeMappingVersion("1.2");
- java.lang.Class cls;
+ java.lang.Class<?> cls;
javax.xml.namespace.QName qName;
javax.xml.namespace.QName qName2;
- java.lang.Class beansf = org.apache.axis.encoding.ser.BeanSerializerFactory.class;
- java.lang.Class beandf = org.apache.axis.encoding.ser.BeanDeserializerFactory.class;
- java.lang.Class enumsf = org.apache.axis.encoding.ser.EnumSerializerFactory.class;
- java.lang.Class enumdf = org.apache.axis.encoding.ser.EnumDeserializerFactory.class;
- java.lang.Class arraysf = org.apache.axis.encoding.ser.ArraySerializerFactory.class;
- java.lang.Class arraydf = org.apache.axis.encoding.ser.ArrayDeserializerFactory.class;
- java.lang.Class simplesf = org.apache.axis.encoding.ser.SimpleSerializerFactory.class;
- java.lang.Class simpledf = org.apache.axis.encoding.ser.SimpleDeserializerFactory.class;
- java.lang.Class simplelistsf = org.apache.axis.encoding.ser.SimpleListSerializerFactory.class;
- java.lang.Class simplelistdf = org.apache.axis.encoding.ser.SimpleListDeserializerFactory.class;
+ java.lang.Class<?> beansf = org.apache.axis.encoding.ser.BeanSerializerFactory.class;
+ java.lang.Class<?> beandf = org.apache.axis.encoding.ser.BeanDeserializerFactory.class;
+ /*
+ java.lang.Class<?> enumsf = org.apache.axis.encoding.ser.EnumSerializerFactory.class;
+ java.lang.Class<?> enumdf = org.apache.axis.encoding.ser.EnumDeserializerFactory.class;
+ java.lang.Class<?> arraysf = org.apache.axis.encoding.ser.ArraySerializerFactory.class;
+ java.lang.Class<?> arraydf = org.apache.axis.encoding.ser.ArrayDeserializerFactory.class;
+ java.lang.Class<?> simplesf = org.apache.axis.encoding.ser.SimpleSerializerFactory.class;
+ java.lang.Class<?> simpledf = org.apache.axis.encoding.ser.SimpleDeserializerFactory.class;
+ java.lang.Class<?> simplelistsf = org.apache.axis.encoding.ser.SimpleListSerializerFactory.class;
+ java.lang.Class<?> simplelistdf = org.apache.axis.encoding.ser.SimpleListDeserializerFactory.class;
+ */
qName = new javax.xml.namespace.QName("http://authentication.integration.crowd.atlassian.com", "ApplicationAuthenticationContext");
cachedSerQNames.add(qName);
cls = com.atlassian.crowd.integration.authentication.ApplicationAuthenticationContext.class;
@@ -1826,7 +1828,7 @@ public class SecurityServerHttpBindingSt
if (super.cachedPortName != null) {
_call.setPortName(super.cachedPortName);
}
- java.util.Enumeration keys = super.cachedProperties.keys();
+ java.util.Enumeration<Object> keys = super.cachedProperties.keys();
while (keys.hasMoreElements()) {
java.lang.String key = (java.lang.String) keys.nextElement();
_call.setProperty(key, super.cachedProperties.get(key));
@@ -1841,14 +1843,14 @@ public class SecurityServerHttpBindingSt
// must set encoding style before registering serializers
_call.setEncodingStyle(null);
for (int i = 0; i < cachedSerFactories.size(); ++i) {
- java.lang.Class cls = (java.lang.Class) cachedSerClasses.get(i);
+ java.lang.Class<?> cls = (java.lang.Class<?>) cachedSerClasses.get(i);
javax.xml.namespace.QName qName =
(javax.xml.namespace.QName) cachedSerQNames.get(i);
java.lang.Object x = cachedSerFactories.get(i);
- if (x instanceof Class) {
- java.lang.Class sf = (java.lang.Class)
+ if (x instanceof Class<?>) {
+ java.lang.Class<?> sf = (java.lang.Class<?>)
cachedSerFactories.get(i);
- java.lang.Class df = (java.lang.Class)
+ java.lang.Class<?> df = (java.lang.Class<?>)
cachedDeserFactories.get(i);
_call.registerTypeMapping(cls, qName, sf, df, false);
}
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/org/ofbiz/crowd/security/SecurityServerLocator.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/org/ofbiz/crowd/security/SecurityServerLocator.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/org/ofbiz/crowd/security/SecurityServerLocator.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/crowd/src/org/ofbiz/crowd/security/SecurityServerLocator.java Thu Mar 24 07:23:42 2011
@@ -27,6 +27,7 @@ package org.ofbiz.crowd.security;
import org.ofbiz.base.util.UtilProperties;
+@SuppressWarnings("serial")
public class SecurityServerLocator extends org.apache.axis.client.Service implements org.ofbiz.crowd.security.SecurityServer {
public SecurityServerLocator() {
@@ -90,6 +91,7 @@ public class SecurityServerLocator exten
* If this service has no port for the given interface,
* then ServiceException is thrown.
*/
+ @SuppressWarnings("unchecked")
public java.rmi.Remote getPort(Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException {
try {
if (org.ofbiz.crowd.security.SecurityServerPortType.class.isAssignableFrom(serviceEndpointInterface)) {
@@ -109,6 +111,7 @@ public class SecurityServerLocator exten
* If this service has no port for the given interface,
* then ServiceException is thrown.
*/
+ @SuppressWarnings("unchecked")
public java.rmi.Remote getPort(javax.xml.namespace.QName portName, Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException {
if (portName == null) {
return getPort(serviceEndpointInterface);
@@ -128,11 +131,11 @@ public class SecurityServerLocator exten
return new javax.xml.namespace.QName("urn:SecurityServer", "SecurityServer");
}
- private java.util.HashSet ports = null;
+ private java.util.HashSet<Object> ports = null;
- public java.util.Iterator getPorts() {
+ public java.util.Iterator<Object> getPorts() {
if (ports == null) {
- ports = new java.util.HashSet();
+ ports = new java.util.HashSet<Object>();
ports.add(new javax.xml.namespace.QName("urn:SecurityServer", "SecurityServerHttpPort"));
}
return ports.iterator();
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java Thu Mar 24 07:23:42 2011
@@ -214,7 +214,7 @@ public class EbayHelper {
if (UtilValidate.isNotEmpty(paymentPreferences)) {
Iterator<GenericValue> i = paymentPreferences.iterator();
while (i.hasNext()) {
- GenericValue pref = (GenericValue) i.next();
+ GenericValue pref = i.next();
if (UtilValidate.isNotEmpty(amount)) {
pref.set("statusId", "PAYMENT_RECEIVED");
pref.set("maxAmount", amount);
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java Thu Mar 24 07:23:42 2011
@@ -1282,7 +1282,7 @@ public class EbayOrderServices {
if (cart.size() != 0) {
Iterator<ShoppingCartItem> cartiter = cart.iterator();
while (cartiter != null && cartiter.hasNext()) {
- ShoppingCartItem cartItem = (ShoppingCartItem) cartiter.next();
+ ShoppingCartItem cartItem = cartiter.next();
if (cartItem.getProductId().equals(productId)) {
previouslyAddedItemInCart = cartItem;
}
Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/lib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 24 07:23:42 2011
@@ -2,3 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/ebaystore/lib:951708-952957
/ofbiz/branches/jquery/specialpurpose/ebaystore/lib:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264
+/ofbiz/trunk/specialpurpose/ebaystore/lib:962442-1084618
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java Thu Mar 24 07:23:42 2011
@@ -130,7 +130,7 @@ public class EbayFeedback {
userLoginEx.put("partyId", commentingPartyId);
userLoginEx.create();
} else {
- userLoginEx = (GenericValue)CommentingUserLogins.get(0);
+ userLoginEx = CommentingUserLogins.get(0);
commentingPartyId = userLoginEx.getString("partyId");
}
//DataResource
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java Thu Mar 24 07:23:42 2011
@@ -600,10 +600,10 @@ public class EbayStore {
try {
List<GenericValue> productStores = delegator.findByAnd("ProductStoreRole", UtilMisc.toMap("productStoreId", productStoreId, "roleTypeId", "EBAY_ACCOUNT"));
if (productStores.size() != 0) {
- String partyId = ((GenericValue) productStores.get(0)).getString("partyId");
+ String partyId = (productStores.get(0)).getString("partyId");
List<GenericValue> userLoginStore = delegator.findByAnd("UserLogin", UtilMisc.toMap("partyId", partyId));
if (userLoginStore.size() != 0) {
- String userLoginId = ((GenericValue) userLoginStore.get(0)).getString("userLoginId");
+ String userLoginId = (userLoginStore.get(0)).getString("userLoginId");
result.put("userLoginId", userLoginId);
}
}
@@ -1761,7 +1761,7 @@ public class EbayStore {
Map<String, Object> bidderTest = UtilGenerics.checkMap(getEbayAllBidders(dctx, serviceMap));
List<Map<String, String>> test = UtilGenerics.checkList(bidderTest.get("allBidders"));
if (test.size() != 0) {
- verify.setRecipientBidderUserID((String) test.get(0).get("userId"));
+ verify.setRecipientBidderUserID(test.get(0).get("userId"));
}
result.put("checkVerify", true);
} catch (Exception e) {
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java Thu Mar 24 07:23:42 2011
@@ -483,7 +483,7 @@ public class EbayStoreAutoPreferences {
for (int itemRelist = 0; itemRelist < itemsToRelist.size(); itemRelist++) {
RelistItemCall relistItemCall = new RelistItemCall(apiContext);
ItemType itemToBeRelisted = new ItemType();
- GenericValue product = (GenericValue) itemsToRelist.get(itemRelist);
+ GenericValue product = itemsToRelist.get(itemRelist);
itemToBeRelisted.setItemID(product.getString("productId"));
relistItemCall.setItemToBeRelisted(itemToBeRelisted);
relistItemCall.relistItem();
@@ -752,7 +752,7 @@ public class EbayStoreAutoPreferences {
Enumeration<String> enums = h.keys();
String key = "";
while (enums.hasMoreElements()) {
- key = (String) enums.nextElement();
+ key = enums.nextElement();
List<Map<String, Object>> tempList = h.get(key);
if (key.equals(buyerId)) {
key = buyerId;
@@ -847,7 +847,7 @@ public class EbayStoreAutoPreferences {
total.setCurrencyID(currencyId);
TransactionType[] transArr = new TransactionType[translist.size()];
for (int counter = 0; counter < translist.size(); counter++) {
- transArr[counter] = (TransactionType) translist.get(counter);
+ transArr[counter] = translist.get(counter);
}
transactionArr.setTransaction(transArr);
if (transactionArr.getTransactionLength() > 1) {
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl Thu Mar 24 07:23:42 2011
@@ -21,7 +21,7 @@ under the License.
<html>
<head>
<title>Main</title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
<link rel='stylesheet' href='<@o...@ofbizContentUrl>' type='text/css'>
<link rel='stylesheet' href='<@o...@ofbizContentUrl>' type='text/css'>
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js Thu Mar 24 07:23:42 2011
@@ -254,7 +254,6 @@ function createUpdateCustomerAndShipping
jQuery.ajax({
url: 'createUpdateShippingAddress',
type: 'POST',
- dataType: 'json',
async: false,
data: jQuery('#shippingForm').serialize(),
success: function(json) {
@@ -288,7 +287,6 @@ function getShipOptions() {
jQuery.ajax({
url: 'getShipOptions',
type: 'POST',
- dataType: 'json',
async: false,
success: function(json) {
jQuery('#shippingFormServerError').fadeOut('fast');
@@ -327,7 +325,6 @@ function setShippingOption() {
jQuery.ajax({
url: 'setShippingOption',
type: 'POST',
- dataType: 'json',
async: false,
data: jQuery('#shippingOptionForm').serialize(),
success: function(json) {
@@ -374,7 +371,6 @@ function processBillingAndPayment() {
jQuery.ajax({
url: 'createUpdateBillingAndPayment',
type: 'POST',
- dataType: 'json',
data: jQuery('#billingForm').serialize(),
async: false,
success: function(json) {
@@ -432,7 +428,6 @@ function addPromoCode() {
jQuery.ajax({
url: 'silentAddPromoCode',
type: 'POST',
- dataType: 'json',
data: {"productPromoCodeId" : jQuery('#productPromoCode').val()},
success: function(json) {
jQuery('#cartFormServerError').fadeOut('fast');
@@ -454,7 +449,6 @@ function getProductLineItemIndex(event,
jQuery.ajax({
url: 'getShoppingCartItemIndex',
type: 'POST',
- dataType: 'json',
async: false,
data: formValues,
success: function(json) {
@@ -495,7 +489,6 @@ function updateCartData(elementId, formV
jQuery.ajax({
url: 'cartItemQtyUpdate',
type: 'POST',
- dataType: 'json',
data: formValues,
success: function(json) {
if (json.totalQuantity == 0) {
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml Thu Mar 24 07:23:42 2011
@@ -42,7 +42,7 @@ under the License.
<set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.4.2.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.1.min.js" global="true"/>
<script location="component://ecommerce/widget/EcommerceSetup.groovy"/>
@@ -251,7 +251,7 @@ under the License.
<set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.4.2.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.1.min.js" global="true"/>
<script location="component://ecommerce/widget/EcommerceSetup.groovy"/>
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml Thu Mar 24 07:23:42 2011
@@ -72,6 +72,10 @@
<value xml:lang="th">à¸à¸²à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸ªà¸²à¸à¸²à¸£à¸à¸°à¸à¸±à¹à¸à¸«à¸¡à¸</value>
<value xml:lang="zh">Google Baseéæ</value>
</property>
+ <property key="GoogleBaseAutoUpdate">
+ <value xml:lang="en">Auto Update Options</value>
+ <value xml:lang="th">à¸à¸±à¸à¹à¸à¸à¹à¸à¸à¸à¸±à¸à¹à¸à¸¡à¸±à¸à¸´</value>
+ </property>
<property key="GoogleBaseCompanyName">
<value xml:lang="en">Ofbiz</value>
<value xml:lang="fr">Ofbiz</value>
@@ -176,6 +180,10 @@
<value xml:lang="th">à¸à¸¸à¸à¹à¸¡à¹à¸¡à¸µà¸à¸²à¸£à¸à¸à¸¸à¸à¸²à¸à¹à¸«à¹à¹à¸ªà¸à¸à¸«à¸à¹à¸²à¸à¸µà¹. ("GOOGLEBASE_VIEW" à¸à¹à¸à¸à¸à¸²à¸£)</value>
<value xml:lang="zh">ä½ æ²¡ææµè§è¿ä¸ªé¡µé¢çæé(éè¦GOOGLEBASE_VIEW)ã</value>
</property>
+ <property key="GoogleBaseRecommended">
+ <value xml:lang="en">Allow Google Base Recommended</value>
+ <value xml:lang="th">à¸à¸à¸¸à¸à¸²à¸à¸´à¹à¸«à¹à¹à¸à¸´à¹à¸¡à¸à¸´à¸¥à¸à¹à¸à¸µà¹à¹à¸à¸°à¸à¸³</value>
+ </property>
<property key="PageTitleGoogleBaseProductsExportToGoogle">
<value xml:lang="en">Export Products to Google Base</value>
<value xml:lang="fr">Exporter les articles vers Google Base</value>
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/data/GoogleBaseSecurityData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/data/GoogleBaseSecurityData.xml?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/data/GoogleBaseSecurityData.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/data/GoogleBaseSecurityData.xml Thu Mar 24 07:23:42 2011
@@ -27,5 +27,9 @@ under the License.
<SecurityGroupPermission groupId="FULLADMIN" permissionId="GOOGLEBASE_ADMIN"/>
<SecurityGroupPermission groupId="VIEWADMIN" permissionId="GOOGLEBASE_VIEW"/>
<SecurityGroupPermission groupId="BIZADMIN" permissionId="GOOGLEBASE_VIEW"/>
-
+
+ <SecurityGroup description="Google Base Administrator" groupId="GOOGLEBASEADMIN"/>
+ <SecurityGroupPermission groupId="GOOGLEBASEADMIN" permissionId="GOOGLEBASE_ADMIN"/>
+ <SecurityGroup description="Google Base View" groupId="GOOGLEBASEVIEW"/>
+ <SecurityGroupPermission groupId="GOOGLEBASEVIEW" permissionId="GOOGLEBASE_VIEW"/>
</entity-engine-xml>
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/data/GoogleBaseTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/data/GoogleBaseTypeData.xml?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/data/GoogleBaseTypeData.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/data/GoogleBaseTypeData.xml Thu Mar 24 07:23:42 2011
@@ -22,4 +22,8 @@ under the License.
<GoodIdentificationType description="Google Id" goodIdentificationTypeId="GOOGLE_ID" hasTable="N" parentTypeId=""/>
<WebSite webSiteId="GOOGLEBASE" siteName="Google Base Application" visualThemeSetId="BACKOFFICE"/>
+
+ <GoodIdentificationType description="Google Id en_US" goodIdentificationTypeId="GOOGLE_ID_en_US" hasTable="N"/>
+ <GoodIdentificationType description="Google Id en_GB" goodIdentificationTypeId="GOOGLE_ID_en_GB" hasTable="N"/>
+ <GoodIdentificationType description="Google Id de" goodIdentificationTypeId="GOOGLE_ID_de" hasTable="N"/>
</entity-engine-xml>
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/entitydef/entitymodel.xml?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/entitydef/entitymodel.xml Thu Mar 24 07:23:42 2011
@@ -48,6 +48,11 @@ under the License.
<field name="accountPassword" type="name" encrypt="true"></field>
<field name="postItemsUrl" type="value"><description>All the items should be posted to this url</description></field>
<field name="webSiteId" type="id-ne"></field>
+ <field name="utmSource" type="id-ne"><description>Campaign Source (referrer: google, citysearch, newsletter4)</description></field>
+ <field name="utmMedium" type="id-ne"><description>Campaign Medium (marketing medium: cpc, banner, email)</description></field>
+ <field name="utmTerm" type="id-ne"><description>Campaign Term (identify the paid keywords)</description></field>
+ <field name="utmContent" type="id-ne"><description>Campaign Content (use to differentiate ads)</description></field>
+ <field name="utmCampaign" type="id-ne"><description>Campaign Name (product, promo code, or slogan)</description></field>
<prim-key field="productStoreId"/>
<relation type="one" fk-name="GBS_PROD_STORE" rel-entity-name="ProductStore">
<key-map field-name="productStoreId"/>
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/servicedef/services.xml?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/servicedef/services.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/servicedef/services.xml Thu Mar 24 07:23:42 2011
@@ -37,6 +37,12 @@ under the License.
<attribute type="String" mode="IN" name="webSiteMountPoint" optional="false"/>
<attribute type="String" mode="IN" name="countryCode" optional="false"/>
<attribute type="String" mode="IN" name="productStoreId" optional="true"/>
+ <attribute type="String" mode="IN" name="allowRecommended" optional="true"/>
+ <attribute type="String" mode="IN" name="utmSource" optional="true"/>
+ <attribute type="String" mode="IN" name="utmMedium" optional="true"/>
+ <attribute type="String" mode="IN" name="utmTerm" optional="true"/>
+ <attribute type="String" mode="IN" name="utmContent" optional="true"/>
+ <attribute type="String" mode="IN" name="utmCampaign" optional="true"/>
</service>
<service name="exportProductCategoryToGoogle" engine="java"
location="org.ofbiz.googlebase.ProductsExportToGoogle" invoke="exportProductCategoryToGoogle" auth="true">
@@ -63,4 +69,10 @@ under the License.
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
+ <!-- Auto update to google base **scheduled service -->
+ <service name="autoUpdateToGoogleBase" engine="simple"
+ location="component://googlebase/script/org/ofbiz/googlebase/GooglebaseServices.xml" invoke="autoUpdateToGoogleBase" auth="true" use-transaction="false">
+ <description>Auto update to google base</description>
+ <attribute type="List" mode="OUT" name="allProductExportList" optional="true"/>
+ </service>
</services>
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/src/org/ofbiz/googlebase/GoogleBaseSearchEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/src/org/ofbiz/googlebase/GoogleBaseSearchEvents.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/src/org/ofbiz/googlebase/GoogleBaseSearchEvents.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/src/org/ofbiz/googlebase/GoogleBaseSearchEvents.java Thu Mar 24 07:23:42 2011
@@ -81,7 +81,17 @@ public class GoogleBaseSearchEvents {
if (selectResult.startsWith("[")) {
productExportList = StringUtil.toList(selectResult);
} else {
- productExportList.add(selectResult);
+ if(!selectResult.startsWith("{")){
+ productExportList.add(selectResult);
+ }else {
+ List<String> listTemp = FastList.newInstance();
+ String temp = selectResult.substring(1, selectResult.length()-1);
+ String arrayTemp[] = temp.split(",");
+ for(int i=0; i<arrayTemp.length; i++){
+ listTemp.add(arrayTemp[i].trim());
+ }
+ productExportList = listTemp;
+ }
}
}
String webSiteUrl = request.getParameter("webSiteUrl");
@@ -93,6 +103,7 @@ public class GoogleBaseSearchEvents {
String webSiteMountPoint = request.getParameter("webSiteMountPoint");
String countryCode = request.getParameter("countryCode");
String productStoreId = request.getParameter("productStoreId");
+ String allowRecommended = (String) request.getParameter("allowRecommended");
// Export all or selected products to Google Base
try {
@@ -107,6 +118,7 @@ public class GoogleBaseSearchEvents {
inMap.put("trackingCodeId", trackingCodeId);
inMap.put("userLogin", userLogin);
inMap.put("productStoreId", productStoreId);
+ inMap.put("allowRecommended", allowRecommended);
Map<String, Object> exportResult = dispatcher.runSync("exportToGoogle", inMap);
if (ServiceUtil.isError(exportResult)) {
List<String> errorMessages = UtilGenerics.checkList(exportResult.get(ModelService.ERROR_MESSAGE_LIST), String.class);
@@ -119,12 +131,13 @@ public class GoogleBaseSearchEvents {
} else if (ServiceUtil.isFailure(exportResult)) {
List<String> eventMessages = UtilGenerics.checkList(exportResult.get(ModelService.ERROR_MESSAGE_LIST), String.class);
if (UtilValidate.isNotEmpty(eventMessages)) {
- request.setAttribute("_EVENT_MESSAGE_LIST_", eventMessages);
+ request.setAttribute("_ERROR_MESSAGE_LIST_", eventMessages);
} else {
- request.setAttribute("_EVENT_MESSAGE_", ServiceUtil.getErrorMessage(exportResult));
+ request.setAttribute("_ERROR_MESSAGE_", ServiceUtil.getErrorMessage(exportResult));
}
+ return "error";
} else {
- request.setAttribute("_EVENT_MESSAGE_", exportResult.get("successMessage"));
+ request.setAttribute("_EVENT_MESSAGE_", exportResult.get("responseMessage"));
}
} catch (GenericServiceException e) {
errMsg = UtilProperties.getMessage(resource, "googlebasesearchevents.exceptionCallingExportToGoogle", locale);