svn commit: r1359626 [1/12] - in /ofbiz/branches/release12.04: ./ framework/base/ framework/base/src/org/ofbiz/base/util/collections/ framework/base/src/org/ofbiz/base/util/collections/test/ framework/base/src/org/ofbiz/base/util/string/ framework/enti...

Tue, 10 Jul 2012 05:06:33 -0700 

Author: adrianc
Date: Tue Jul 10 12:05:55 2012
New Revision: 1359626

URL: http://svn.apache.org/viewvc?rev=1359626&view=rev
Log:
Backporting the Mini-language overhaul to the Release 12 branch.

Added:
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/MiniLangElement.java
      - copied, changed from r1333489, 
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangElement.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/artifact/
      - copied from r1340143, 
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/artifact/
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/artifact/ArtifactInfoContext.java
      - copied, changed from r1340143, 
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/artifact/ArtifactInfoContext.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/MessageElement.java
      - copied, changed from r1339291, 
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MessageElement.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/conditional/Compare.java
      - copied, changed from r1338212, 
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/Compare.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/AddError.java
      - copied, changed from r1335018, 
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/AddError.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/Assert.java
      - copied, changed from r1334997, 
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Assert.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/CheckErrors.java
      - copied, changed from r1335018, 
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/CheckErrors.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/CheckId.java
      - copied, changed from r1334971, 
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/CheckId.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/CreateObject.java
      - copied, changed from r1335018, 
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/CreateObject.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/While.java
      - copied, changed from r1334997, 
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/While.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/otherops/Trace.java
      - copied, changed from r1337137, 
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Trace.java
    ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/test/
      - copied from r1356762, 
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/test/
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/test/MiniLangTests.java
      - copied unchanged from r1356762, 
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/test/MiniLangTests.java
Removed:
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/ContextAccessor.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/callops/AddError.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/callops/CheckErrors.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/callops/CreateObject.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/conditional/Assert.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/conditional/While.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowDateToEnv.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowTimestampToEnv.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToField.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckId.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompare.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompareField.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfEmpty.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfHasPermission.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfRegexp.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfValidateMethod.java
Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/framework/base/   (props changed)
    
ofbiz/branches/release12.04/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java
    
ofbiz/branches/release12.04/framework/base/src/org/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java
    
ofbiz/branches/release12.04/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java
    ofbiz/branches/release12.04/framework/entity/   (props changed)
    ofbiz/branches/release12.04/framework/minilang/   (props changed)
    ofbiz/branches/release12.04/framework/minilang/config/minilang.properties
    ofbiz/branches/release12.04/framework/minilang/dtd/simple-methods-v2.xsd
    
ofbiz/branches/release12.04/framework/minilang/src/META-INF/services/org.ofbiz.minilang.method.MethodOperation$Factory
    
ofbiz/branches/release12.04/framework/minilang/src/META-INF/services/org.ofbiz.minilang.method.conditional.ConditionalFactory
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/MiniLangException.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/MiniLangRuntimeException.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/MiniLangUtil.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/MiniLangValidate.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/SimpleMapProcessor.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/SimpleServiceEngine.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/ValidationException.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/FieldObject.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/MethodObject.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/MethodOperation.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/StringObject.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/callops/CallBsh.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/callops/CallClassMethod.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/callops/CallObjectMethod.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/callops/CallScript.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/callops/CallServiceAsynch.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMethod.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/callops/FlexibleMessage.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/callops/Return.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/conditional/CombinedCondition.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareCondition.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareFieldCondition.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/conditional/Conditional.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/conditional/ConditionalFactory.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/conditional/ElseIf.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/conditional/EmptyCondition.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/conditional/HasPermissionCondition.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/conditional/MasterIf.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/conditional/ValidateMethodCondition.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearEntityCaches.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/CloneValue.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityOne.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByAnd.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByDate.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelated.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeNextSeqId.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeValue.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/OrderValueList.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/SequencedIdToEnv.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetNonpkFields.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetPkFields.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionBegin.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionCommit.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionRollback.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/Break.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/ClearField.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/Continue.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToList.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/FirstFromList.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/ListToList.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/Loop.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/MapToMap.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/Now.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/OrderMapList.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/SetCalendar.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/StringAppend.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToList.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/ToString.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToRequest.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToSession.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestParametersToList.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestToField.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/eventops/SessionToField.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/eventops/WebappPropertyToField.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfInstanceOf.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfNotEmpty.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/otherops/Calculate.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/otherops/Log.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/otherops/PropertyToField.java
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/serviceops/FieldToResult.java
    ofbiz/branches/release12.04/framework/minilang/testdef/MinilangTests.xml
    ofbiz/branches/release12.04/framework/webapp/   (props changed)
    
ofbiz/branches/release12.04/framework/webapp/src/org/ofbiz/webapp/event/WfsEventHandler.java
    ofbiz/branches/release12.04/framework/webtools/   (props changed)
    
ofbiz/branches/release12.04/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1359599-1359600

Propchange: ofbiz/branches/release12.04/framework/base/
------------------------------------------------------------------------------
  Merged 
/ofbiz/trunk/framework/base:r1334575,1338361,1338366,1338372,1359599-1359600

Modified: 
ofbiz/branches/release12.04/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java?rev=1359626&r1=1359625&r2=1359626&view=diff
==============================================================================
--- 
ofbiz/branches/release12.04/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java
 (original)
+++ 
ofbiz/branches/release12.04/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java
 Tue Jul 10 12:05:55 2012
@@ -93,6 +93,14 @@ public class FlexibleMapAccessor<T> impl
         return fma;
     }
 
+    /**
+     * Returns <code>true</code> if this <code>FlexibleMapAccessor</code> 
contains a nested expression.
+     * @return <code>true</code> if this <code>FlexibleMapAccessor</code> 
contains a nested expression
+     */
+    public boolean containsNestedExpression() {
+        return fse != null;
+    }
+
     public String getOriginalName() {
         return this.original;
     }

Modified: 
ofbiz/branches/release12.04/framework/base/src/org/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/base/src/org/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java?rev=1359626&r1=1359625&r2=1359626&view=diff
==============================================================================
--- 
ofbiz/branches/release12.04/framework/base/src/org/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java
 (original)
+++ 
ofbiz/branches/release12.04/framework/base/src/org/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java
 Tue Jul 10 12:05:55 2012
@@ -139,6 +139,8 @@ public class FlexibleMapAccessorTests ex
         fmaTest("UEL auto-vivify List", "parameters.someList[0]", 
"parameters.someList[+0]", "Hello ${parameters.someList[0]}!", null, "World", 
"Hello World!");
         fmaTest("fse", "para${'meter'}s.var", "Hello ${parameters.var}!", 
"World", "Hello World!");
         fmaTest("foo", "'The total is ${total?currency(USD)}.'", "total", "The 
total is ${total?currency(USD)}.", localeToTest, new BigDecimal("12345678.90"), 
"The total is $12,345,678.90.");
+        assertTrue("containsNestedExpression method returns true", 
FlexibleMapAccessor.getInstance("Hello 
${parameters.var}!").containsNestedExpression());
+        assertFalse("containsNestedExpression method returns false", 
FlexibleMapAccessor.getInstance("Hello World!").containsNestedExpression());
     }
 
     public static class ThrowException {

Modified: 
ofbiz/branches/release12.04/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java?rev=1359626&r1=1359625&r2=1359626&view=diff
==============================================================================
--- 
ofbiz/branches/release12.04/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java
 (original)
+++ 
ofbiz/branches/release12.04/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java
 Tue Jul 10 12:05:55 2012
@@ -30,7 +30,14 @@ import javax.el.PropertyNotFoundExceptio
 
 import org.ofbiz.base.lang.IsEmpty;
 import org.ofbiz.base.lang.SourceMonitored;
-import org.ofbiz.base.util.*;
+import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.ObjectType;
+import org.ofbiz.base.util.ScriptUtil;
+import org.ofbiz.base.util.UtilDateTime;
+import org.ofbiz.base.util.UtilFormatOut;
+import org.ofbiz.base.util.UtilGenerics;
+import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.cache.UtilCache;
 
 /** Expands String values that contain Unified Expression Language (JSR 245)
@@ -430,9 +437,12 @@ public abstract class FlexibleStringExpa
         Object obj = get(context, timeZone, locale);
         StringBuilder buffer = new StringBuilder(this.hint);
         try {
-            if (obj instanceof String && UtilValidate.isEmpty(obj)) {
-            } else if (obj != null) {
-                buffer.append(ObjectType.simpleTypeConvert(obj, "String", 
null, timeZone, locale, true));
+            if (obj != null) {
+                if (obj instanceof String) {
+                    buffer.append(obj);
+                } else {
+                    buffer.append(ObjectType.simpleTypeConvert(obj, "String", 
null, timeZone, locale, true));
+                }
             }
         } catch (Exception e) {
             buffer.append(obj);

Propchange: ofbiz/branches/release12.04/framework/entity/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk/framework/entity:r1359599-1359600

Propchange: ofbiz/branches/release12.04/framework/minilang/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jul 10 12:05:55 2012
@@ -0,0 +1,6 @@
+/ofbiz/branches/addbirt/framework/minilang:831210-885099,885686-886087
+/ofbiz/branches/dojo1.4/framework/minilang:951708-952957
+/ofbiz/branches/jackrabbit20100709/framework/minilang:962442-1231517
+/ofbiz/branches/jquery/framework/minilang:952958-1044489
+/ofbiz/branches/multitenant20100310/framework/minilang:921280-927264
+/ofbiz/trunk/framework/minilang:1332097,1333028,1333030-1333031,1333034,1333042,1333489,1333491-1333492,1333885,1333960,1334201,1334336,1334358,1334402,1334404,1334427,1334450,1334452,1334459,1334469,1334473,1334483,1334501-1334502,1334536,1334577-1334579,1334915,1334971,1334996-1334997,1335018,1335020,1335025,1335047,1335343,1335347,1335351,1335946,1336921,1337046,1337057-1337059,1337092,1337103,1337117,1337135,1337137,1337202,1337502,1337524,1337644,1337789,1337800,1338065,1338101,1338212,1338224,1338345,1338394,1338403,1338570,1338591,1338697,1338700,1338792,1338831,1338845,1338974,1339079,1339081,1339122,1339147,1339149,1339227-1339228,1339290-1339291,1339610,1339771,1339774,1340143,1340148,1340273,1340352,1340357,1340400,1340405,1340408,1340415,1340465,1340648,1340651,1340657,1340661,1340774,1340821,1340826,1340943,1341075,1341094,1341314,1341348,1341397,1341399,1341408,1342854,1342875,1342893,1342980,1343035,1343088,1343174,1343478,1343509,1343692,1343785,1345473,13454
 
84,1345532,1345547,1345553,1345652,1347762,1348620,1349182,1349646,1349819,1350214,1350337,1350354,1350375,1351778,1351999,1353284,1355347-1355348,1355660,1355801,1355859,1355975,1356245,1356263,1356707,1356758-1356759,1356761-1356762,1356836,1359599-1359600

Modified: 
ofbiz/branches/release12.04/framework/minilang/config/minilang.properties
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/minilang/config/minilang.properties?rev=1359626&r1=1359625&r2=1359626&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/minilang/config/minilang.properties 
(original)
+++ ofbiz/branches/release12.04/framework/minilang/config/minilang.properties 
Tue Jul 10 12:05:55 2012
@@ -20,9 +20,13 @@
 # Mini-language parsing validation level: strict/lenient/none. Strict will 
throw
 # exceptions during runtime when XML errors or syntax errors are encountered,
 # while lenient will only log a warning. A setting of none disables validation.
-validation.level=lenient
+validation.level=none
 
 # Enable mini-language auto-correction. If set to true, mini-language will 
attempt
 # to correct common syntax errors. The corrections are saved in the original
 # source file.
 autocorrect=false
+
+# Enable trace statements in mini-language unit tests. If set to true, 
mini-language
+# unit tests will log trace messages. Log messages will be INFO.
+unit.tests.trace.enabled=false

Reply via email to