Author: hqm
Date: 2007-01-22 16:13:10 -0800 (Mon, 22 Jan 2007)
New Revision: 3479

Modified:
   openlaszlo/branches/legals/WEB-INF/lps/schema/lzx.rnc
Log:
Change 20070122-hqm-6 by [EMAIL PROTECTED] on 2007-01-22 11:33:29 EST
    in /cygdrive/c/users/hqm/openlaszlo/branches/legals/WEB-INF/lps/schema

Summary:  rearrange lzc.rnc schema to avoid warnings

New Features:

Bugs Fixed: LPP-2442 spurious warnings in dataset

Technical Reviewer: jgrandy (pending)
QA Reviewer: ben (pending)
Doc Reviewer: (pending)

Documentation:

Release Notes:

Details:
    

Tests:

ran lztest, compiled lzpix, amazon, 
ran smokecheck

Modified: openlaszlo/branches/legals/WEB-INF/lps/schema/lzx.rnc
===================================================================
--- openlaszlo/branches/legals/WEB-INF/lps/schema/lzx.rnc       2007-01-23 
00:02:58 UTC (rev 3478)
+++ openlaszlo/branches/legals/WEB-INF/lps/schema/lzx.rnc       2007-01-23 
00:13:10 UTC (rev 3479)
@@ -517,7 +517,7 @@
     ## of the dataset can be used in the datapath attribute of
     ## a view.
     [lza:name="datasource dataset"]
-    element dataset {datasetAttributes & datasetContent}*
+    element dataset {datasetAttributes & anyXML}*
   & oninitAttribute?
   & objectElements
 }
@@ -603,21 +603,16 @@
 
 [lza:name="top-level dataset"]
 element dataset {
-  datasetAttributes &
-  (datasetContent | anyXML)
+  datasetAttributes & anyXML
 }
 
-datasetAttributes = objectAttributes, 
+datasetAttributes = objectAttributes & 
   ## If true, namespace prefixes are preserved in XML tag and attribute names
   ## defaults to false in proxied apps, but SOLO apps currently only support
   ## a value of 'true' (namespace prefixes are always attached to
   ## element and attribute names)
-  [a:defaultValue="true"]
-  attribute nsprefix {boolean}?
-
-
-
-datasetContent =
+  [lza:defaultValue="true"]
+  attribute nsprefix {boolean}? &
   ## If true, enable a response to be encoded via the clients Accept-Encoding
   ## HTTP header.  This allows the server to gzip the response.
   [lza:since="1.1"
@@ -907,8 +902,7 @@
     objectElements
   & datapathChildren
   & element dataset {
-     datasetAttributes &
-    (datasetContent | anyXML)
+     datasetAttributes & anyXML
   }*
     
 nodeContent =


_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins

Reply via email to