You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2012/05/07 14:59:22 UTC
svn commit: r1334997 - in /ofbiz/trunk/framework/minilang: dtd/ src/META-INF/services/ src/org/ofbiz/minilang/ src/org/ofbiz/minilang/method/conditional/ src/org/ofbiz/minilang/method/envops/

Author: adrianc
Date: Mon May  7 12:59:21 2012
New Revision: 1334997

URL: http://svn.apache.org/viewvc?rev=1334997&view=rev
Log:
Moved some classes out of the org.ofbiz.minilang.method.conditional package that didn't belong there.

Added:
    ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Assert.java
      - copied, changed from r1334579, ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/Assert.java
    ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/While.java
      - copied, changed from r1334536, ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/While.java
Removed:
    ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/Assert.java
    ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/While.java
Modified:
    ofbiz/trunk/framework/minilang/dtd/simple-methods-v2.xsd
    ofbiz/trunk/framework/minilang/src/META-INF/services/org.ofbiz.minilang.method.MethodOperation$Factory
    ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangUtil.java

Modified: ofbiz/trunk/framework/minilang/dtd/simple-methods-v2.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/dtd/simple-methods-v2.xsd?rev=1334997&r1=1334996&r2=1334997&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/dtd/simple-methods-v2.xsd (original)
+++ ofbiz/trunk/framework/minilang/dtd/simple-methods-v2.xsd Mon May  7 12:59:21 2012
@@ -3605,7 +3605,7 @@ under the License.
             </xs:annotation>
         </xs:attribute>
     </xs:attributeGroup>
-    <xs:element name="assert" substitutionGroup="IfOtherOperations">
+    <xs:element name="assert" substitutionGroup="EnvOperations">
         <xs:annotation>
             <xs:documentation>
                 Adds an error to the error list for each condition that evaluates to false.

Modified: ofbiz/trunk/framework/minilang/src/META-INF/services/org.ofbiz.minilang.method.MethodOperation$Factory
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/META-INF/services/org.ofbiz.minilang.method.MethodOperation%24Factory?rev=1334997&r1=1334996&r2=1334997&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/META-INF/services/org.ofbiz.minilang.method.MethodOperation$Factory (original)
+++ ofbiz/trunk/framework/minilang/src/META-INF/services/org.ofbiz.minilang.method.MethodOperation$Factory Mon May  7 12:59:21 2012
@@ -28,9 +28,7 @@ org.ofbiz.minilang.method.callops.CheckE
 org.ofbiz.minilang.method.callops.CreateObject$CreateObjectFactory
 org.ofbiz.minilang.method.callops.Return$ReturnFactory
 org.ofbiz.minilang.method.callops.SetServiceFields$SetServiceFieldsFactory
-org.ofbiz.minilang.method.conditional.Assert$AssertFactory
 org.ofbiz.minilang.method.conditional.MasterIf$MasterIfFactory
-org.ofbiz.minilang.method.conditional.While$WhileFactory
 org.ofbiz.minilang.method.entityops.ClearCacheLine$ClearCacheLineFactory
 org.ofbiz.minilang.method.entityops.ClearEntityCaches$ClearEntityCachesFactory
 org.ofbiz.minilang.method.entityops.CloneValue$CloneValueFactory
@@ -66,6 +64,7 @@ org.ofbiz.minilang.method.entityops.Stor
 org.ofbiz.minilang.method.entityops.TransactionBegin$TransactionBeginFactory
 org.ofbiz.minilang.method.entityops.TransactionCommit$TransactionCommitFactory
 org.ofbiz.minilang.method.entityops.TransactionRollback$TransactionRollbackFactory
+org.ofbiz.minilang.method.envops.Assert$AssertFactory
 org.ofbiz.minilang.method.envops.Break$BreakFactory
 org.ofbiz.minilang.method.envops.CheckId$CheckIdFactory
 org.ofbiz.minilang.method.envops.ClearField$ClearFieldFactory
@@ -85,6 +84,7 @@ org.ofbiz.minilang.method.envops.StringA
 org.ofbiz.minilang.method.envops.StringToField$StringToFieldFactory
 org.ofbiz.minilang.method.envops.StringToList$StringToListFactory
 org.ofbiz.minilang.method.envops.ToString$ToStringFactory
+org.ofbiz.minilang.method.envops.While$WhileFactory
 org.ofbiz.minilang.method.eventops.FieldToRequest$FieldToRequestFactory
 org.ofbiz.minilang.method.eventops.FieldToSession$FieldToSessionFactory
 org.ofbiz.minilang.method.eventops.RequestParametersToList$RequestParametersToListFactory

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangUtil.java?rev=1334997&r1=1334996&r2=1334997&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangUtil.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/MiniLangUtil.java Mon May  7 12:59:21 2012
@@ -48,7 +48,6 @@ import org.ofbiz.minilang.method.callops
 import org.ofbiz.minilang.method.callops.CallSimpleMethod;
 import org.ofbiz.minilang.method.callops.SetServiceFields;
 import org.ofbiz.minilang.method.conditional.MasterIf;
-import org.ofbiz.minilang.method.conditional.While;
 import org.ofbiz.minilang.method.entityops.EntityAnd;
 import org.ofbiz.minilang.method.entityops.EntityCondition;
 import org.ofbiz.minilang.method.entityops.EntityCount;
@@ -61,6 +60,7 @@ import org.ofbiz.minilang.method.entityo
 import org.ofbiz.minilang.method.envops.Iterate;
 import org.ofbiz.minilang.method.envops.IterateMap;
 import org.ofbiz.minilang.method.envops.Loop;
+import org.ofbiz.minilang.method.envops.While;
 import org.ofbiz.minilang.method.ifops.IfCompare;
 import org.ofbiz.minilang.method.ifops.IfCompareField;
 import org.ofbiz.minilang.method.ifops.IfEmpty;

Copied: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Assert.java (from r1334579, ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/Assert.java)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Assert.java?p2=ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Assert.java&p1=ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/Assert.java&r1=1334579&r2=1334997&rev=1334997&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/Assert.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Assert.java Mon May  7 12:59:21 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  *******************************************************************************/
-package org.ofbiz.minilang.method.conditional;
+package org.ofbiz.minilang.method.envops;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -32,6 +32,8 @@ import org.ofbiz.minilang.MiniLangValida
 import org.ofbiz.minilang.SimpleMethod;
 import org.ofbiz.minilang.method.MethodContext;
 import org.ofbiz.minilang.method.MethodOperation;
+import org.ofbiz.minilang.method.conditional.Conditional;
+import org.ofbiz.minilang.method.conditional.ConditionalFactory;
 import org.w3c.dom.Element;
 
 /**

Copied: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/While.java (from r1334536, ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/While.java)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/While.java?p2=ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/While.java&p1=ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/While.java&r1=1334536&r2=1334997&rev=1334997&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/While.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/While.java Mon May  7 12:59:21 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  *******************************************************************************/
-package org.ofbiz.minilang.method.conditional;
+package org.ofbiz.minilang.method.envops;
 
 import java.util.Collections;
 import java.util.List;
@@ -27,6 +27,8 @@ import org.ofbiz.minilang.MiniLangValida
 import org.ofbiz.minilang.SimpleMethod;
 import org.ofbiz.minilang.method.MethodContext;
 import org.ofbiz.minilang.method.MethodOperation;
+import org.ofbiz.minilang.method.conditional.Conditional;
+import org.ofbiz.minilang.method.conditional.ConditionalFactory;
 import org.ofbiz.minilang.method.envops.Break.BreakElementException;
 import org.ofbiz.minilang.method.envops.Continue.ContinueElementException;
 import org.w3c.dom.Element;