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/22 10:58:22 UTC

[03/30] portals-pluto git commit: first Commit

first Commit


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

Branch: refs/heads/master
Commit: 0bc8464242e8106e729870aad2a2be6debd7edf1
Parents: 4647893
Author: Jayendran Anil Kumar <ak...@de.ibm.com>
Authored: Tue Jan 19 14:21:59 2016 +0100
Committer: Jayendran Anil Kumar <ak...@de.ibm.com>
Committed: Tue Jan 19 14:21:59 2016 +0100

----------------------------------------------------------------------
 .../portlet/tck/portlets/PortletTests_Event_ApiEvent_event.java  | 3 +++
 .../tck/portlets/PortletTests_PortletConfig_ApiRender.java       | 4 ++--
 .../V2PortletTests/src/main/webapp/WEB-INF/portlet.xml           | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/0bc84642/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Event_ApiEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Event_ApiEvent_event.java b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Event_ApiEvent_event.java
index 854453e..0fb93fe 100644
--- a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Event_ApiEvent_event.java
+++ b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Event_ApiEvent_event.java
@@ -146,6 +146,9 @@ public class PortletTests_Event_ApiEvent_event implements Portlet, EventPortlet,
       try
       {
       Object val=evt.getValue();
+      if(val==null) {
+    	  tr4.appendTcDetail("EventPayload is null");
+      } 
       if ((val instanceof String)) {
     	  String txt = (String) val;
     	  if (txt.equals("Hi!")) {

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/0bc84642/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_PortletConfig_ApiRender.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_PortletConfig_ApiRender.java b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_PortletConfig_ApiRender.java
index 85f4879..ba4184f 100644
--- a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_PortletConfig_ApiRender.java
+++ b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_PortletConfig_ApiRender.java
@@ -137,10 +137,10 @@ private static final Locale Locale = null;
       /* Details: "Method getResourceBundle(Locale): Returns the              */
       /* ResourceBundle for the specified locale"                             */
       TestResult tr2 = tcd.getTestResultSucceeded(V2PORTLETTESTS_PORTLETCONFIG_APIRENDER_GETRESOURCEBUNDLE);
-      Locale loc=new Locale("en_US");
+      Locale loc=java.util.Locale.getDefault();
       ResourceBundle rb=portletConfig.getResourceBundle(loc);
       StringBuilder txt2=new StringBuilder(128);
-      txt2.append("value is").append(rb);
+      txt2.append("The value is").append(rb);
       tr2.appendTcDetail(txt2.toString());
       tr2.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/0bc84642/portlet-tck_3.0/V2PortletTests/src/main/webapp/WEB-INF/portlet.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTests/src/main/webapp/WEB-INF/portlet.xml b/portlet-tck_3.0/V2PortletTests/src/main/webapp/WEB-INF/portlet.xml
index 2f8d0c9..2a4c37e 100644
--- a/portlet-tck_3.0/V2PortletTests/src/main/webapp/WEB-INF/portlet.xml
+++ b/portlet-tck_3.0/V2PortletTests/src/main/webapp/WEB-INF/portlet.xml
@@ -44,7 +44,9 @@
          <mime-type>text/html</mime-type>
       </supports>
       <supported-locale>en_US</supported-locale>
-      <resource-bundle>Test1</resource-bundle>
+      
+     <resource-bundle>org.apache.pluto.container.om.portlet.TestBundle</resource-bundle>
+     
       <portlet-info>
          <title>PortletTests_PortletConfig_ApiRender</title>
       </portlet-info>