You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by ms...@apache.org on 2016/04/14 14:28:48 UTC
[08/50] [abbrv] portals-pluto git commit: updated 3.0 XSD to remove
conditional dispatching stuff
updated 3.0 XSD to remove conditional dispatching stuff
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/0e13b58c
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/0e13b58c
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/0e13b58c
Branch: refs/heads/master
Commit: 0e13b58c1567e9d744c05c947d6d6677ff5f6c41
Parents: 7100226
Author: Scott Nicklous <ms...@apache.org>
Authored: Fri Jan 29 14:30:53 2016 +0100
Committer: Scott Nicklous <ms...@apache.org>
Committed: Fri Jan 29 14:30:53 2016 +0100
----------------------------------------------------------------------
.../pluto/container/impl/portlet-app_3_0.xsd | 22 +++-----------------
1 file changed, 3 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/0e13b58c/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_3_0.xsd
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_3_0.xsd b/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_3_0.xsd
index 4cd1a8a..fc0f672 100644
--- a/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_3_0.xsd
+++ b/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_3_0.xsd
@@ -142,8 +142,7 @@
<element name="default-namespace" type="xs:anyURI" minOccurs="0"/>
<element name="event-definition" type="portlet:event-definitionType" minOccurs="0" maxOccurs="unbounded"/>
<element name="public-render-parameter" type="portlet:public-render-parameterType" minOccurs="0" maxOccurs="unbounded"/>
- <element name="listener" type="portlet:listenerType" minOccurs="0" maxOccurs="unbounded"/>
- <element name="conditional-dispatcher" type="portlet:conditionalDispatcherType" minOccurs="0" maxOccurs="1"/>
+ <element name="listener" type="portlet:listenerType" minOccurs="0" maxOccurs="unbounded"/>
<element name="container-runtime-option" type="portlet:container-runtime-optionType" minOccurs="0" maxOccurs="unbounded"/>
</sequence>
<attribute name="version" type="portlet:string" use="required"/>
@@ -306,8 +305,7 @@
<element name="supported-publishing-event" type="portlet:event-definition-referenceType" minOccurs="0" maxOccurs="unbounded"/>
<element name="supported-public-render-parameter" type="portlet:string" minOccurs="0" maxOccurs="unbounded"/>
<element name="container-runtime-option" type="portlet:container-runtime-optionType" minOccurs="0" maxOccurs="unbounded"/>
- <element name="dependency" type="portlet:dependencyType" minOccurs="0" maxOccurs="unbounded"/>
- <element name="conditional-dispatcher" type="portlet:conditionalDispatcherType" minOccurs="0" maxOccurs="1"/>
+ <element name="dependency" type="portlet:dependencyType" minOccurs="0" maxOccurs="unbounded"/>
</sequence>
<attribute name="id" type="portlet:string" use="optional"/>
</complexType>
@@ -427,21 +425,7 @@
<element name="name" type="xs:NCName"/>
</choice>
<attribute name="id" type="portlet:string" use="optional"/>
- </complexType>
- <complexType name="conditionalDispatcherType">
- <annotation>
- <documentation>
- The conditionalDispatcherType is used to declare conditional dispatchers for this portlet or portlet application.
- Used in: portlet, portlet-app
- </documentation>
- </annotation>
- <sequence>
- <element name="description" type="portlet:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
- <element name="display-name" type="portlet:display-nameType" minOccurs="0" maxOccurs="unbounded"/>
- <element name="dispatcher-class" type="portlet:fully-qualified-classType"/>
- </sequence>
- <attribute name="id" type="portlet:string" use="optional"/>
- </complexType>
+ </complexType>
<complexType name="listenerType">
<annotation>
<documentation>