Author: julien(a)jboss.com Date: 2007-02-05 11:51:57 -0500 (Mon, 05 Feb 2007) New Revision: 6158 Modified: trunk/core-samples/src/resources/portal-samples-war/WEB-INF/default-object.xml trunk/core/src/resources/portal-core-sar/conf/data/default-object.xml trunk/core/src/resources/portal-core-sar/dtd/portal-object_2_6.dtd Log: updates to the portal-object dtd Modified: trunk/core/src/resources/portal-core-sar/conf/data/default-object.xml =================================================================== --- trunk/core/src/resources/portal-core-sar/conf/data/default-object.xml 2007-02-05 16:30:21 UTC (rev 6157) +++ trunk/core/src/resources/portal-core-sar/conf/data/default-object.xml 2007-02-05 16:51:57 UTC (rev 6158) @@ -32,6 +32,16 @@ <if-exists>keep</if-exists> <portal> <portal-name>default</portal-name> + <supported-modes> + <mode>view</mode> + <mode>edit</mode> + <mode>help</mode> + </supported-modes> + <supported-window-states> + <window-state>normal</window-state> + <window-state>minimized</window-state> + <window-state>maximized</window-state> + </supported-window-states> <properties> <!-- | Set the layout for the default portal, see also portal-layouts.xml. @@ -69,16 +79,13 @@ <value>default</value> </property> </properties> - <supported-modes> - <mode>view</mode> - <mode>edit</mode> - <mode>help</mode> - </supported-modes> - <supported-window-states> - <window-state>normal</window-state> - <window-state>minimized</window-state> - <window-state>maximized</window-state> - </supported-window-states> + <security-constraint> + <policy-permission> + <unchecked/> + <action-name>viewrecursive</action-name> + <action-name>personalizerecursive</action-name> + </policy-permission> + </security-constraint> <page> <page-name>default</page-name> <properties> @@ -109,13 +116,6 @@ <height>1</height> </window> </page> - <security-constraint> - <policy-permission> - <unchecked/> - <action-name>viewrecursive</action-name> - <action-name>personalizerecursive</action-name> - </policy-permission> - </security-constraint> </portal> </deployment> <deployment> @@ -191,14 +191,6 @@ <value>true</value> </property> </properties> -<!-- - <security-constraint> - <policy-permission> - <role-name>Authenticated</role-name> - <action-name>view</action-name> - </policy-permission> - </security-constraint> ---> </context> </deployment> <deployment> @@ -206,6 +198,16 @@ <if-exists>keep</if-exists> <portal> <portal-name>template</portal-name> + <supported-modes> + <mode>view</mode> + <mode>edit</mode> + <mode>help</mode> + </supported-modes> + <supported-window-states> + <window-state>normal</window-state> + <window-state>minimized</window-state> + <window-state>maximized</window-state> + </supported-window-states> <properties> <!-- | Set the layout for the default portal, see also portal-layouts.xml. @@ -243,16 +245,6 @@ <value>default</value> </property> </properties> - <supported-modes> - <mode>view</mode> - <mode>edit</mode> - <mode>help</mode> - </supported-modes> - <supported-window-states> - <window-state>normal</window-state> - <window-state>minimized</window-state> - <window-state>maximized</window-state> - </supported-window-states> <page> <page-name>default</page-name> <properties> @@ -290,6 +282,16 @@ <if-exists>keep</if-exists> <portal> <portal-name>admin</portal-name> + <supported-modes> + <mode>view</mode> + <mode>edit</mode> + <mode>help</mode> + </supported-modes> + <supported-window-states> + <window-state>normal</window-state> + <window-state>minimized</window-state> + <window-state>maximized</window-state> + </supported-window-states> <properties> <!-- | Set the layout for the default portal, see also portal-layouts.xml. @@ -327,16 +329,12 @@ <value>default</value> </property> </properties> - <supported-modes> - <mode>view</mode> - <mode>edit</mode> - <mode>help</mode> - </supported-modes> - <supported-window-states> - <window-state>normal</window-state> - <window-state>minimized</window-state> - <window-state>maximized</window-state> - </supported-window-states> + <security-constraint> + <policy-permission> + <role-name>Admin</role-name> + <action-name>viewrecursive</action-name> + </policy-permission> + </security-constraint> <page> <page-name>default</page-name> <window> @@ -367,12 +365,6 @@ <height>0</height> </window> </page> - <security-constraint> - <policy-permission> - <role-name>Admin</role-name> - <action-name>viewrecursive</action-name> - </policy-permission> - </security-constraint> </portal> </deployment> </deployments> Modified: trunk/core/src/resources/portal-core-sar/dtd/portal-object_2_6.dtd =================================================================== --- trunk/core/src/resources/portal-core-sar/dtd/portal-object_2_6.dtd 2007-02-05 16:30:21 UTC (rev 6157) +++ trunk/core/src/resources/portal-core-sar/dtd/portal-object_2_6.dtd 2007-02-05 16:51:57 UTC (rev 6158) @@ -62,7 +62,7 @@ 3/ security-constraint : defines security configuration of the portal object. --> -<!ELEMENT deployment (parent-ref,if-exists?,context|portal|page|window)> +<!ELEMENT deployment (parent-ref,if-exists?,(context|portal|page|window))> <!-- Contains a reference to the parent object. The naming convention for naming object @@ -89,7 +89,7 @@ A portal object of type context. A context type represent a node in the tree which 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?,portal*,listener?,security-constraint?)> +<!ELEMENT context (context-name,properties?,listener?,security-constraint?,portal*)> <!-- The context name value. @@ -102,7 +102,7 @@ states it supports. If no declaration of modes or window states is done then the default value will be respectively (view,edit,help) and (normal,minimized,maximized). --> -<!ELEMENT portal (portal-name,properties?,supported-modes,supported-window-states?,page*,listener?,security-constraint?)> +<!ELEMENT portal (portal-name,supported-modes,supported-window-states?,properties?,listener?,security-constraint?,page*)> <!-- The portal name value. @@ -151,7 +151,7 @@ A portal object of type page. A page type represents a page which can have children of 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?,(page|window)*,listener?,security-constraint?)> +<!ELEMENT page (page-name,properties?,listener?,security-constraint?,(page|window)*)> <!-- The page name value. Modified: trunk/core-samples/src/resources/portal-samples-war/WEB-INF/default-object.xml =================================================================== --- trunk/core-samples/src/resources/portal-samples-war/WEB-INF/default-object.xml 2007-02-05 16:30:21 UTC (rev 6157) +++ trunk/core-samples/src/resources/portal-samples-war/WEB-INF/default-object.xml 2007-02-05 16:51:57 UTC (rev 6158) @@ -56,6 +56,7 @@ </window> <page> <page-name>event test</page-name> + <listener>event_listener</listener> <window> <window-name>CatalogPortletWindow</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -74,10 +75,10 @@ <region>center</region> <height>1</height> </window> - <listener>event_listener</listener> </page> <page> <page-name>page event test</page-name> + <listener>window_event_listener</listener> <window> <window-name>CatalogPortletWindow1</window-name> <instance-ref>CatalogPortletInstance</instance-ref> @@ -114,7 +115,6 @@ <region>center</region> <height>2</height> </window> - <listener>window_event_listener</listener> </page> <page> <page-name>secure test</page-name>