[portal-commits] JBoss Portal SVN: r12985 - in branches/JBoss_Portal_AS5_Deployer/core-samples: src/main/org/jboss/portal/core/samples/basic and 11 other directories.

Friday, 6 March 2009

Author: mwringe
Date: 2009-03-06 18:22:39 -0500 (Fri, 06 Mar 2009)
New Revision: 12985

Added:
  
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_pt_BR.properties
  
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_pt_BR.properties
  
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_pt_BR.properties
  
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource_pt_BR.properties
Modified:
   branches/JBoss_Portal_AS5_Deployer/core-samples/build.xml
  
branches/JBoss_Portal_AS5_Deployer/core-samples/src/main/org/jboss/portal/core/samples/basic/HeaderContentPortlet.java
  
branches/JBoss_Portal_AS5_Deployer/core-samples/src/main/org/jboss/portal/core/samples/basic/PageParameterPortlet.java
  
branches/JBoss_Portal_AS5_Deployer/core-samples/src/main/org/jboss/portal/core/samples/basic/PortletSessionPortlet.java
  
branches/JBoss_Portal_AS5_Deployer/core-samples/src/main/org/jboss/portal/core/samples/basic/RepeatRefreshPortlet.java
  
branches/JBoss_Portal_AS5_Deployer/core-samples/src/main/org/jboss/portal/core/samples/jsp/JSPPortlet.java
  
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml
  
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jsp/ajax/repeatrefresh.jsp
  
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml
  
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/catalog/index.jsp
  
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/catalog/sitemap.jsp
  
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view.jsp
  
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view_fr.jsp
  
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet.xml
  
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_it.properties
  
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_it.properties
  
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/help.jsp
  
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/noUser.jsp
  
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp
  
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource.properties
Log:
Merge JBoss_Portal_Branch_2_7 changes (rev range 12254:12964) into
JBoss_Portal_AS5_Deployer branch

Modified: branches/JBoss_Portal_AS5_Deployer/core-samples/build.xml
===================================================================

--- branches/JBoss_Portal_AS5_Deployer/core-samples/build.xml	2009-03-06 23:22:30 UTC (rev
12984)
+++ branches/JBoss_Portal_AS5_Deployer/core-samples/build.xml	2009-03-06 23:22:39 UTC (rev
12985)
@@ -102,10 +102,10 @@
          <path refid="apache.fileupload.classpath"/>
          <path refid="jakarta.io.classpath"/>
          <path refid="oswego.concurrent.classpath"/>
-         <path refid="sun.javamail.classpath"/>
+         <path refid="glassfish.javamail.classpath"/>
          <path refid="jwebunit.jwebunit.classpath"/>
          <path refid="dbunit.dbunit.classpath"/>
-         <path refid="sun.jaf.classpath"/>
+         <path refid="glassfish.jaf.classpath"/>
          <path refid="portals.bridges.classpath"/>
          <path refid="beanshell.beanshell.classpath"/>
          <path refid="facelets.facelets.classpath"/>

Modified:
branches/JBoss_Portal_AS5_Deployer/core-samples/src/main/org/jboss/portal/core/samples/basic/HeaderContentPortlet.java
===================================================================
---
branches/JBoss_Portal_AS5_Deployer/core-samples/src/main/org/jboss/portal/core/samples/basic/HeaderContentPortlet.java	2009-03-06
23:22:30 UTC (rev 12984)
+++
branches/JBoss_Portal_AS5_Deployer/core-samples/src/main/org/jboss/portal/core/samples/basic/HeaderContentPortlet.java	2009-03-06
23:22:39 UTC (rev 12985)
@@ -24,9 +24,16 @@
 
 import javax.portlet.GenericPortlet;
 import javax.portlet.PortletException;
+import javax.portlet.PortletURL;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import javax.portlet.ResourceURL;
+import javax.portlet.WindowState;
+
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.io.Writer;
 
 /*
@@ -45,9 +52,35 @@
 
       res.setContentType("text/html");
       Writer writer = res.getWriter();
+      ResourceURL url = res.createResourceURL();
+      writer.write("<div><a href=\"" + url.toString() +
"\">Resource URL</a></div>");
       writer.write("<div id='Introducing-HeaderContent'/>");
       writer.write("<div class=\"portlet-section-body\"><p
id='rewrite-js'><button id=\"Introducing-HeaderContentInput\"
class=\"portlet-form-button\" type='button'
onClick='injectJS()'>Call injected
javascript</button></p></div>");
+      
+      
       writer.flush();
       writer.close();
    }
+   
+   @Override
+   public void serveResource(ResourceRequest resourceRequest, ResourceResponse
resourceResponse) throws PortletException, IOException
+   {
+	  resourceResponse.setProperty("Expires", "0");
+	  resourceResponse.setProperty("Content-Disposition", "attachment;
filename=vcard.vcf ");
+	  resourceResponse.setContentType("text/x-vcard");
+      PrintWriter writer = resourceResponse.getWriter();
+
+      writer.print("BEGIN:VCARD\n");
+      writer.print("VERSION:3.0\n");
+      writer.print("FN:Thomas Heute\n");
+      writer.print("N:Heute;Thomas;;;\n");
+      writer.print("EMAIL;TYPE=INTERNET;TYPE=WORK:theute@redhat.com\n");
+      writer.print("TITLE:JBoss Portal Project Lead\n");
+      writer.print("ORG:Red Hat\n");
+      writer.print("END:VCARD\n");
+
+      writer.flush();
+      writer.close();
+   }
+
 }

Modified:
branches/JBoss_Portal_AS5_Deployer/core-samples/src/main/org/jboss/portal/core/samples/basic/PageParameterPortlet.java
===================================================================
---
branches/JBoss_Portal_AS5_Deployer/core-samples/src/main/org/jboss/portal/core/samples/basic/PageParameterPortlet.java	2009-03-06
23:22:30 UTC (rev 12984)
+++
branches/JBoss_Portal_AS5_Deployer/core-samples/src/main/org/jboss/portal/core/samples/basic/PageParameterPortlet.java	2009-03-06
23:22:39 UTC (rev 12985)
@@ -1,6 +1,6 @@
 /******************************************************************************
  * JBoss, a division of Red Hat                                               *
- * Copyright 2008, Red Hat Middleware, LLC, and individual                    *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual                    *
  * contributors as indicated by the @authors tag. See the                     *
  * copyright.txt in the distribution for a full listing of                    *
  * individual contributors.                                                   *
@@ -24,11 +24,11 @@
 
 import org.jboss.portal.api.node.PortalNode;
 import org.jboss.portal.api.node.PortalNodeURL;
+import org.jboss.portlet.JBossActionRequest;
+import org.jboss.portlet.JBossActionResponse;
+import org.jboss.portlet.JBossPortlet;
 import org.jboss.portlet.JBossRenderRequest;
-import org.jboss.portlet.JBossPortlet;
 import org.jboss.portlet.JBossRenderResponse;
-import org.jboss.portlet.JBossActionRequest;
-import org.jboss.portlet.JBossActionResponse;
 
 import javax.portlet.PortletException;
 import javax.portlet.PortletSecurityException;
@@ -64,7 +64,7 @@
       PrintWriter writer = resp.getWriter();
 
       //
-      for (Enumeration<String> e =
getPortletConfig().getPublicRenderParameterNames();e.hasMoreElements();)
+      for (Enumeration<String> e =
getPortletConfig().getPublicRenderParameterNames(); e.hasMoreElements();)
       {
          String parameterName = e.nextElement();
 
@@ -74,9 +74,9 @@
 
       //
       writer.println("<div class=\"portlet-font\">Page parameters
can be bound to coordination aliases. Out of the box, the request parameters" +
-      		" are themselves bound to page parameters. Setting a value below, will
modify the URL by adding a request parameter.<br/>" +
-      		"This can be particulary intersting to use URL request parameters to set
values usable by a portlet.</div>");
-      
+         " are themselves bound to page parameters. Setting a value below, will
modify the URL by adding a request parameter.<br/>" +
+         "This can be particulary interesting to pass values that can then be used
by portlets.</div>");
+
       //
       writer.println("<form action=\"" + resp.createActionURL() +
"\" method=\"POST\"><table>");
       writer.println("<tr><td>Page parameter
name:</td><td><input type=\"text\" name=\"name\"
width=\"36\" value=\"\"/></td></tr>");

Modified:
branches/JBoss_Portal_AS5_Deployer/core-samples/src/main/org/jboss/portal/core/samples/basic/PortletSessionPortlet.java
===================================================================
---
branches/JBoss_Portal_AS5_Deployer/core-samples/src/main/org/jboss/portal/core/samples/basic/PortletSessionPortlet.java	2009-03-06
23:22:30 UTC (rev 12984)
+++
branches/JBoss_Portal_AS5_Deployer/core-samples/src/main/org/jboss/portal/core/samples/basic/PortletSessionPortlet.java	2009-03-06
23:22:39 UTC (rev 12985)
@@ -1,6 +1,6 @@
 /******************************************************************************
  * JBoss, a division of Red Hat                                               *
- * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual                    *
  * contributors as indicated by the @authors tag. See the                     *
  * copyright.txt in the distribution for a full listing of                    *
  * individual contributors.                                                   *
@@ -85,11 +85,19 @@
       }
 
       //
-      writer.println("<form action=\"" + purl.toString() +
"\" method=\"post\">");
+//      writer.println("<script type='text/javascript'>\n" +
+//         "function processForm(value) {" +
+//         "var form = document.getElementById('sessionForm');\n" +
+//         "var hidden = document.getElementById('sessionHidden');\n"
+
+//         "hidden.value = value;\n" +
+//         "form.submit();}\n" +
+//         "</script>");
+      writer.println("<form id='sessionForm' action=\"" +
purl.toString() + "\" method=\"post\">");
       writer.println("<input type=\"text\"
name=\"name\"/>");
       writer.println("<input type=\"text\"
name=\"value\"/>");
-      writer.println("<input type=\"submit\" name=\"portlet\"
value=\"Add to portlet scope\"/>");
-      writer.println("<input type=\"submit\"
name=\"application\" value=\"Add to application scope\"/>");
+      writer.println("<input type=\"submit\" name=\"portlet\"
value=\"Add to portlet scope\" />");
+      writer.println("<input type=\"submit\"
name=\"application\" value=\"Add to application scope\" />");
+     // writer.println("<input id='sessionHidden' name='scope'
type='hidden'/>");
       writer.println("</form><br/>");
 
       //

Modified:
branches/JBoss_Portal_AS5_Deployer/core-samples/src/main/org/jboss/portal/core/samples/basic/RepeatRefreshPortlet.java
===================================================================
---
branches/JBoss_Portal_AS5_Deployer/core-samples/src/main/org/jboss/portal/core/samples/basic/RepeatRefreshPortlet.java	2009-03-06
23:22:30 UTC (rev 12984)
+++
branches/JBoss_Portal_AS5_Deployer/core-samples/src/main/org/jboss/portal/core/samples/basic/RepeatRefreshPortlet.java	2009-03-06
23:22:39 UTC (rev 12985)
@@ -1,6 +1,6 @@
 /******************************************************************************
  * JBoss, a division of Red Hat                                               *
- * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual                    *
  * contributors as indicated by the @authors tag. See the                     *
  * copyright.txt in the distribution for a full listing of                    *
  * individual contributors.                                                   *
@@ -22,22 +22,16 @@
  ******************************************************************************/
 package org.jboss.portal.core.samples.basic;
 
-import java.io.IOException;
-import java.io.PrintWriter;
 import javax.portlet.GenericPortlet;
+import javax.portlet.PortletContext;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.portlet.PortletException;
 import javax.portlet.ResourceRequest;
 import javax.portlet.ResourceResponse;
-import javax.portlet.ResourceURL;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletSecurityException;
-import javax.portlet.PortletURL;
-import javax.portlet.PortletMode;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.PortletContext;
+import java.io.IOException;
+import java.io.PrintWriter;
 
 /**
  * @author <a href="mailto:whales@redhat.com">Wesley Hales</a>
@@ -47,58 +41,50 @@
 {
    private static final String JSP_PATH = "/WEB-INF/jsp/ajax";
 
-   public void processAction(ActionRequest req, ActionResponse resp) throws
PortletException, PortletSecurityException, IOException
-   {
-
-      //String repeatText = req.getParameter("repeat");
-      // set the text from form input
-      //if (repeatText != null){
-         //resp.setRenderParameter("repeat", repeatText);
-      //}
-      // request view
-      //resp.setPortletMode(PortletMode.VIEW);
-
-   }
    public void render(RenderRequest renderRequest, RenderResponse renderResponse) throws
PortletException, IOException
    {
       PortletContext context = getPortletContext();
       PortletRequestDispatcher rd = context.getRequestDispatcher(JSP_PATH +
"/repeatrefresh.jsp");
       rd.include(renderRequest, renderResponse);
    }
+
    public void serveResource(ResourceRequest req, ResourceResponse resp) throws
PortletException, IOException
    {
       String repeatText = req.getParameter("repeat");
       String prodId = req.getParameter("prodId");
 
-      String namespace =resp.getNamespace();
-      
       resp.setContentType("text/html");
       PrintWriter writer = resp.getWriter();
-      if (repeatText != null){
-         writer.print("<div id=\"repeat-text\">"+
req.getPrivateParameterMap().get("repeat")[0] +"</div>");
+      if (repeatText != null)
+      {
+         writer.print("<div id=\"repeat-text\">" +
req.getPrivateParameterMap().get("repeat")[0] + "</div>");
       }
-      if (prodId != null){
-         if (prodId.equals("1")){
-            writer.print("<div id=\"product-text\">Product ID:
"+ prodId +"" +
-            "<br/>" +
-            " B BY BURTON ALPHA<br/>" +
-            "Sale Price: $314.96 " +
-            "</div>");
+      if (prodId != null)
+      {
+         if (prodId.equals("1"))
+         {
+            writer.print("<div id=\"product-text\">Product ID:
" + prodId + "" +
+               "<br/>" +
+               " B BY BURTON ALPHA<br/>" +
+               "Sale Price: $314.96 " +
+               "</div>");
          }
-         if (prodId.equals("2")){
-            writer.print("<div id=\"product-text\">Product ID:
"+ prodId +"" +
-            "<br/>" +
+         if (prodId.equals("2"))
+         {
+            writer.print("<div id=\"product-text\">Product ID:
" + prodId + "" +
+               "<br/>" +
                "FORUM DESTROYER LTD<br/>" +
                "$319.99 " +
-            "</div>");
+               "</div>");
          }
-         if (prodId.equals("3")){
-            writer.print("<div id=\"product-text\">Product ID:
"+ prodId +"" +
-            "<br/>" +
-            "\n" +
+         if (prodId.equals("3"))
+         {
+            writer.print("<div id=\"product-text\">Product ID:
" + prodId + "" +
+               "<br/>" +
+               "\n" +
                "SANTA CRUZ ALLSTAR<br/>" +
                "$256.00 " +
-            "</div>");
+               "</div>");
          }
 
       }

Modified:
branches/JBoss_Portal_AS5_Deployer/core-samples/src/main/org/jboss/portal/core/samples/jsp/JSPPortlet.java
===================================================================
---
branches/JBoss_Portal_AS5_Deployer/core-samples/src/main/org/jboss/portal/core/samples/jsp/JSPPortlet.java	2009-03-06
23:22:30 UTC (rev 12984)
+++
branches/JBoss_Portal_AS5_Deployer/core-samples/src/main/org/jboss/portal/core/samples/jsp/JSPPortlet.java	2009-03-06
23:22:39 UTC (rev 12985)
@@ -26,8 +26,12 @@
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 import javax.portlet.UnavailableException;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
 
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.ByteArrayOutputStream;
 import java.util.Locale;
 
 /** 
@@ -43,11 +47,12 @@
       rResponse.setContentType("text/html");
       Locale locale = rRequest.getLocale();
 
-      javax.portlet.PortletRequestDispatcher pRD = null;
-      
-      if (this.getPortletContext().getResource(JSP_PATH + "/view_" +
locale.getLanguage() +  ".jsp") != null)
+      javax.portlet.PortletRequestDispatcher pRD;
+
+      String localizedView = JSP_PATH + "/view_" + locale.getLanguage() +
".jsp";
+      if (this.getPortletContext().getResource(localizedView) != null)
       {
-         pRD = this.getPortletContext().getRequestDispatcher(JSP_PATH +
"/view_" + locale.getLanguage() +  ".jsp");
+         pRD = this.getPortletContext().getRequestDispatcher(localizedView);
       }
       else
       {
@@ -56,4 +61,28 @@
 
       pRD.include(rRequest, rResponse);
    }
+
+   @Override
+   public void serveResource(ResourceRequest resourceRequest, ResourceResponse
resourceResponse) throws PortletException, IOException
+   {
+      String resourceID = resourceRequest.getResourceID();
+      InputStream asStream =
Thread.currentThread().getContextClassLoader().getResourceAsStream("images/" +
resourceID + ".gif");
+      resourceResponse.setContentType("image/gif");
+      byte[] buffer = new byte[1024];
+      ByteArrayOutputStream out = new ByteArrayOutputStream();
+      while (true)
+      {
+         int i = asStream.read(buffer);
+         if (i == 0)
+         {
+            continue;
+         }
+         if (i == -1)
+         {
+            break;
+         }
+         out.write(buffer, 0, i);
+      }
+      resourceResponse.getPortletOutputStream().write(out.toByteArray());
+   }
 }
\ No newline at end of file

Modified:
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml
===================================================================
---
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml	2009-03-06
23:22:30 UTC (rev 12984)
+++
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml	2009-03-06
23:22:39 UTC (rev 12985)
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   ~ JBoss, a division of Red Hat                                              ~
-  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
-  ~ contributors as indicated by the @authors tag. See the                    ~
-  ~ copyright.txt in the distribution for a full listing of                   ~
-  ~ individual contributors.                                                  ~
-  ~                                                                           ~
-  ~ This is free software; you can redistribute it and/or modify it           ~
-  ~ under the terms of the GNU Lesser General Public License as               ~
-  ~ published by the Free Software Foundation; either version 2.1 of          ~
-  ~ the License, or (at your option) any later version.                       ~
-  ~                                                                           ~
-  ~ This software is distributed in the hope that it will be useful,          ~
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
-  ~ Lesser General Public License for more details.                           ~
-  ~                                                                           ~
-  ~ You should have received a copy of the GNU Lesser General Public          ~
-  ~ License along with this software; if not, write to the Free               ~
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ Copyright 2009, Red Hat Middleware, LLC, and individual
+  ~ contributors as indicated by the @authors tag. See the
+  ~ copyright.txt in the distribution for a full listing of
+  ~ individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
 
 <!DOCTYPE deployments PUBLIC
    "-//JBoss Portal//DTD Portal Object 2.6//EN"
    "http://www.jboss.org/portal/dtd/portal-object_2_6.dtd">
-   
+
 <deployments>
    <deployment>
       <parent-ref>default</parent-ref>
@@ -424,38 +424,38 @@
             <page-name>Page event test</page-name>
             <listener>window_event_listener</listener>
             <window>
-               <window-name>CatalogPortletWindow1</window-name>
-               <instance-ref>CatalogPortletInstance</instance-ref>
+               <window-name>EventPortletWindow1</window-name>
+               <instance-ref>EventPortletInstance</instance-ref>
                <region>left</region>
                <height>0</height>
             </window>
             <window>
-               <window-name>CatalogPortletWindow2</window-name>
-               <instance-ref>CatalogPortletInstance</instance-ref>
+               <window-name>EventPortletWindow2</window-name>
+               <instance-ref>EventPortletInstance</instance-ref>
                <region>left</region>
                <height>1</height>
             </window>
             <window>
-               <window-name>CatalogPortletWindow3</window-name>
-               <instance-ref>CatalogPortletInstance</instance-ref>
+               <window-name>EventPortletWindow3</window-name>
+               <instance-ref>EventPortletInstance</instance-ref>
                <region>left</region>
                <height>2</height>
             </window>
             <window>
-               <window-name>CatalogPortletWindow4</window-name>
-               <instance-ref>CatalogPortletInstance</instance-ref>
+               <window-name>EventPortletWindow4</window-name>
+               <instance-ref>EventPortletInstance</instance-ref>
                <region>center</region>
                <height>0</height>
             </window>
             <window>
-               <window-name>CatalogPortletWindow5</window-name>
-               <instance-ref>CatalogPortletInstance</instance-ref>
+               <window-name>EventPortletWindow5</window-name>
+               <instance-ref>EventPortletInstance</instance-ref>
                <region>center</region>
                <height>1</height>
             </window>
             <window>
-               <window-name>CatalogPortletWindow6</window-name>
-               <instance-ref>CatalogPortletInstance</instance-ref>
+               <window-name>EventPortletWindow6</window-name>
+               <instance-ref>EventPortletInstance</instance-ref>
                <region>center</region>
                <height>2</height>
             </window>

Modified:
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jsp/ajax/repeatrefresh.jsp
===================================================================
---
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jsp/ajax/repeatrefresh.jsp	2009-03-06
23:22:30 UTC (rev 12984)
+++
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jsp/ajax/repeatrefresh.jsp	2009-03-06
23:22:39 UTC (rev 12985)
@@ -1,5 +1,5 @@
 <%@ page import="javax.portlet.ResourceURL" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"
%>
+<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"
%>
 
 <!--This tag establishes three objects; renderRequest, renderResponse and
portletConfig for use in this JSP page.-->
 <portlet:defineObjects/>

Modified:
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml
===================================================================
---
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml	2009-03-06
23:22:30 UTC (rev 12984)
+++
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml	2009-03-06
23:22:39 UTC (rev 12985)
@@ -428,6 +428,9 @@
       <name>user.name.nickName</name>
    </user-attribute>
    <user-attribute>
+      <name>user.login.id</name>
+   </user-attribute>
+   <user-attribute>
       <name>user.business-info.online.email</name>
    </user-attribute>
    <user-attribute>

Modified:
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/catalog/index.jsp
===================================================================
---
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/catalog/index.jsp	2009-03-06
23:22:30 UTC (rev 12984)
+++
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/catalog/index.jsp	2009-03-06
23:22:39 UTC (rev 12985)
@@ -3,7 +3,7 @@
 <%@ page import="java.util.HashMap" %>
 <%@ page import="java.util.Iterator" %>
 <%@ page language="java"
extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"
%>
+<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"
%>
 <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
 <portlet:defineObjects/>
 

Modified:
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/catalog/sitemap.jsp
===================================================================
---
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/catalog/sitemap.jsp	2009-03-06
23:22:30 UTC (rev 12984)
+++
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/catalog/sitemap.jsp	2009-03-06
23:22:39 UTC (rev 12985)
@@ -3,7 +3,7 @@
 <%@ page import="org.jboss.portal.api.node.PortalNode" %>
 <%@ page import="org.jboss.portal.api.node.PortalNodeURL" %>
 <%@ page language="java"
extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"
%>
+<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"
%>
 <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
 <portlet:defineObjects/>
 

Copied:
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_pt_BR.properties
(from rev 12964,
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_pt_BR.properties)
===================================================================
---
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_pt_BR.properties	
                       (rev 0)
+++
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_pt_BR.properties	2009-03-06
23:22:39 UTC (rev 12985)
@@ -0,0 +1,2 @@
+javax.portlet.title=Sauda\u00E7\u00F5es\!
+javax.portlet.keywords=sample,test
\ No newline at end of file

Modified:
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view.jsp
===================================================================
---
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view.jsp	2009-03-06
23:22:30 UTC (rev 12984)
+++
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view.jsp	2009-03-06
23:22:39 UTC (rev 12985)
@@ -22,7 +22,7 @@
 ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                 ~
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
 
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"
%>
+<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"
%>
 <%@ page isELIgnored="false" %>
 
 <portlet:defineObjects/>
@@ -30,13 +30,13 @@
 <table border="0" cellspacing="2" cellpadding="2">
    <tr>
       <td align="center"><a
href="http://portal.demo.jboss.com" target="_blank"><img
-         src="<%= renderRequest.getContextPath() %>/images/dodemo.gif"
border="0"
+         src="<portlet:resourceURL id='dodemo'/>"
border="0"
          alt="Try the latest release of JBoss Portal, live and online."
/></a>
          <a
href="http://labs.jboss.com/portal/jbossportal/download/index.html&q...
target="_blank"><img
-            src="<%= renderRequest.getContextPath()
%>/images/getcode.gif" border="0"
+            src="<portlet:resourceURL id='getcode'/>"
border="0"
             alt="Download JBoss Portal and have it up and running in minutes."
/></a>
          <a href="http://www.portletswap.com"
target="_blank"><img
-            src="<%= renderRequest.getContextPath()
%>/images/accessorize.gif" border="0"
+            src="<portlet:resourceURL id='accessorize'/>"
border="0"
             alt="Download portlets and layouts for your new JBoss Portal
installation." /></a></td>
    </tr>
    <tr>
@@ -44,15 +44,15 @@
    </tr>
    <tr>
       <td class="portlet-section-alternate">
-         <font class="portlet-font">This is a basic installation of
<b><%= PortalConstants.VERSION %>
-         </b>. You may
-            log in at any time, using the <i>Login</i> link at the top-right
of this page, with the following
-            credentials:</font>
+         <p class="portlet-font">This is a basic installation of
<strong><%= PortalConstants.VERSION %></strong>.
+            You may log in at any time, using the <span
style="font-style:italic;">Login</span> link at the top-right
+            of this page, with the following credentials:
+         </p>
       </td>
    </tr>
    <tr>
       <td class="portlet-section-alternate" align="center">
-         <b>user/user</b> or <b>admin/admin</b>
+         <strong>user/user</strong> or
<strong>admin/admin</strong>
       </td>
    </tr>
    <tr>

Modified:
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view_fr.jsp
===================================================================
---
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view_fr.jsp	2009-03-06
23:22:30 UTC (rev 12984)
+++
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view_fr.jsp	2009-03-06
23:22:39 UTC (rev 12985)
@@ -22,7 +22,7 @@
 ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                 ~
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
 
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"
%>
+<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"
%>
 <%@ page isELIgnored="false" %>
 
 <portlet:defineObjects/>
@@ -30,13 +30,13 @@
 <table border="0" cellspacing="2" cellpadding="2">
    <tr>
       <td align="center"><a
href="http://portal.demo.jboss.com" target="_blank"><img
-         src="<%= renderRequest.getContextPath() %>/images/dodemo.gif"
border="0"
+         src="<portlet:resourceURL id='dodemo'/>"
border="0"
          alt="Try the latest release of JBoss Portal, live and online."
/></a>
          <a
href="http://labs.jboss.com/portal/jbossportal/download/index.html&q...
target="_blank"><img
-            src="<%= renderRequest.getContextPath()
%>/images/getcode.gif" border="0"
+            src="<portlet:resourceURL id='getcode'/>"
border="0"
             alt="Download JBoss Portal and have it up and running in minutes."
/></a>
          <a href="http://www.portletswap.com"
target="_blank"><img
-            src="<%= renderRequest.getContextPath()
%>/images/accessorize.gif" border="0"
+            src="<portlet:resourceURL id='accessorize'/>"
border="0"
             alt="Download portlets and layouts for your new JBoss Portal
installation." /></a></td>
    </tr>
    <tr>
@@ -44,18 +44,23 @@
    </tr>
    <tr>
       <td class="portlet-section-alternate">
-         <font class="portlet-font">Ceci est l'installation par
d&eacute;faut de <b><%= PortalConstants.VERSION %>
-         </b>. Vous pouvez vous connecter en cliquant sur le lien
<i>Login</i> en haut &agrave; droite de cette page, avec les identifiants
suivants:</font>
+         <p class="portlet-font">
+            Ceci est l'installation par d&eacute;faut de <strong><%=
PortalConstants.VERSION %></strong>. Vous pouvez
+            vous connecter en cliquant sur le lien <span
style="font-style:italic;">Login</span>
+            en haut &agrave; droite de cette page, avec les identifiants suivants:
+         </p>
       </td>
    </tr>
    <tr>
       <td class="portlet-section-alternate" align="center">
-         <b>user/user</b> ou <b>admin/admin</b>
+         <strong>user/user</strong> ou
<strong>admin/admin</strong>
       </td>
    </tr>
    <tr>
       <td align="center">
-         Si vous avez besoin d'aide pour naviguer, configurer ou pour administrer le
portail, veuillez vous r&eacute;f&eacute;rer <a
href="http://labs.jboss.com/portal/jbossportal/docs/index.html"
target="_blank">&agrave; la documentation </a>.
+         Si vous avez besoin d'aide pour naviguer, configurer ou pour administrer le
portail, veuillez vous
+         r&eacute;f&eacute;rer
+         <a href="http://labs.jboss.com/portal/jbossportal/docs/index.html"
target="_blank">&agrave; la documentation </a>.
       </td>
    </tr>
 </table>

Modified:
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet.xml
===================================================================
---
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet.xml	2009-03-06
23:22:30 UTC (rev 12984)
+++
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet.xml	2009-03-06
23:22:39 UTC (rev 12985)
@@ -23,10 +23,10 @@
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
 
 <portlet-app
-   xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+   xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1...
http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-   version="1.0">
+   xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2...
http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+   version="2.0">
    <portlet>
       <description>Simple JSP portlet</description>
       <portlet-name>JSPPortlet</portlet-name>

Modified:
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_it.properties
===================================================================
---
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_it.properties	2009-03-06
23:22:30 UTC (rev 12984)
+++
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_it.properties	2009-03-06
23:22:39 UTC (rev 12985)
@@ -23,4 +23,4 @@
 
 javax.portlet.preference.name.RssXml=URL per RSS
 javax.portlet.preference.name.expires=Scadenza
-org.jboss.portal.object.name.default.News=Novita'
\ No newline at end of file
+org.jboss.portal.object.name.default.News=Novit\u00e0
\ No newline at end of file

Copied:
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_pt_BR.properties
(from rev 12964,
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_pt_BR.properties)
===================================================================
---
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_pt_BR.properties	
                       (rev 0)
+++
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_pt_BR.properties	2009-03-06
23:22:39 UTC (rev 12985)
@@ -0,0 +1,26 @@
+################################################################################
+# JBoss, a division of Red Hat                                                 #
+# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
+# contributors as indicated by the @authors tag. See the                       #
+# copyright.txt in the distribution for a full listing of                      #
+# individual contributors.                                                     #
+#                                                                              #
+# This is free software; you can redistribute it and/or modify it              #
+# under the terms of the GNU Lesser General Public License as                  #
+# published by the Free Software Foundation; either version 2.1 of             #
+# the License, or (at your option) any later version.                          #
+#                                                                              #
+# This software is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
+# Lesser General Public License for more details.                              #
+#                                                                              #
+# You should have received a copy of the GNU Lesser General Public             #
+# License along with this software; if not, write to the Free                  #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
+################################################################################
+
+javax.portlet.preference.name.RssXml=URL do RSS
+javax.portlet.preference.name.expires=Tempo de expira\u00E7\u00E3o
+org.jboss.portal.object.name.default.News=Not\u00EDcias
\ No newline at end of file

Modified:
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_it.properties
===================================================================
---
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_it.properties	2009-03-06
23:22:30 UTC (rev 12984)
+++
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_it.properties	2009-03-06
23:22:39 UTC (rev 12985)
@@ -20,9 +20,11 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
 ################################################################################
+javax.portlet.title=Utenti online
+javax.portlet.keywords=esempio,test
 
 NO_USER_ONLINE=Nessun utente \u00e8 online
-#ONE_USER_ONLINE=You are the only user online
+ONE_USER_ONLINE=Sei il solo utente online
 USERS_ONLINE_0=Al momento ci sono <b>
 USERS_ONLINE_1=</b> utenti online
 USERS_ARE_0=<b>

Copied:
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_pt_BR.properties
(from rev 12964,
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_pt_BR.properties)
===================================================================
---
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_pt_BR.properties	
                       (rev 0)
+++
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_pt_BR.properties	2009-03-06
23:22:39 UTC (rev 12985)
@@ -0,0 +1,34 @@
+################################################################################
+# JBoss, a division of Red Hat                                                 #
+# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
+# contributors as indicated by the @authors tag. See the                       #
+# copyright.txt in the distribution for a full listing of                      #
+# individual contributors.                                                     #
+#                                                                              #
+# This is free software; you can redistribute it and/or modify it              #
+# under the terms of the GNU Lesser General Public License as                  #
+# published by the Free Software Foundation; either version 2.1 of             #
+# the License, or (at your option) any later version.                          #
+#                                                                              #
+# This software is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
+# Lesser General Public License for more details.                              #
+#                                                                              #
+# You should have received a copy of the GNU Lesser General Public             #
+# License along with this software; if not, write to the Free                  #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
+################################################################################
+javax.portlet.title=Usu\u00e1rios atuais
+javax.portlet.keywords=sample,test
+
+NO_USER_ONLINE=Nenhum usu\u00e1rio on-line
+ONE_USER_ONLINE=Voc\u00ea \u00e9 o \u00fanico usu\u00e1rio on-line
+USERS_ONLINE_0=Existem <b>
+USERS_ONLINE_1=</b> usu\u00e1rios on-line
+USERS_ARE_0=<b>
+USERS_ARE_1=</b>
+USERS_WHICH_0=Entre eles: <b>
+USERS_WHICH_1=</b> est\u00e1 conectado:
+USERS_WHICH_2=</b> est\u00e1 conectado:

Modified:
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/help.jsp
===================================================================
---
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/help.jsp	2009-03-06
23:22:30 UTC (rev 12984)
+++
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/help.jsp	2009-03-06
23:22:39 UTC (rev 12985)
@@ -21,7 +21,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                 ~
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
 
-<%@ taglib uri="http://java.sun.com/portlet"
prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/portlet_2_0"
prefix="portlet"%>
 
 <portlet:defineObjects />
 

Modified:
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/noUser.jsp
===================================================================
---
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/noUser.jsp	2009-03-06
23:22:30 UTC (rev 12984)
+++
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/noUser.jsp	2009-03-06
23:22:39 UTC (rev 12985)
@@ -23,7 +23,7 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
 <%@ page language="java"
extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
 <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"
%>
+<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"
%>
 <%@ page isELIgnored="false" %>
 <portlet:defineObjects/>
 

Modified:
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp
===================================================================
---
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp	2009-03-06
23:22:30 UTC (rev 12984)
+++
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp	2009-03-06
23:22:39 UTC (rev 12985)
@@ -23,7 +23,7 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
 <%@ page language="java"
extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
 <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"
%>
+<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"
%>
 <%@ page isELIgnored="false" %>
 <portlet:defineObjects/>
 

Modified:
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource.properties
===================================================================
---
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource.properties	2009-03-06
23:22:30 UTC (rev 12984)
+++
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource.properties	2009-03-06
23:22:39 UTC (rev 12985)
@@ -23,6 +23,6 @@
 
 javax.portlet.preference.name.RssXml=RSS feed URL
 javax.portlet.preference.name.expires=Expiration time
-org.jboss.portal.object.name.Weather=Weather
+org.jboss.portal.object.name.default.Weather=Weather
 
 org.jboss.portal.instance.name.WeatherPortletInstance=Weather Portlet

Copied:
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource_pt_BR.properties
(from rev 12964,
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource_pt_BR.properties)
===================================================================
---
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource_pt_BR.properties	
                       (rev 0)
+++
branches/JBoss_Portal_AS5_Deployer/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource_pt_BR.properties	2009-03-06
23:22:39 UTC (rev 12985)
@@ -0,0 +1,28 @@
+################################################################################
+# JBoss, a division of Red Hat                                                 #
+# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
+# contributors as indicated by the @authors tag. See the                       #
+# copyright.txt in the distribution for a full listing of                      #
+# individual contributors.                                                     #
+#                                                                              #
+# This is free software; you can redistribute it and/or modify it              #
+# under the terms of the GNU Lesser General Public License as                  #
+# published by the Free Software Foundation; either version 2.1 of             #
+# the License, or (at your option) any later version.                          #
+#                                                                              #
+# This software is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
+# Lesser General Public License for more details.                              #
+#                                                                              #
+# You should have received a copy of the GNU Lesser General Public             #
+# License along with this software; if not, write to the Free                  #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
+################################################################################
+
+javax.portlet.preference.name.RssXml=URL do feed RSS
+javax.portlet.preference.name.expires=Tempo de expira\u00e7\u00e3o
+org.jboss.portal.object.name.Weather=Tempo
+
+org.jboss.portal.instance.name.WeatherPortletInstance=Tempo Portlet


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

[portal-commits] JBoss Portal SVN: r12985 - in branches/JBoss_Portal_AS5_Deployer/core-samples: src/main/org/jboss/portal/core/samples/basic and 11 other directories.