svn commit: r989487 - in /ofbiz/branches/release10.04: ./ framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java framework/minilang/dtd/simple-methods.xsd framework/widget/dtd/widget-form.xsd framework/widget/dtd/widget-screen.xsd

[erwan]

Author: erwan
Date: Thu Aug 26 07:22:50 2010
New Revision: 989487

URL: http://svn.apache.org/viewvc?rev=989487&view=rev
Log:
Applied fix from trunk for revision: 989475
===


Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java
    ofbiz/branches/release10.04/framework/minilang/dtd/simple-methods.xsd
    ofbiz/branches/release10.04/framework/widget/dtd/widget-form.xsd
    ofbiz/branches/release10.04/framework/widget/dtd/widget-screen.xsd

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 26 07:22:50 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841,989166,989389
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841,989166,989389,989475

Modified: ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java?rev=989487&r1=989486&r2=989487&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java (original)
+++ ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java Thu Aug 26 07:22:50 2010
@@ -312,10 +312,10 @@ public class EntityFinderUtil {
         protected FlexibleMapAccessor<Object> fieldNameAcsr;
 
         public ConditionObject(Element conditionExprElement) {
-            this.fieldNameAcsr = FlexibleMapAccessor.getInstance(conditionExprElement.getAttribute("field-name"));
+            this.fieldNameAcsr = FlexibleMapAccessor.getInstance(conditionExprElement.getAttribute("object-name"));
             if (this.fieldNameAcsr.isEmpty()) {
                 // no "field-name"? try "name"
-                this.fieldNameAcsr = FlexibleMapAccessor.getInstance(conditionExprElement.getAttribute("name"));
+                this.fieldNameAcsr = FlexibleMapAccessor.getInstance(conditionExprElement.getAttribute("field-name"));
             }
         }
 

Modified: ofbiz/branches/release10.04/framework/minilang/dtd/simple-methods.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/minilang/dtd/simple-methods.xsd?rev=989487&r1=989486&r2=989487&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/minilang/dtd/simple-methods.xsd (original)
+++ ofbiz/branches/release10.04/framework/minilang/dtd/simple-methods.xsd Thu Aug 26 07:22:50 2010
@@ -2458,7 +2458,7 @@ under the License.
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.condition-object">
-        <xs:attribute name="field" type="xs:string" use="required">
+        <xs:attribute name="object-name" type="xs:string" use="required">
             <xs:annotation>
                 <xs:documentation>
                     Field in the current context where that condition object is that implements the entity condition interface.

Modified: ofbiz/branches/release10.04/framework/widget/dtd/widget-form.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/widget/dtd/widget-form.xsd?rev=989487&r1=989486&r2=989487&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/widget/dtd/widget-form.xsd (original)
+++ ofbiz/branches/release10.04/framework/widget/dtd/widget-form.xsd Thu Aug 26 07:22:50 2010
@@ -1857,7 +1857,7 @@ under the License.
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.condition-object">
-        <xs:attribute type="xs:string" name="field" use="required"/>
+        <xs:attribute type="xs:string" name="object-name" use="required"/>
     </xs:attributeGroup>
     <xs:element name="field-map">
         <xs:complexType>

Modified: ofbiz/branches/release10.04/framework/widget/dtd/widget-screen.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/widget/dtd/widget-screen.xsd?rev=989487&r1=989486&r2=989487&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/widget/dtd/widget-screen.xsd (original)
+++ ofbiz/branches/release10.04/framework/widget/dtd/widget-screen.xsd Thu Aug 26 07:22:50 2010
@@ -699,7 +699,7 @@ under the License.
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.condition-object">
-        <xs:attribute type="xs:string" name="field" use="required"/>
+        <xs:attribute type="xs:string" name="object-name" use="required"/>
     </xs:attributeGroup>
     <xs:element name="select-field">
         <xs:complexType>