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 2017/01/04 14:53:23 UTC

portals-pluto git commit: Fix for issue PLUTO-653 which was caused by a hard coded portal name and version in the TCK code. Fix for issue PLUTO-640 to change the tomcat role name from 'manager' to 'manager-gui'. Removed extraneous comments from pom file.

Repository: portals-pluto
Updated Branches:
  refs/heads/master b4dad333a -> b11d9d732


Fix for issue PLUTO-653 which was caused by a hard coded portal name and
version in the TCK code. Fix for issue PLUTO-640 to change the tomcat role
name from 'manager' to 'manager-gui'. Removed extraneous comments from pom
file.


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

Branch: refs/heads/master
Commit: b11d9d7323ffc4ffe1d51eb629eac7bbf0f21add
Parents: b4dad33
Author: Scott Nicklous <ms...@apache.org>
Authored: Wed Jan 4 15:50:08 2017 +0100
Committer: Scott Nicklous <ms...@apache.org>
Committed: Wed Jan 4 15:50:08 2017 +0100

----------------------------------------------------------------------
 dist-build.xml                                           |  2 +-
 pom.xml                                                  | 11 -----------
 .../portlets/RequestTests_PortletRequest_ApiAction.java  |  7 ++++---
 .../RequestTests_PortletRequest_ApiEvent_event.java      |  7 ++++---
 .../portlets/RequestTests_PortletRequest_ApiRender.java  |  8 ++++----
 .../RequestTests_PortletRequest_ApiResource.java         |  7 ++++---
 6 files changed, 17 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/b11d9d73/dist-build.xml
----------------------------------------------------------------------
diff --git a/dist-build.xml b/dist-build.xml
index 1390e1c..dce9ca9 100644
--- a/dist-build.xml
+++ b/dist-build.xml
@@ -200,7 +200,7 @@
       <!-- Add 'pluto' and 'tomcat' users to tomcat-users.xml -->
       <replace file="${dist.dir}/conf/tomcat-users.xml"
          token="&lt;/tomcat-users&gt;" 
-         value="&lt;user name=&quot;tomcat&quot; password=&quot;tomcat&quot; roles=&quot;tomcat,pluto,manager&quot; /&gt;${line.separator}&lt;user name=&quot;pluto&quot; password=&quot;pluto&quot; roles=&quot;pluto,manager,tckuser&quot; /&gt;${line.separator}&lt;/tomcat-users&gt;" 
+         value="&lt;user name=&quot;tomcat&quot; password=&quot;tomcat&quot; roles=&quot;tomcat,pluto,manager-gui&quot; /&gt;${line.separator}&lt;user name=&quot;pluto&quot; password=&quot;pluto&quot; roles=&quot;pluto,manager-gui,tckuser&quot; /&gt;${line.separator}&lt;/tomcat-users&gt;" 
          summary="true"
       />
    </target>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/b11d9d73/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7ed19a3..48d5559 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,17 +30,6 @@
   <artifactId>pluto</artifactId>
   <packaging>pom</packaging>
   <name>Apache Pluto</name>
-  <!--
- Any version changes need to be changed in:
- 1. All poms of children modules
- 2. pluto.container.version.minor property in environment.properties in
- pluto-container module (src/main/resources/org/apache/pluto).
- 3. portal-version element in pluto-portal-driver-config.xml in pluto-portal module
- (src/main/webapp/WEB-INF)
- 4. expected.serverInfo and expected.portalInfo properties in expectedResults.properties
- in testsuite module (src/main/webapp/WEB-INF/classes)
- 5. pluto.version in Ant build file dist-build.xml.
-  -->
   <version>3.0-SNAPSHOT</version>
   <!-- Due to a bug in maven 2.0, the description must not contain any line breaks or tabs. -->
   <description>Apache Pluto is the Reference Implementation of the Java Portlet Specification.</description>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/b11d9d73/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiAction.java b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiAction.java
index 492ce01..90c9117 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiAction.java
+++ b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiAction.java
@@ -132,6 +132,7 @@ import java.util.logging.Logger;
 
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
+import javax.portlet.PortalContext;
 import javax.portlet.Portlet;
 import javax.portlet.PortletConfig;
 import javax.portlet.PortletException;
@@ -581,11 +582,11 @@ public class RequestTests_PortletRequest_ApiAction implements Portlet, ResourceS
       /* Details: "Method getPortalContext(): Returns the context of the      */
       /* portal"                                                              */
       TestResult tr36 = tcd.getTestResultFailed(V2REQUESTTESTS_PORTLETREQUEST_APIACTION_GETPORTALCONTEXT);
-      String gpc=portletReq.getPortalContext().getPortalInfo();
-      if(gpc.startsWith("pluto-portal-driver/3.0")) {
+      PortalContext gpc = portletReq.getPortalContext();
+      if(gpc != null) {
     	  tr36.setTcSuccess(true);
       } else {
-    	  tr36.setTcDetail("The PortalContext for the portal is invalid");
+    	  tr36.setTcDetail("The PortalContext for the portal may not be null");
       }
       tr36.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/b11d9d73/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiEvent_event.java b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiEvent_event.java
index 303fb71..d110fcf 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiEvent_event.java
+++ b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiEvent_event.java
@@ -135,6 +135,7 @@ import javax.portlet.ActionResponse;
 import javax.portlet.EventPortlet;
 import javax.portlet.EventRequest;
 import javax.portlet.EventResponse;
+import javax.portlet.PortalContext;
 import javax.portlet.Portlet;
 import javax.portlet.PortletConfig;
 import javax.portlet.PortletException;
@@ -585,11 +586,11 @@ public class RequestTests_PortletRequest_ApiEvent_event implements Portlet, Even
       /* Details: "Method getPortalContext(): Returns the context of the      */
       /* portal"                                                              */
       TestResult tr36 = tcd.getTestResultFailed(V2REQUESTTESTS_PORTLETREQUEST_APIEVENT_GETPORTALCONTEXT);
-      String gpc=portletReq.getPortalContext().getPortalInfo();
-      if(gpc.startsWith("pluto-portal-driver/3.0")) {
+      PortalContext gpc = portletReq.getPortalContext();
+      if(gpc != null) {
     	  tr36.setTcSuccess(true);
       } else {
-    	  tr36.setTcDetail("The PortalContext for the portal is invalid");
+    	  tr36.setTcDetail("The PortalContext for the portal may not be null");
       }
       tr36.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/b11d9d73/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiRender.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiRender.java b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiRender.java
index 8c16ce6..e9711e8 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiRender.java
+++ b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiRender.java
@@ -120,7 +120,6 @@ import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
 
 import java.io.IOException;
 import java.io.PrintWriter;
-
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
@@ -130,6 +129,7 @@ import java.util.logging.Logger;
 
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
+import javax.portlet.PortalContext;
 import javax.portlet.Portlet;
 import javax.portlet.PortletConfig;
 import javax.portlet.PortletException;
@@ -598,11 +598,11 @@ public class RequestTests_PortletRequest_ApiRender implements Portlet, ResourceS
       /* Details: "Method getPortalContext(): Returns the context of the      */
       /* portal"                                                              */
       TestResult tr36 = tcd.getTestResultFailed(V2REQUESTTESTS_PORTLETREQUEST_APIRENDER_GETPORTALCONTEXT);
-      String gpc=portletReq.getPortalContext().getPortalInfo();
-      if(gpc.startsWith("pluto-portal-driver/3.0")) {
+      PortalContext gpc = portletReq.getPortalContext();
+      if(gpc != null) {
     	  tr36.setTcSuccess(true);
       } else {
-    	  tr36.setTcDetail("The PortalContext for the portal is invalid");
+    	  tr36.setTcDetail("The PortalContext for the portal may not be null");
       }
       tr36.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/b11d9d73/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiResource.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiResource.java b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiResource.java
index 5da0fdf..7b8df60 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiResource.java
+++ b/portlet-tck_3.0/V2RequestTests/src/main/java/javax/portlet/tck/portlets/RequestTests_PortletRequest_ApiResource.java
@@ -130,6 +130,7 @@ import java.util.logging.Logger;
 
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
+import javax.portlet.PortalContext;
 import javax.portlet.Portlet;
 import javax.portlet.PortletConfig;
 import javax.portlet.PortletException;
@@ -587,11 +588,11 @@ public class RequestTests_PortletRequest_ApiResource implements Portlet, Resourc
       /* Details: "Method getPortalContext(): Returns the context of the      */
       /* portal"                                                              */
       TestResult tr36 = tcd.getTestResultFailed(V2REQUESTTESTS_PORTLETREQUEST_APIRESOURCE_GETPORTALCONTEXT);
-      String gpc=portletReq.getPortalContext().getPortalInfo();
-      if(gpc.startsWith("pluto-portal-driver/3.0")) {
+      PortalContext gpc = portletReq.getPortalContext();
+      if(gpc != null) {
     	  tr36.setTcSuccess(true);
       } else {
-    	  tr36.setTcDetail("The PortalContext for the portal is invalid");
+    	  tr36.setTcDetail("The PortalContext for the portal may not be null");
       }
       tr36.writeTo(writer);