[portal-commits] JBoss Portal SVN: r9086 - branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd.

[portal-commits at lists.jboss.org]

Author: thomas.heute at jboss.com
Date: 2007-11-23 10:03:00 -0500 (Fri, 23 Nov 2007)
New Revision: 9086

Modified:
   branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/portal-object_2_6.dtd
   branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/portlet-instances_2_6.dtd
Log:
Update DTDs

Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/portal-object_2_6.dtd
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/portal-object_2_6.dtd	2007-11-23 14:30:55 UTC (rev 9085)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/portal-object_2_6.dtd	2007-11-23 15:03:00 UTC (rev 9086)
@@ -93,7 +93,7 @@
 does not have a visual representation. It can exist only under the root. A context can
 only have children with the portal type.
 -->
-<!ELEMENT context (context-name,properties?,listener?,security-constraint?,portal*)>
+<!ELEMENT context (context-name,properties?,listener?,security-constraint?,portal*, (display-name* | (resource-bundle, supported-locale+)))>
 
 <!--
 The context name value.
@@ -108,7 +108,7 @@
 (view,edit,help) and (normal,minimized,maximized).
 -->
 <!ELEMENT portal (portal-name,supported-modes,supported-window-states?,properties?,
-                  listener?,security-constraint?,page*)>
+                  listener?,security-constraint?,page*, (display-name* | (resource-bundle, supported-locale+)))>
 
 <!--
 The portal name value.
@@ -158,7 +158,7 @@
 type page and window. The children windows are the windows of the page and the children
 pages are the subpages of this page.
 -->
-<!ELEMENT page (page-name,properties?,listener?,security-constraint?,(page|window)*)>
+<!ELEMENT page (page-name,properties?,listener?,security-constraint?,(page|window)*, (display-name* | (resource-bundle, supported-locale+)))>
 
 <!ELEMENT display-name (#PCDATA)>
 <!ATTLIST display-name
@@ -185,7 +185,7 @@
 
 The region and height defines how the window is placed in the page.
 -->
-<!ELEMENT window (window-name,(instance-ref|content),region,height,initial-window-state?,initial-mode?,properties?,listener?)>
+<!ELEMENT window (window-name,(instance-ref|content),region,height,initial-window-state?,initial-mode?,properties?,listener?, (display-name* | (resource-bundle, supported-locale+)))>
 
 <!--
 The window name value.

Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/portlet-instances_2_6.dtd
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/portlet-instances_2_6.dtd	2007-11-23 14:30:55 UTC (rev 9085)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/portlet-instances_2_6.dtd	2007-11-23 15:03:00 UTC (rev 9086)
@@ -74,8 +74,18 @@
 </instance>
 
 -->
-<!ELEMENT instance (instance-id,portlet-ref,display-name*,preferences?,security-constraint?)>
+<!ELEMENT instance (instance-id,portlet-ref,display-name*,preferences?,security-constraint?, (display-name* | (resource-bundle, supported-locale+)))>
 
+<!ELEMENT display-name (#PCDATA)>
+<!ATTLIST display-name
+  xml:lang        NMTOKEN       #IMPLIED
+>
+
+<!ELEMENT resource-bundle (#PCDATA)>
+
+<!ELEMENT supported-locale (#PCDATA)>
+
+
 <!--
 The identifier of the instance.
 -->