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 as...@apache.org on 2018/08/04 19:52:48 UTC
portals-pluto git commit: PLUTO-724
V3AnnotationPortletAppConfigOverrideTests portlet.xml descriptor does not
validate against the portlet-app_3_0.xsd schema
Repository: portals-pluto
Updated Branches:
refs/heads/master 2a789eec5 -> 3bb7ae301
PLUTO-724 V3AnnotationPortletAppConfigOverrideTests portlet.xml descriptor does not validate against the portlet-app_3_0.xsd schema
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/3bb7ae30
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/3bb7ae30
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/3bb7ae30
Branch: refs/heads/master
Commit: 3bb7ae301cc4fd400951e5cbfff35c3fc997a734
Parents: 2a789ee
Author: Neil Griffin <ne...@gmail.com>
Authored: Sat Aug 4 15:52:18 2018 -0400
Committer: Neil Griffin <ne...@gmail.com>
Committed: Sat Aug 4 15:52:18 2018 -0400
----------------------------------------------------------------------
.../src/main/webapp/WEB-INF/portlet.xml | 50 ++++++++++----------
1 file changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/3bb7ae30/portlet-tck_3.0/V3AnnotationPortletAppConfigOverrideTests/src/main/webapp/WEB-INF/portlet.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3AnnotationPortletAppConfigOverrideTests/src/main/webapp/WEB-INF/portlet.xml b/portlet-tck_3.0/V3AnnotationPortletAppConfigOverrideTests/src/main/webapp/WEB-INF/portlet.xml
index 33be809..6c1f74f 100644
--- a/portlet-tck_3.0/V3AnnotationPortletAppConfigOverrideTests/src/main/webapp/WEB-INF/portlet.xml
+++ b/portlet-tck_3.0/V3AnnotationPortletAppConfigOverrideTests/src/main/webapp/WEB-INF/portlet.xml
@@ -53,7 +53,29 @@
</portlet-info>
<supported-public-render-parameter>tr2_public</supported-public-render-parameter>
</portlet>
-
+
+ <custom-portlet-mode>
+ <description>For testing custom portlet mode</description>
+ <portlet-mode>custom1</portlet-mode>
+ <portal-managed>false</portal-managed>
+ </custom-portlet-mode>
+ <custom-portlet-mode>
+ <description>For testing custom portlet mode</description>
+ <portlet-mode>custom2</portlet-mode>
+ <portal-managed>false</portal-managed>
+ </custom-portlet-mode>
+
+ <custom-window-state>
+ <description>For testing custom window state</description>
+ <window-state>custom1</window-state>
+ </custom-window-state>
+ <custom-window-state>
+ <description>For testing custom window state</description>
+ <window-state>custom2</window-state>
+ </custom-window-state>
+
+ <default-namespace>http://www.apache.org/portals/pluto/portlet-tck_3.0/overridden</default-namespace>
+
<event-definition>
<qname>tck:AnnotationPortletAppConfigOverrideTests_SPEC1_28_EventConfiguration1</qname>
<value-type>java.lang.String</value-type>
@@ -73,32 +95,10 @@
<identifier>tr2_public</identifier>
<qname>tck:tr2_public</qname>
</public-render-parameter>
-
- <default-namespace>http://www.apache.org/portals/pluto/portlet-tck_3.0/overridden</default-namespace>
-
+
<container-runtime-option>
<name>javax.portlet.escapeXml</name>
<value>true</value>
</container-runtime-option>
-
- <custom-portlet-mode>
- <description>For testing custom portlet mode</description>
- <portlet-mode>custom1</portlet-mode>
- <portal-managed>false</portal-managed>
- </custom-portlet-mode>
- <custom-portlet-mode>
- <description>For testing custom portlet mode</description>
- <portlet-mode>custom2</portlet-mode>
- <portal-managed>false</portal-managed>
- </custom-portlet-mode>
-
- <custom-window-state>
- <description>For testing custom window state</description>
- <window-state>custom1</window-state>
- </custom-window-state>
- <custom-window-state>
- <description>For testing custom window state</description>
- <window-state>custom2</window-state>
- </custom-window-state>
-
+
</portlet-app>
\ No newline at end of file