6:09 a.m.
Author: julien(a)jboss.com
Date: 2007-01-24 07:09:26 -0500 (Wed, 24 Jan 2007)
New Revision: 6088
Modified:
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jboss-portlet.xml
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/portlet-instances.xml
trunk/core-samples/src/resources/portal-samples-war/WEB-INF/jboss-portlet.xml
trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml
trunk/core/src/resources/dtd/jboss-portlet_2_6.dtd
trunk/core/src/resources/dtd/portlet-instances_2_6.dtd
trunk/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml
trunk/core/src/resources/portal-core-war/WEB-INF/portlet-instances.xml
Log:
- added if-exists in dtd for instances
- updated the doctype of portlet-instances.xml files
- improved the dtd for jboss-portlet
- use the doctype jboss-portlet on jboss.portlet.xml files
Modified: trunk/core/src/resources/dtd/jboss-portlet_2_6.dtd
===================================================================
--- trunk/core/src/resources/dtd/jboss-portlet_2_6.dtd 2007-01-23 18:19:10 UTC (rev 6087)
+++ trunk/core/src/resources/dtd/jboss-portlet_2_6.dtd 2007-01-24 12:09:26 UTC (rev 6088)
@@ -65,7 +65,7 @@
</portlet>
-->
-<!ELEMENT portlet (portlet-name,remotable?,trans-attribute?,header-content?)>
+<!ELEMENT portlet
(portlet-name,remotable?,session-config?,transaction?,header-content?)>
<!--
The portlet name.
@@ -78,6 +78,21 @@
<!ELEMENT remotable (#PCDATA)>
<!--
+todo
+-->
+<!ELEMENT session-config (distributed)>
+
+<!--
+todo
+-->
+<!ELEMENT distributed (#PCDATA)>
+
+<!--
+todo
+-->
+<!ELEMENT transaction (trans-attribute)>
+
+<!--
The trans-attribute value defines the transactionnal behavior. The accepted values are
Required,
Mandatory, Never, Supports, NotSupported and RequiresNew.
-->
@@ -97,7 +112,12 @@
<!--
todo
-->
-<!ATTLIST link href title type media ref CDATA #IMPLIED>
+<!ATTLIST link
+ rel CDATA #IMPLIED
+ href CDATA #IMPLIED
+ title CDATA #IMPLIED
+ type CDATA #IMPLIED
+ media CDATA #IMPLIED>
<!--
todo
@@ -107,7 +127,10 @@
<!--
todo
-->
-<!ATTLIST script src type CDATA #IMPLIED>
+<!ATTLIST script
+ src CDATA #IMPLIED
+ type CDATA #IMPLIED
+ language CDATA #IMPLIED>
<!--
todo
@@ -117,7 +140,9 @@
<!--
todo
-->
-<!ATTLIST meta name content CDATA #REQUIRED>
+<!ATTLIST meta
+ name CDATA #IMPLIED
+ content CDATA #REQUIRED>
<!--
Declare a service that will be injected by the portlet container as an attribute of the
portlet context.
Modified: trunk/core/src/resources/dtd/portlet-instances_2_6.dtd
===================================================================
--- trunk/core/src/resources/dtd/portlet-instances_2_6.dtd 2007-01-23 18:19:10 UTC (rev
6087)
+++ trunk/core/src/resources/dtd/portlet-instances_2_6.dtd 2007-01-24 12:09:26 UTC (rev
6088)
@@ -37,9 +37,13 @@
<!--
The deployment is a container for an instance element.
-->
-<!ELEMENT deployment (instance)>
+<!ELEMENT deployment (if-exists?,instance)>
<!--
+-->
+<!ELEMENT if-exists #PCDATA>
+
+<!--
The instance element is used to create an instance of a portlet from the portlet
application of the same
war file containing the portlet-instances.xml file. The portlet will be created and
configured only
if the portlet is present and an instance with such a name does not already exist.
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml 2007-01-23 18:19:10
UTC (rev 6087)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml 2007-01-24 12:09:26
UTC (rev 6088)
@@ -21,6 +21,10 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!DOCTYPE portlet-app PUBLIC
+ "-//JBoss Portal//DTD JBoss Portlet 2.6//EN"
+ "http://www.jboss.org/portal/dtd/jboss-portlet_2_6.dtd">
+
<portlet-app>
<portlet>
<portlet-name>UserPortlet</portlet-name>
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/portlet-instances.xml
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/portlet-instances.xml 2007-01-23
18:19:10 UTC (rev 6087)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/portlet-instances.xml 2007-01-24
12:09:26 UTC (rev 6088)
@@ -22,6 +22,10 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!DOCTYPE deployments PUBLIC
+ "-//JBoss Portal//DTD Portlet Instances 2.6//EN"
+ "http://www.jboss.org/portal/dtd/portlet-instances_2_6.dtd">
+
<deployments>
<deployment>
<instance>
Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jboss-portlet.xml
===================================================================
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jboss-portlet.xml 2007-01-23
18:19:10 UTC (rev 6087)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jboss-portlet.xml 2007-01-24
12:09:26 UTC (rev 6088)
@@ -21,6 +21,10 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!DOCTYPE portlet-app PUBLIC
+ "-//JBoss Portal//DTD JBoss Portlet 2.6//EN"
+ "http://www.jboss.org/portal/dtd/jboss-portlet_2_6.dtd">
+
<portlet-app>
<portlet>
<portlet-name>CMSAdminPortlet</portlet-name>
Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/portlet-instances.xml
===================================================================
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/portlet-instances.xml 2007-01-23
18:19:10 UTC (rev 6087)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/portlet-instances.xml 2007-01-24
12:09:26 UTC (rev 6088)
@@ -22,6 +22,10 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!DOCTYPE deployments PUBLIC
+ "-//JBoss Portal//DTD Portlet Instances 2.6//EN"
+ "http://www.jboss.org/portal/dtd/portlet-instances_2_6.dtd">
+
<deployments>
<deployment>
<instance>
Modified: trunk/core-samples/src/resources/portal-samples-war/WEB-INF/jboss-portlet.xml
===================================================================
---
trunk/core-samples/src/resources/portal-samples-war/WEB-INF/jboss-portlet.xml 2007-01-23
18:19:10 UTC (rev 6087)
+++
trunk/core-samples/src/resources/portal-samples-war/WEB-INF/jboss-portlet.xml 2007-01-24
12:09:26 UTC (rev 6088)
@@ -21,6 +21,10 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!DOCTYPE portlet-app PUBLIC
+ "-//JBoss Portal//DTD JBoss Portlet 2.6//EN"
+ "http://www.jboss.org/portal/dtd/jboss-portlet_2_6.dtd">
+
<portlet-app>
<remotable>true</remotable>
<portlet>
Modified:
trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml
===================================================================
---
trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml 2007-01-23
18:19:10 UTC (rev 6087)
+++
trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml 2007-01-24
12:09:26 UTC (rev 6088)
@@ -22,6 +22,10 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!DOCTYPE deployments PUBLIC
+ "-//JBoss Portal//DTD Portlet Instances 2.6//EN"
+ "http://www.jboss.org/portal/dtd/portlet-instances_2_6.dtd">
+
<deployments>
<deployment>
<instance>