svn commit: r1361651 - in /ofbiz/branches/release12.04: ./ applications/order/script/org/ofbiz/order/order/ framework/base/ framework/entity/ framework/minilang/ framework/minilang/dtd/ framework/webapp/ framework/webtools/

[adrianc]

Author: adrianc
Date: Sun Jul 15 08:16:11 2012
New Revision: 1361651

URL: http://svn.apache.org/viewvc?rev=1361651&view=rev
Log:
Merged revisions 1360689 and 1361073 from trunk.

Fixed Mini-language script file that was pointing to the wrong XSD, reported by Tom on the user mailing list.

Fixed booleanExpr type in Mini-language schema. Reported by Olivier on the dev mailing list.

Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml
    ofbiz/branches/release12.04/framework/base/   (props changed)
    ofbiz/branches/release12.04/framework/entity/   (props changed)
    ofbiz/branches/release12.04/framework/minilang/   (props changed)
    ofbiz/branches/release12.04/framework/minilang/dtd/simple-methods-v2.xsd
    ofbiz/branches/release12.04/framework/webapp/   (props changed)
    ofbiz/branches/release12.04/framework/webtools/   (props changed)

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1360689,1361073

Modified: ofbiz/branches/release12.04/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml?rev=1361651&r1=1361650&r2=1361651&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml (original)
+++ ofbiz/branches/release12.04/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml Sun Jul 15 08:16:11 2012
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods.xsd">
+        xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods-v2.xsd">
 
     <simple-method method-name="createUpdateCustomerAndShippingAddress" short-description="Create/Update Customer, Shipping Address and other contact details." login-required="false">
         <call-map-processor xml-resource="component://order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml"

Propchange: ofbiz/branches/release12.04/framework/base/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk/framework/base:r1360689,1361073

Propchange: ofbiz/branches/release12.04/framework/entity/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk/framework/entity:r1360689,1361073

Propchange: ofbiz/branches/release12.04/framework/minilang/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk/framework/minilang:r1360689,1361073

Modified: ofbiz/branches/release12.04/framework/minilang/dtd/simple-methods-v2.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/minilang/dtd/simple-methods-v2.xsd?rev=1361651&r1=1361650&r2=1361651&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/minilang/dtd/simple-methods-v2.xsd (original)
+++ ofbiz/branches/release12.04/framework/minilang/dtd/simple-methods-v2.xsd Sun Jul 15 08:16:11 2012
@@ -78,8 +78,8 @@ under the License.
     </xs:simpleType>
 
     <xs:simpleType name="booleanExpr">
-        <xs:restriction base="xs:token">
-            <xs:pattern value="\$\{[a-zA-Z_]{1}[a-zA-Z0-9_\-.]+\}|true|false" />
+        <xs:restriction base="xs:string">
+            <xs:pattern value="\$\{.+\}|true|false" />
         </xs:restriction>
     </xs:simpleType>
 

Propchange: ofbiz/branches/release12.04/framework/webapp/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk/framework/webapp:r1360689,1361073

Propchange: ofbiz/branches/release12.04/framework/webtools/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk/framework/webtools:r1360689,1361073