svn commit: r514251 - in /ofbiz/trunk/framework/service: dtd/service-eca.xsd src/org/ofbiz/service/eca/ServiceEcaAction.java

[jonesde]

Author: jonesde
Date: Sat Mar  3 13:51:13 2007
New Revision: 514251

URL: http://svn.apache.org/viewvc?view=rev&rev=514251
Log:
Changed runAsUser to run-as-user to be consistent with everything else in the entire framework; still supports the old attribute in parsing code

Modified:
    ofbiz/trunk/framework/service/dtd/service-eca.xsd
    ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java

Modified: ofbiz/trunk/framework/service/dtd/service-eca.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/dtd/service-eca.xsd?view=diff&rev=514251&r1=514250&r2=514251
==============================================================================
--- ofbiz/trunk/framework/service/dtd/service-eca.xsd (original)
+++ ofbiz/trunk/framework/service/dtd/service-eca.xsd Sat Mar  3 13:51:13 2007
@@ -210,7 +210,7 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute type="xs:string" name="runAsUser"/>
+        <xs:attribute type="xs:string" name="run-as-user"/>
         <xs:attribute type="xs:string" name="result-map-name"/>
         <xs:attribute name="new-transaction" default="false">
             <xs:simpleType>

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java?view=diff&rev=514251&r1=514250&r2=514251
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java Sat Mar  3 13:51:13 2007
@@ -55,7 +55,9 @@
         this.eventName = event;
         this.serviceName = action.getAttribute("service");
         this.serviceMode = action.getAttribute("mode");
-        this.runAsUser = action.getAttribute("runAsUser");
+        this.runAsUser = action.getAttribute("run-as-user");
+        // support the old, inconsistent attribute name
+        if (UtilValidate.isEmail(this.runAsUser)) this.runAsUser = action.getAttribute("runAsUser");
         this.resultMapName = action.getAttribute("result-map-name");
         
         // default is true, so anything but false is true