svn commit: r1598122 - in /ofbiz/branches/release12.04: ./ framework/base/lib/j2eespecs/ framework/catalina/lib/

Author: jleroux
Date: Wed May 28 20:10:07 2014
New Revision: 1598122

URL: http://svn.apache.org/r1598122
Log:
Updates Tomcat to 7.0.54 (done by hand)

Added:
    ofbiz/branches/release12.04/comment.tmp
    ofbiz/branches/release12.04/framework/catalina/lib/ecj-P20140317-1600.jar   (with props)
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-catalina-ha.jar   (with props)
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-catalina-tribes.jar   (with props)
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-catalina.jar   (with props)
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-jasper.jar   (with props)
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-tomcat-api.jar   (with props)
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-tomcat-coyote.jar   (with props)
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-tomcat-juli.jar   (with props)
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-tomcat-util.jar   (with props)
Removed:
    ofbiz/branches/release12.04/framework/catalina/lib/ecj-4.2.2.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.50-catalina-ha.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.50-catalina-tribes.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.50-tomcat-embed-core.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.50-tomcat-embed-jasper.jar
    ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.50-tomcat-embed-logging-log4j.jar
Modified:
    ofbiz/branches/release12.04/framework/base/lib/j2eespecs/annotations-api-3.0.jar
    ofbiz/branches/release12.04/framework/base/lib/j2eespecs/el-api-2.2.jar
    ofbiz/branches/release12.04/framework/base/lib/j2eespecs/jsp-api-2.2.jar
    ofbiz/branches/release12.04/framework/base/lib/j2eespecs/servlet-api-3.0.jar

Added: ofbiz/branches/release12.04/comment.tmp
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/comment.tmp?rev=1598122&view=auto
==============================================================================
--- ofbiz/branches/release12.04/comment.tmp (added)
+++ ofbiz/branches/release12.04/comment.tmp Wed May 28 20:10:07 2014
@@ -0,0 +1,15 @@
+"Applied fix from trunk for revision: 1597464  "
+------------------------------------------------------------------------
+r1597464 | jleroux | 2014-05-25 22:04:08 +0200 (dim. 25 mai 2014) | 9 lignes
+
+2 patches from Deepak Dixit for "If customer pay higher than amount due, POS issues an error 'Problem with order change'." https://issues.apache.org/jira/browse/OFBIZ-5611
+
+If customer pay higher than amount due, POS issues an error 'Problem with order change'.
+
+Deepak:
+This is due to changes done at r#1186102 (http://ofbiz.markmail.org/message/orewmkxnalebolke?q=1186102)
+Removed incorrect condition form createPaymentApplication service.
+Also found type in PaymentEvents.java file (Xuilabels == > XuiLabels).
+
+------------------------------------------------------------------------
+
\ No newline at end of file

Modified: ofbiz/branches/release12.04/framework/base/lib/j2eespecs/annotations-api-3.0.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/base/lib/j2eespecs/annotations-api-3.0.jar?rev=1598122&r1=1598121&r2=1598122&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/branches/release12.04/framework/base/lib/j2eespecs/el-api-2.2.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/base/lib/j2eespecs/el-api-2.2.jar?rev=1598122&r1=1598121&r2=1598122&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/branches/release12.04/framework/base/lib/j2eespecs/jsp-api-2.2.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/base/lib/j2eespecs/jsp-api-2.2.jar?rev=1598122&r1=1598121&r2=1598122&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/branches/release12.04/framework/base/lib/j2eespecs/servlet-api-3.0.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/base/lib/j2eespecs/servlet-api-3.0.jar?rev=1598122&r1=1598121&r2=1598122&view=diff
==============================================================================
Binary files - no diff available.

Added: ofbiz/branches/release12.04/framework/catalina/lib/ecj-P20140317-1600.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/catalina/lib/ecj-P20140317-1600.jar?rev=1598122&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/release12.04/framework/catalina/lib/ecj-P20140317-1600.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-catalina-ha.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-catalina-ha.jar?rev=1598122&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-catalina-ha.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-catalina-tribes.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-catalina-tribes.jar?rev=1598122&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-catalina-tribes.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-catalina.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-catalina.jar?rev=1598122&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-catalina.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-jasper.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-jasper.jar?rev=1598122&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-jasper.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-tomcat-api.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-tomcat-api.jar?rev=1598122&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-tomcat-api.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-tomcat-coyote.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-tomcat-coyote.jar?rev=1598122&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-tomcat-coyote.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-tomcat-juli.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-tomcat-juli.jar?rev=1598122&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-tomcat-juli.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-tomcat-util.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-tomcat-util.jar?rev=1598122&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/release12.04/framework/catalina/lib/tomcat-7.0.54-tomcat-util.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream