"Applied fix from trunk for revision: 1559814" 
------------------------------------------------------------------------
r1559814 | jleroux | 2014-01-20 20:38:45 +0100 (lun. 20 janv. 2014) | 38 lignes

A patch from Michael Ende for "SimpleMethod parameters doesnt work with prefix" https://issues.apache.org/jira/browse/OFBIZ-5371

I experienced some problems when a form submitted parameters with prefix directly to a SimpleMethod (through the controller request). 
In this case the prefix is not stripped from the parameter name. The patch updates the method ModelService.java:makePrefixMap().

The idea of the prefixMap is: 
If you have some fields like packageweight_1(value=55), packageweight_2(value=65) ... in a form and in a service you need a map called packageweight with the following key values 

packageweight{1=55;2=56;...}

The Problem is that the function makePrefixMap doesn't replace the Prefix.

For Example:
On the "Complete" button of the Facility->Shipment screen we call an event and not the completePack service directly.
The event checks some user rights and after that he call the completePack service. If we call the service from an event there throws an NumberFormatException because the packeweight-PrefixMap contains the prefixes.

This is my event description:
 <simple-method method-name="completePackCheckPermission"
        short-description="Check if this user has permission to create a picklist role"
        login-required="true">
        <check-permission permission="LOGISTICS_CREATE">
            <alt-permission permission="LOGISTICS_ADMIN"/>
            <fail-property resource="EcommerceLogisticsErrorUiLabels" property="NoPermissionForUsage" />
        </check-permission>
        <check-errors />

        <session-to-field field="packingSession"/>
        <set field="parameters.packingSession" from-field="packingSession"/>

        <set-service-fields service-name="completePack" to-map="serviceParameters"
            map="parameters" />
        <call-service service-name="completePack" in-map-name="serviceParameters" />
        <return />
    </simple-method>

jleroux: I'm not quite sure there are no side-effects, but I was not able to find one. So I will wait some time before backporting...


------------------------------------------------------------------------
?\026

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1564405 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: 1564463" 
------------------------------------------------------------------------
r1564463 | jleroux | 2014-02-04 21:24:14 +0100 (mar. 04 févr. 2014) | 1 ligne

Update commons-fileupload to 1.3
------------------------------------------------------------------------
?\026

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1564525 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: 1564473" 
------------------------------------------------------------------------
r1564473 | jleroux | 2014-02-04 21:36:34 +0100 (mar. 04 févr. 2014) | 1 ligne

Updates geronimo-connector & geronimo-transaction to 3.1.1
------------------------------------------------------------------------
?\026

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1564529 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: 1564493" 
------------------------------------------------------------------------
r1564493 | jleroux | 2014-02-04 22:09:43 +0100 (mar. 04 févr. 2014) | 1 ligne

Updates geronimo-saaj to _1.3_spec-1.1
------------------------------------------------------------------------
?\026

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1564533 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: 1564543" 
------------------------------------------------------------------------
r1564543 | jleroux | 2014-02-04 23:41:27 +0100 (mar. 04 févr. 2014) | 2 lignes

Updates axis2-kernel, axis2-transport-http & axis2-transport-local to 1.6.2

------------------------------------------------------------------------
?\026

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1564544 13f79535-47bb-0310-9956-ffa450edef68
Reverts 1564544, SOAP tests fail with axis2 1.6.2, keep 1.5.2

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1564662 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: 1557409" 
------------------------------------------------------------------------
r1557409 | jleroux | 2014-01-11 15:52:23 +0100 (sam. 11 janv. 2014) | 2 lignes

Updates icu4j-49_1.jar to icu4j-52_1.jar (tests passes)

------------------------------------------------------------------------
?\026

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1564774 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: 1557456" 
------------------------------------------------------------------------
r1557456 | jleroux | 2014-01-11 20:59:04 +0100 (sam. 11 janv. 2014) | 1 ligne

Forgot to update .classpath and LICENSE files
------------------------------------------------------------------------
?\026

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1564780 13f79535-47bb-0310-9956-ffa450edef68
Merged revision(s) 1566096 from ofbiz/trunk:
Some bug fixes in Mini-language:

1. Updated schema to indicate required attributes.
2. Fixed inconsistent implementation of the alternate delegator feature: https://issues.apache.org/jira/browse/OFBIZ-5531


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1566108 13f79535-47bb-0310-9956-ffa450edef68
This merges r1559769 from trunk 

This is a major update of jQuery and related, it contains:
    jquery-1.8.2 to jquery-1.10.2 which implies using jquery-migrate-1.2.1 for plugins compatiblities
    jquery-ui-timepicker-addon-1.0.5 to jquery-ui-timepicker-addon-1.4.3 (using min now, better i18n)
    jquery-ui-1.9.0 to jquery-ui-1.10.3
    removes jquery.ui.datepicker.js now integrated in jquery.ui
    jquery.hotkeys-0.7.9 to jquery.hotkeys-0.8
    jquery.maskedinput-1.2.2 to jquery.maskedinput-1.3.1
    jquery.validate 1.10.0 to 1.11.1
        I never realised how much efforts have been put in this plugin!
        I fixed an issue in JsLanguageFilesMapping generation
        I removed the messages_ptbr.js and messages_ptpt.js files and the related conundrum in JsLanguageFileMappingCreator.java
        untested, found not use cases OOTB
    jquery.jcarousel ?(2006) to 0.3.0 (2013)
        untested, found not use cases OOTB
    jquery.flot 0.7 to 0.8.2 (lot of changes, still works)
        removes useless flotpie.ftl
        removes empty flotr folder
    jquery.mobile-1.1.0-rc.1 to jquery.mobile-1.4.0
        untested, found not use cases OOTB
    jquery.cookie to jquery.cookie-1.4.0


Removes all useless/redundant js files (not only jQuery unused old versions)
    notably removes all under images/jquery/ui/development-bundle/ui
    removes now useless GooglemapMarkers.js and GooglemapSimple.js

Flat Grey application.js
    moves jQuery(document).ready(function() at bottom (spotted in Chrome console)

css
    I did not find much issues, I spotted the title bar of the lookups, but got it fixed after some efforts.

Issues:
    Imagemanagement:  I got issues while testing, actually I'm not quite sure how it works, even in stable demo. It should be
        validated again. I commit nevertheless my changes: moves js part from product to images component
        removes useless calls to js files (mostly in imagemanagement, but not only)
        renames jquery.min.js to sizzle.min.js.
        Inside sizzle.min.js, updates the Dojo part to v1.10.17-pre and removes the jQuery part
        changes to use ofbizContentUrl macro for generating js calls
        jquery.rotate.js NOT! It's jQueryRotateCompressed.js http://markmail.org/message/dit3dlh3ph4jnenp
        Got ERROR 22001: A truncation error was encountered trying to shrink VARCHAR
         'D:\projectsASF\ofbizClean\framework\images\webapp\images\pro&' to length 100.  I opened OFBIZ-5501 for that I tried to update
jstree  to jstree 3 but gave up. I let the jquery.jstree-3.0.0-beta3 files in place in case someone would give it a chance... 



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1566564 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: " 
?\026

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1569081 13f79535-47bb-0310-9956-ffa450edef68
Applied fix from trunk for revision: 1569743 
===

Fixed MissingPropertyException happening when success method was called in the context of Groovy services: thanks to Paolo Piersant for the bug report and fix.




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1569746 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: 1571207 " 
------------------------------------------------------------------------
r1571207 | jleroux | 2014-02-24 11:02:07 +0100 (lun. 24 févr. 2014) | 1 ligne

Small fix due to Windows 7 behaviour change
------------------------------------------------------------------------
?\026

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1571209 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: 1571219" 
------------------------------------------------------------------------
r1571219 | jleroux | 2014-02-24 11:33:12 +0100 (lun. 24 févr. 2014) | 10 lignes

After reverting r1571198 (there was too much unwanted changes due to my "Save Actions" setting in Eclipse) doing it again with the only changes really wanted

A slightly modified patch from Praveen Agrawal for "The getFeatureIdQtyMap function doesn't include the DISTINGUISHING_FEAT into the featureMap" https://issues.apache.org/jira/browse/OFBIZ-5544

The getFeatureIdQtyMap function in ShoppingCartItem.java doesn't include the DISTINGUISHING_FEAT in featureMap so if we want to calculate the Shipping amount based on Distinguishing feature, this method doesn't return the Distinguishing Feature in Feature Map. If we add DISTINGUISHING_FEAT as productFeatureApplTypeId in filterExprs then the feature map would contain the Distinguishing feature in addition to Standard and Required Feature.

Also in ShoppingCartItem.java, putAdditionalProductFeatureAndAppl method, i think the OrderAdjustment should only be included when the amount is not null.

jleroux: When the amount is null it's now not added in the adjustement (I moved that in the block above where the amount is already tested for null). But the OrderAdjustment is still created because a recurringAmount could still exist . I just added a warning for when both amounts are null. We could decide to not create an adjustement when there are no amounts at all. But I preferred a warning, because it's a weird situation and people could prefer to be aware...

------------------------------------------------------------------------
?\026

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1571225 13f79535-47bb-0310-9956-ffa450edef68
Applied fix from trunk for revision: 1570611 
===

Upgraded JUEL to 2.2.7 using EL specification 2.2.




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1571246 13f79535-47bb-0310-9956-ffa450edef68
Applied fix from trunk for revision: 1570622 
===

Removed unnecessary jar.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1571248 13f79535-47bb-0310-9956-ffa450edef68
Applied fix from trunk for revision: 1571247 
===

This jar file has been removed in rev. 1570622



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1571249 13f79535-47bb-0310-9956-ffa450edef68
Applied fix from trunk for revision: 1570639 
===

Upgrade to Tomcat 7.0.52 (latest bug fix release). I have used the standard release and not the "embedded" version after I have realized (from a conversation with Mark Thomas @ Tomcat and then directly checking the content of each jar) that the embedded jars contain also the J2ee apis that we already have in the OFBiz classpath.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1571255 13f79535-47bb-0310-9956-ffa450edef68
Applied fix from trunk for revision: 1570640 
===

Updates to reflect recent changes to jar for the new tomcat release



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1571256 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: 1573161  " 
------------------------------------------------------------------------
r1573161 | jleroux | 2014-03-01 13:15:33 +0100 (sam. 01 mars 2014) | 14 lignes

A patch from Leila Mekika for "Problems in single form when use-when and position are used together" https://issues.apache.org/jira/browse/OFBIZ-5552

The service "renderSingleFormString" check the previous field position to see if the current field must be displayed after the previous field or on a new line. 

When the previous field has a use-when condition that is not valid, it remains as the currentFormField and the next field is compared with this "not rendered" field. If the position of this previous field is the same as the current field, the current is displayed on the next line.


To reproduce, add in a single form the three fields below :

<field position="1" name="first"><display description="first"/></field>
<field position="2" name="second" use-when="true"><display description="second"/></field>
<field position="2" name="second" use-when="false"><display description="second"/></field>

The field second is rendered on a new line
------------------------------------------------------------------------
?\026

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1573162 13f79535-47bb-0310-9956-ffa450edef68