portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asfgr...@apache.org
Subject portals-pluto git commit: PLUTO-656 various portlet.xml files are not valid
Date Thu, 06 Apr 2017 18:45:10 GMT
Repository: portals-pluto
Updated Branches:
  refs/heads/master 5bd6d5814 -> d4690aaf7


PLUTO-656 various portlet.xml files are not valid


Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/d4690aaf
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/d4690aaf
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/d4690aaf

Branch: refs/heads/master
Commit: d4690aaf77609313b7cc3db37e02f59fdfa8a0b5
Parents: 5bd6d581
Author: vsingleton <vsingleton@gmail.com>
Authored: Tue Apr 4 21:04:53 2017 -0400
Committer: Neil Griffin <neil.griffin.scm@gmail.com>
Committed: Thu Apr 6 14:42:13 2017 -0400

----------------------------------------------------------------------
 .../src/main/webapp/WEB-INF/portlet.xml         | 100 +++++++++----------
 .../src/main/webapp/WEB-INF/portlet.xml         |  91 ++++++++---------
 2 files changed, 96 insertions(+), 95 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/d4690aaf/portlet-tck_3.0/V2AddlFilterTests/src/main/webapp/WEB-INF/portlet.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlFilterTests/src/main/webapp/WEB-INF/portlet.xml b/portlet-tck_3.0/V2AddlFilterTests/src/main/webapp/WEB-INF/portlet.xml
index bc38494..0f2caa2 100644
--- a/portlet-tck_3.0/V2AddlFilterTests/src/main/webapp/WEB-INF/portlet.xml
+++ b/portlet-tck_3.0/V2AddlFilterTests/src/main/webapp/WEB-INF/portlet.xml
@@ -87,56 +87,6 @@
 		</portlet-info>
 	</portlet>
 
-	<event-definition>
-		<qname>tck:AddlPortletTests_SPEC2_5_EventHandling</qname>
-		<value-type>java.lang.String</value-type>
-	</event-definition>
-
-	<event-definition>
-		<qname>tck:AddlPortletTests_SPEC2_15_Event</qname>
-		<value-type>java.lang.String</value-type>
-	</event-definition>
-
-	<event-definition>
-		<qname>tck:AddlPortletTests_SPEC2_15_EventEventHandling</qname>
-		<value-type>java.lang.String</value-type>
-	</event-definition>
-
-	<event-definition>
-		<qname>tck:AddlEnvironmentTests_SPEC2_17_EventPreferences</qname>
-		<value-type>java.lang.String</value-type>
-	</event-definition>
-
-	<event-definition>
-		<qname>tck:AddlRequestTests_SPEC2_11_Event</qname>
-		<value-type>java.lang.String</value-type>
-	</event-definition>
-
-	<event-definition>
-		<qname>tck:AddlRequestTests_SPEC2_11_EventAttr</qname>
-		<value-type>java.lang.String</value-type>
-	</event-definition>
-
-	<event-definition>
-		<qname>tck:AddlRequestTests_SPEC2_11_EventReq</qname>
-		<value-type>java.lang.String</value-type>
-	</event-definition>
-
-	<event-definition>
-		<qname>tck:AddlResponseTests_SPEC2_12_Event</qname>
-		<value-type>java.lang.String</value-type>
-	</event-definition>
-
-	<event-definition>
-		<qname>tck:AddlFilterTests_SPEC2_20_Event</qname>
-		<value-type>java.lang.String</value-type>
-	</event-definition>
-
-	<public-render-parameter>
-		<identifier>tr11_event</identifier>
-		<qname>tck:tr11_event</qname>
-	</public-render-parameter>
-
 	<filter>
 		<filter-name>AddlFilterTests_SPEC2_20_Filter1</filter-name>
 		<filter-class>javax.portlet.tck.portlets.AddlFilterTests_SPEC2_20_Filter</filter-class>
@@ -210,4 +160,54 @@
 		<portlet-name>AddlFilterTests_SPEC2_20_Ev*</portlet-name>
 	</filter-mapping>
 
+	<event-definition>
+		<qname>tck:AddlPortletTests_SPEC2_5_EventHandling</qname>
+		<value-type>java.lang.String</value-type>
+	</event-definition>
+
+	<event-definition>
+		<qname>tck:AddlPortletTests_SPEC2_15_Event</qname>
+		<value-type>java.lang.String</value-type>
+	</event-definition>
+
+	<event-definition>
+		<qname>tck:AddlPortletTests_SPEC2_15_EventEventHandling</qname>
+		<value-type>java.lang.String</value-type>
+	</event-definition>
+
+	<event-definition>
+		<qname>tck:AddlEnvironmentTests_SPEC2_17_EventPreferences</qname>
+		<value-type>java.lang.String</value-type>
+	</event-definition>
+
+	<event-definition>
+		<qname>tck:AddlRequestTests_SPEC2_11_Event</qname>
+		<value-type>java.lang.String</value-type>
+	</event-definition>
+
+	<event-definition>
+		<qname>tck:AddlRequestTests_SPEC2_11_EventAttr</qname>
+		<value-type>java.lang.String</value-type>
+	</event-definition>
+
+	<event-definition>
+		<qname>tck:AddlRequestTests_SPEC2_11_EventReq</qname>
+		<value-type>java.lang.String</value-type>
+	</event-definition>
+
+	<event-definition>
+		<qname>tck:AddlResponseTests_SPEC2_12_Event</qname>
+		<value-type>java.lang.String</value-type>
+	</event-definition>
+
+	<event-definition>
+		<qname>tck:AddlFilterTests_SPEC2_20_Event</qname>
+		<value-type>java.lang.String</value-type>
+	</event-definition>
+
+	<public-render-parameter>
+		<identifier>tr11_event</identifier>
+		<qname>tck:tr11_event</qname>
+	</public-render-parameter>
+
 </portlet-app>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/d4690aaf/portlet-tck_3.0/V2AddlPortletTests/src/main/webapp/WEB-INF/portlet.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/webapp/WEB-INF/portlet.xml b/portlet-tck_3.0/V2AddlPortletTests/src/main/webapp/WEB-INF/portlet.xml
index 338ed90..6a9c344 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/webapp/WEB-INF/portlet.xml
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/webapp/WEB-INF/portlet.xml
@@ -67,12 +67,12 @@
 		<portlet-info>
 			<title>AddlPortletTests_SPEC2_5_ActionHandling_event</title>
 		</portlet-info>
-		<supported-publishing-event>
-			<qname>tck:AddlPortletTests_SPEC2_5_ActionHandling</qname>
-		</supported-publishing-event>
 		<supported-processing-event>
 			<qname>tck:AddlPortletTests_SPEC2_5_ActionHandling</qname>
 		</supported-processing-event>
+		<supported-publishing-event>
+			<qname>tck:AddlPortletTests_SPEC2_5_ActionHandling</qname>
+		</supported-publishing-event>
 	</portlet>
 
 	<portlet>
@@ -137,15 +137,15 @@
 		<portlet-info>
 			<title>AddlPortletTests_SPEC2_5_RenderGenericPortlet</title>
 		</portlet-info>
+		<supported-processing-event>
+			<name>AddlPortletTests_SPEC2_5_RenderGenericPortlet_localPart</name>
+		</supported-processing-event>
 		<supported-publishing-event>
 			<qname>tck:AddlPortletTests_SPEC2_5_RenderGenericPortlet</qname>
 		</supported-publishing-event>
 		<supported-publishing-event>
 			<name>AddlPortletTests_SPEC2_5_RenderGenericPortlet_localPart</name>
 		</supported-publishing-event>
-		<supported-processing-event>
-			<name>AddlPortletTests_SPEC2_5_RenderGenericPortlet_localPart</name>
-		</supported-processing-event>
 	</portlet>
 
 	<portlet>
@@ -176,16 +176,16 @@
 		<portlet-info>
 			<title>AddlPortletTests_SPEC2_6_RenderConfig</title>
 		</portlet-info>
+		<supported-processing-event>
+			<name>AddlPortletTests_SPEC2_15_EventEventHandling_empty</name>
+		</supported-processing-event>
+		<supported-publishing-event>
+			<name>AddlPortletTests_SPEC2_15_EventEventHandling_empty</name>
+		</supported-publishing-event>
 		<container-runtime-option>
 			<name>javax.portlet.escapeXml</name>
 			<value>true</value>
 		</container-runtime-option>
-		<supported-publishing-event>
-			<name>AddlPortletTests_SPEC2_15_EventEventHandling_empty</name>
-		</supported-publishing-event>
-		<supported-processing-event>
-			<name>AddlPortletTests_SPEC2_15_EventEventHandling_empty</name>
-		</supported-processing-event>
 	</portlet>
 
 	<portlet>
@@ -321,6 +321,12 @@
 		<portlet-info>
 			<title>AddlPortletTests_SPEC2_15_EventEventHandling</title>
 		</portlet-info>
+		<supported-processing-event>
+			<qname>tck:AddlPortletTests_SPEC2_15_EventEventHandling</qname>
+		</supported-processing-event>
+		<supported-processing-event>
+			<qname>tck:AddlPortletTests_SPEC2_15_EventEventHandling_eventEvent</qname>
+		</supported-processing-event>
 		<supported-publishing-event>
 			<qname>tck:AddlPortletTests_SPEC2_15_EventEventHandling</qname>
 		</supported-publishing-event>
@@ -336,12 +342,6 @@
 		<supported-publishing-event>
 			<qname>tck:AddlPortletTests_SPEC2_15_EventEventHandling_unavailableExceptionEvent</qname>
 		</supported-publishing-event>
-		<supported-processing-event>
-			<qname>tck:AddlPortletTests_SPEC2_15_EventEventHandling</qname>
-		</supported-processing-event>
-		<supported-processing-event>
-			<qname>tck:AddlPortletTests_SPEC2_15_EventEventHandling_eventEvent</qname>
-		</supported-processing-event>
 
 	</portlet>
 
@@ -356,9 +356,6 @@
 		<portlet-info>
 			<title>AddlPortletTests_SPEC2_15_EventEventHandling_event</title>
 		</portlet-info>
-		<supported-publishing-event>
-			<qname>tck:AddlPortletTests_SPEC2_15_EventEventHandling_eventEvent</qname>
-		</supported-publishing-event>
 		<supported-processing-event>
 			<qname>tck:AddlPortletTests_SPEC2_15_EventEventHandling</qname>
 		</supported-processing-event>
@@ -371,6 +368,9 @@
 		<supported-processing-event>
 			<qname>tck:AddlPortletTests_SPEC2_15_EventEventHandling_exceptionEvent</qname>
 		</supported-processing-event>
+		<supported-publishing-event>
+			<qname>tck:AddlPortletTests_SPEC2_15_EventEventHandling_eventEvent</qname>
+		</supported-publishing-event>
 	</portlet>
 
 	<portlet>
@@ -389,6 +389,31 @@
 		</supported-processing-event>
 	</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>true</portal-managed>
+	</custom-portlet-mode> 
+	<custom-portlet-mode>
+		<description>For testing custom portlet mode</description>
+		<portlet-mode>custom3</portlet-mode>
+		<portal-managed>false</portal-managed>
+	</custom-portlet-mode>
+	
+	<custom-window-state>
+		<description>For testing custom window state</description>
+		<window-state>custom_window</window-state>
+	</custom-window-state>
+	<custom-window-state>
+		<description>For testing custom window state</description>
+		<window-state>custom_window2</window-state>
+	</custom-window-state>
+
 	<event-definition>
 		<qname>tck:AddlPortletTests_SPEC2_5_EventHandling_exception4</qname>
 		<value-type>java.lang.String</value-type>
@@ -462,28 +487,4 @@
 		<value>false</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>true</portal-managed>
-	</custom-portlet-mode> 
-	<custom-portlet-mode>
-		<description>For testing custom portlet mode</description>
-		<portlet-mode>custom3</portlet-mode>
-		<portal-managed>false</portal-managed>
-	</custom-portlet-mode>
-	
-	<custom-window-state>
-		<description>For testing custom window state</description>
-		<window-state>custom_window</window-state>
-	</custom-window-state>
-	<custom-window-state>
-		<description>For testing custom window state</description>
-		<window-state>custom_window2</window-state>
-	</custom-window-state>
 </portlet-app>


Mime
View raw message