Author: julien(a)jboss.com
Date: 2007-01-23 12:53:38 -0500 (Tue, 23 Jan 2007)
New Revision: 6084
Modified:
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/default-object.xml
trunk/core-samples/src/resources/portal-samples-war/WEB-INF/default-object.xml
trunk/core/src/resources/dtd/portal-object_2_6.dtd
trunk/core/src/resources/portal-core-sar/conf/data/default-object.xml
trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/wsrp-object.xml
Log:
updated portal-object dtd for 2.6 and corrected the various -object.xml to use it
correctly
Modified: trunk/core/src/resources/dtd/portal-object_2_6.dtd
===================================================================
--- trunk/core/src/resources/dtd/portal-object_2_6.dtd 2007-01-23 17:35:39 UTC (rev 6083)
+++ trunk/core/src/resources/dtd/portal-object_2_6.dtd 2007-01-23 17:53:38 UTC (rev 6084)
@@ -24,7 +24,7 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<!--
-<!DOCTYPE deployment PUBLIC
+<!DOCTYPE deployments PUBLIC
"-//JBoss Portal//DTD Portal Object 2.6//EN"
"http://www.jboss.org/portal/dtd/portal-object_2_6.dtd">
-->
@@ -49,22 +49,62 @@
<!--
-->
-<!ELEMENT context (context-name,properties?,portal*,security-constraint?)>
+<!ELEMENT context
(context-name,properties?,portal*,listener?,security-constraint?)>
<!--
-->
-<!ELEMENT portal
(portal-name,properties?,supported-modes?,supported-window-states?,(page|window)*,security-constraint?)>
+<!ELEMENT context-name #PCDATA>
<!--
-->
-<!ELEMENT page (page-name,properties?,(page|window)*,security-constraint?)>
+<!ELEMENT portal
(portal-name,properties?,supported-modes?,supported-window-states?,(page|window)*,listener?,security-constraint?)>
<!--
-->
-<!ELEMENT window (window-name,(instance-ref|content),properties?,region,height)>
+<!ELEMENT supported-modes (mode*)>
<!--
-->
+<!ELEMENT mode #PCDATA>
+
+<!--
+-->
+<!ELEMENT supported-window-states (window-state*)>
+
+<!--
+-->
+<!ELEMENT window-state #PCDATA>
+
+<!--
+-->
+<!ELEMENT portal-name #PCDATA>
+
+<!--
+-->
+<!ELEMENT page
(page-name,properties?,(page|window)*,listener?,security-constraint?)>
+
+<!--
+-->
+<!ELEMENT listener #PCDATA>
+
+<!--
+-->
+<!ELEMENT page-name #PCDATA>
+
+<!--
+-->
+<!ELEMENT window
(window-name,(instance-ref|content),properties?,region,height,listener?)>
+
+<!--
+-->
+<!ELEMENT window-name #PCDATA>
+
+<!--
+-->
+<!ELEMENT instance-ref #PCDATA>
+
+<!--
+-->
<!ELEMENT content (content-type,content-uri)>
<!--
@@ -74,3 +114,47 @@
<!--
-->
<!ELEMENT content-uri #PCDATA>
+
+<!--
+-->
+<!ELEMENT region #PCDATA>
+
+<!--
+-->
+<!ELEMENT height #PCDATA>
+
+<!--
+-->
+<!ELEMENT properties (property*)>
+
+<!--
+-->
+<!ELEMENT property (name,value)>
+
+<!--
+-->
+<!ELEMENT name #PCDATA>
+
+<!--
+-->
+<!ELEMENT value #PCDATA>
+
+<!--
+-->
+<!ELEMENT security-constraint (policy-permission)>
+
+<!--
+-->
+<!ELEMENT policy-permission (action-name*,unchecked?,role-name*)>
+
+<!--
+-->
+<!ELEMENT action-name #PCDATA>
+
+<!--
+-->
+<!ELEMENT unchecked EMPTY>
+
+<!--
+-->
+<!ELEMENT role-name #PCDATA>
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-01-23
17:35:39 UTC (rev 6083)
+++ trunk/core/src/resources/portal-core-sar/conf/data/default-object.xml 2007-01-23
17:53:38 UTC (rev 6084)
@@ -22,6 +22,10 @@
~ 02110-1301 USA, or see the FSF site:
http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!DOCTYPE deployments PUBLIC
+ "-//JBoss Portal//DTD Portal Object 2.6//EN"
+ "http://www.jboss.org/portal/dtd/portal-object_2_6.dtd">
+
<deployments>
<deployment>
<parent-ref/>
Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/default-object.xml
===================================================================
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/default-object.xml 2007-01-23
17:35:39 UTC (rev 6083)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/default-object.xml 2007-01-23
17:53:38 UTC (rev 6084)
@@ -22,6 +22,10 @@
~ 02110-1301 USA, or see the FSF site:
http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!DOCTYPE deployments PUBLIC
+ "-//JBoss Portal//DTD Portal Object 2.6//EN"
+ "http://www.jboss.org/portal/dtd/portal-object_2_6.dtd">
+
<deployments>
<deployment>
<parent-ref>admin</parent-ref>
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-01-23
17:35:39 UTC (rev 6083)
+++
trunk/core-samples/src/resources/portal-samples-war/WEB-INF/default-object.xml 2007-01-23
17:53:38 UTC (rev 6084)
@@ -22,6 +22,10 @@
~ 02110-1301 USA, or see the FSF site:
http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!DOCTYPE deployments PUBLIC
+ "-//JBoss Portal//DTD Portal Object 2.6//EN"
+ "http://www.jboss.org/portal/dtd/portal-object_2_6.dtd">
+
<deployments>
<deployment>
<parent-ref>default</parent-ref>
@@ -52,7 +56,6 @@
</window>
<page>
<page-name>event test</page-name>
- <listener>event_listener</listener>
<window>
<window-name>CatalogPortletWindow</window-name>
<instance-ref>CatalogPortletInstance</instance-ref>
@@ -71,10 +74,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>
@@ -111,6 +114,7 @@
<region>center</region>
<height>2</height>
</window>
+ <listener>window_event_listener</listener>
</page>
<page>
<page-name>secure test</page-name>
Modified: trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/wsrp-object.xml
===================================================================
--- trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/wsrp-object.xml 2007-01-23 17:35:39
UTC (rev 6083)
+++ trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/wsrp-object.xml 2007-01-23 17:53:38
UTC (rev 6084)
@@ -22,6 +22,10 @@
~ 02110-1301 USA, or see the FSF site:
http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!DOCTYPE deployments PUBLIC
+ "-//JBoss Portal//DTD Portal Object 2.6//EN"
+ "http://www.jboss.org/portal/dtd/portal-object_2_6.dtd">
+
<deployments>
<deployment>
<parent-ref>admin</parent-ref>
@@ -34,12 +38,12 @@
<region>center</region>
<height>0</height>
</window>
+ <security-constraint>
+ <policy-permission>
+ <role-name>Admin</role-name>
+ <action-name>viewrecursive</action-name>
+ </policy-permission>
+ </security-constraint>
</page>
- <security-constraint>
- <policy-permission>
- <role-name>Admin</role-name>
- <action-name>viewrecursive</action-name>
- </policy-permission>
- </security-constraint>
- </deployment>
+ </deployment>
</deployments>