[portal-commits] JBoss Portal SVN: r12427 - in branches/JBoss_Portal_Branch_2_7: core/src/resources/portal-core-war/WEB-INF/jsp/test and 12 other directories.

Monday, 5 January 2009


Author: chris.laprun(a)jboss.com
Date: 2009-01-05 19:05:19 -0500 (Mon, 05 Jan 2009)
New Revision: 12427

Modified:
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/accessdenied.jsp
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/help.jsp
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/edit.jsp
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp
  
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/help.jsp
  
branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/jsp/JSPPortlet.java
  
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jsp/ajax/repeatrefresh.jsp
  
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/catalog/index.jsp
  
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/catalog/sitemap.jsp
  
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view.jsp
  
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view_fr.jsp
  
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet.xml
  
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/help.jsp
  
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/noUser.jsp
  
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp
  
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
  
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIf01.jsp
  
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testInclude01.jsp
  
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testInclude03.jsp
  
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate01.jsp
  
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate02.jsp
  
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate03.jsp
  
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testTaglib01.jsp
  
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testTaglib02.jsp
  
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java
  
branches/JBoss_Portal_Branch_2_7/widget/src/resources/portal-widget-netvibes-war/WEB-INF/jsp/edit_content.jsp
  
branches/JBoss_Portal_Branch_2_7/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp
Log:
- JBPORTAL-2269: fixed PortletAppDeployment which was incorrectly trying to inject the TLD
before loading portlet metadata.
  NOTE: it is now impossible to have a JSR-286 portlet use the JSR-168 taglib.
- Updated JSPs to correctly refer to JSR-286 taglib when needed.
- Updated JSP portlet to demonstrate resource serving (and validate fix for
JBPORTAL-2269).

Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -12,7 +12,7 @@
 <%@ page import="java.util.Collection" %>
 <%@ page import="java.util.Locale" %>
 
-<%@ 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" %>
 
 <%

Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIf01.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIf01.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIf01.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -1,5 +1,5 @@
 <%@ 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" %>
 <n:if ctx="IfCond">Some text</n:if>
\ No newline at end of file

Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testInclude01.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testInclude01.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testInclude01.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -1,5 +1,5 @@
 <%@ 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" %>
 BeginInclude:<n:include page="testInclude02.jsp"/>:EndInclude
\ No newline at end of file

Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testInclude03.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testInclude03.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testInclude03.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -1,5 +1,5 @@
 <%@ 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" %>
 Foo:<n:include page="testInclude01.jsp"/>:Bar
\ No newline at end of file

Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate01.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate01.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate01.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -1,5 +1,5 @@
 <%@ 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" %>
 <n:iterate ctx="row">Some text</n:iterate>
\ No newline at end of file

Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate02.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate02.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate02.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -1,5 +1,5 @@
 <%@ 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" %>
 <n:iterate ctx="row">A<n:iterate
ctx="col">B</n:iterate>C</n:iterate>
\ No newline at end of file

Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate03.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate03.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate03.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -1,5 +1,5 @@
 <%@ 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" %>
 <n:iterate ctx="row">A<n:iterate ctx="col">B<n:iterate
ctx="foo">C</n:iterate></n:iterate>D</n:iterate>
\ No newline at end of file

Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testTaglib01.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testTaglib01.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testTaglib01.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -1,5 +1,5 @@
 <%@ 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" %>
 ${n:out("foo")}:<n:include
page="testTaglib02.jsp"/>:${n:out("bar")}

Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testTaglib02.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testTaglib02.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/test/testTaglib02.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -1,6 +1,6 @@
 <%@ 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" %>
 ${n:out("foo")}:
 <n:iterate ctx="row1">

Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/accessdenied.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/accessdenied.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/accessdenied.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -1,6 +1,6 @@
 <%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants"
%>
 <%@ 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" %>
 <%@ page isELIgnored="false" %>
 

Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -1,5 +1,5 @@
 <%@ 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" %>
 <%@ page isELIgnored="false" %>
 

Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -1,5 +1,5 @@
 <%@ 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" %>
 <%@ page isELIgnored="false" %>
 

Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -1,7 +1,7 @@
 <%@ page import="org.jboss.portal.cms.util.NodeUtil" %>
 <%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants"
%>
 <%@ 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" %>
 <%@ page isELIgnored="false" %>
 

Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -1,5 +1,5 @@
 <%@ 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" %>
 <%@ page isELIgnored="false" %>
 

Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -2,7 +2,7 @@
                  org.jboss.portal.core.cms.ui.admin.CMSAdminConstants,
                  java.util.Locale" %>
 <%@ 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" %>
 <%@ page isELIgnored="false" %>
 

Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -1,7 +1,7 @@
 <%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants"
%>
 <%@ page import="java.util.Locale" %>
 <%@ 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" %>
 <%@ page isELIgnored="false" %>
 

Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -1,6 +1,6 @@
 <%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants"
%>
 <%@ 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" %>
 <%@ page isELIgnored="false" %>
 

Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -1,6 +1,6 @@
 <%@ page import="java.util.Locale" %>
 <%@ 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" %>
 <%@ page isELIgnored="false" %>
 

Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -1,6 +1,6 @@
 <%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants"
%>
 <%@ 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" %>
 <%@ page isELIgnored="false" %>
 

Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -1,6 +1,6 @@
 <%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants"
%>
 <%@ 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" %>
 <%@ page isELIgnored="false" %>
 

Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -4,7 +4,7 @@
 <%@ page import="java.util.List" %>
 <%@ page import="java.util.StringTokenizer" %>
 <%@ page isELIgnored="false" %>
-<%@ 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" %>
 
 <%

Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/help.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/help.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/help.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -1 +1 @@
-Help page - nothing to see hear. Move along.
\ No newline at end of file
+Help page - nothing to see here. Move along.
\ No newline at end of file

Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -6,7 +6,7 @@
 <%@ page import="java.util.StringTokenizer" %>
 <%@ 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_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -1,5 +1,5 @@
 <%@ 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" %>
 <%@ page isELIgnored="false" %>
 
@@ -125,7 +125,7 @@
    plugin_insertdate_timeFormat : "%H:%M:%S",
    relative_urls : "true",
    convert_urls: "false",
-   document_base_url : "<%= sDocBase %>",
+   document_base_url : "<%= sDocBase %>",
    extended_valid_elements :
   
"style[type],a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],font[face|size|color],hr[class|width|size|noshade]"
    });
@@ -229,36 +229,36 @@
       <!-- User who requested approval -->
       <td><%= cour.getUserName() %>
       </td>
-      <td>
-            <%
-         if (cour.getMimeType().equals("text/html") ||
cour.getMimeType().equals("text/plain"))
-         {
-      %>
-      	 <a href="<portlet:renderURL>
-         		<portlet:param name="op" value="<%=
CMSAdminConstants.OP_VIEWPENDINGPREVIEW %>"/>
-         		<portlet:param name="pid"
value="<%=cour.getProcessId()%>"/>
-         		<portlet:param name="path"
value="<%=linkPath%>"/>
-         		<portlet:param name="contentPath"
value="<%=cour.getPath()%>"/>
-         </portlet:renderURL>" 
-        
<%if(contentBeingPreviewed.equals(cour.getProcessId())){%>style="color:
red;"<%}%>
-         >${n:i18n("CMS_PREVIEW")}</a>
-
-      <% }
-      else
-      {
-         //save the principal for the preview servlet
-         String remoteUser = request.getRemoteUser();
-         request.getSession().setAttribute("remoteUser", remoteUser);
-      %>
-      <a target="_blank"
-         href="<%= request.getContextPath() %>/cmspreview?pid=<%=
cour.getProcessId() %>&p=<%= cour.getPath()
%>"<%if(contentBeingPreviewed.equals(cour.getProcessId())){%>style="color:
red;"<%}%>
-         >${n:i18n("CMS_PREVIEW")}</a>
-      <%
-      }
-      %>
-      
-      
+      <td>
+            <%
+         if (cour.getMimeType().equals("text/html") ||
cour.getMimeType().equals("text/plain"))
+         {
+      %>
+      	 <a href="<portlet:renderURL>
+         		<portlet:param name="op" value="<%=
CMSAdminConstants.OP_VIEWPENDINGPREVIEW %>"/>
+         		<portlet:param name="pid"
value="<%=cour.getProcessId()%>"/>
+         		<portlet:param name="path"
value="<%=linkPath%>"/>
+         		<portlet:param name="contentPath"
value="<%=cour.getPath()%>"/>
+         </portlet:renderURL>" 
+        
<%if(contentBeingPreviewed.equals(cour.getProcessId())){%>style="color:
red;"<%}%>
+         >${n:i18n("CMS_PREVIEW")}</a>
+
+      <% }
+      else
+      {
+         //save the principal for the preview servlet
+         String remoteUser = request.getRemoteUser();
+         request.getSession().setAttribute("remoteUser", remoteUser);
+      %>
+      <a target="_blank"
+         href="<%= request.getContextPath() %>/cmspreview?pid=<%=
cour.getProcessId() %>&p=<%= cour.getPath()
%>"<%if(contentBeingPreviewed.equals(cour.getProcessId())){%>style="color:
red;"<%}%>
+         >${n:i18n("CMS_PREVIEW")}</a>
+      <%
+      }
+      %>
       
+      
+      
          &nbsp;
          <a href="<portlet:actionURL>
          		<portlet:param name="op" value="<%=
CMSAdminConstants.OP_APPROVE %>"/>

Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -3,7 +3,7 @@
 <%@ page import="java.text.Format" %>
 <%@ page import="java.util.List" %>
 <%@ 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" %>
 <%@ page isELIgnored="false" %>
 

Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -5,7 +5,7 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.Set" %>
 <%@ 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" %>
 <%@ page isELIgnored="false" %>
 

Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -1,6 +1,6 @@
 <%@ page import="java.util.Locale" %>
 <%@ 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" %>
 <%@ page isELIgnored="false" %>
 

Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -1,6 +1,6 @@
 <%@ page import="java.util.Locale" %>
 <%@ 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" %>
 <%@ page isELIgnored="false" %>
 

Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -1,5 +1,5 @@
 <%@ 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" %>
 <%@ page isELIgnored="false" %>
 

Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/edit.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/edit.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/edit.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -1,5 +1,5 @@
 <%@ 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" %>
 <%@ page isELIgnored="false" %>
 

Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -8,7 +8,7 @@
 <%@ page import="javax.portlet.PortletURL" %>
 <%@ 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_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/help.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/help.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/help.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -1,5 +1,5 @@
 <%@ 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" %>
 <%@ page isELIgnored="false" %>
 

Modified:
branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/jsp/JSPPortlet.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/jsp/JSPPortlet.java	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/jsp/JSPPortlet.java	2009-01-06
00:05:19 UTC (rev 12427)
@@ -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_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jsp/ajax/repeatrefresh.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jsp/ajax/repeatrefresh.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jsp/ajax/repeatrefresh.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -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_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/catalog/index.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/catalog/index.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/catalog/index.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -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_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/catalog/sitemap.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/catalog/sitemap.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/catalog/sitemap.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -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/>
 

Modified:
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -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_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view_fr.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view_fr.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view_fr.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -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_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet.xml	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet.xml	2009-01-06
00:05:19 UTC (rev 12427)
@@ -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_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/help.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/help.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/help.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -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_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/noUser.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/noUser.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/noUser.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -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_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -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_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java	2009-01-06
00:05:19 UTC (rev 12427)
@@ -100,14 +100,15 @@
 
    public void create() throws DeploymentException
    {
-      importTLD();
-
       //
       try
       {
          portletAppMD = buildPortletApplicationMetaData();
          jbossAppMD = buildJBossApplicationMetaData();
 
+         // TLD import needs portlet MD
+         importTLD();
+
          //
          if (jbossAppMD.getId() == null)
          {
@@ -341,15 +342,19 @@
       InputStream sourceTLD = null;
       try
       {
+
+         String tldName;
          if (portletAppMD instanceof PortletApplication20MetaData)
          {
             sourceTLD =
IOTools.safeBufferedWrapper(Thread.currentThread().getContextClassLoader().getResourceAsStream("META-INF/portlet_2_0.tld"));
+            tldName = "portlet_2_0.tld";
          }
          else
          {
             sourceTLD =
IOTools.safeBufferedWrapper(Thread.currentThread().getContextClassLoader().getResourceAsStream("META-INF/portlet.tld"));
+            tldName = "portlet.tld";
          }
-         pwa.importFile("/WEB-INF", "portlet.tld", sourceTLD,
false);
+         pwa.importFile("/WEB-INF", tldName, sourceTLD, false);
       }
       catch (IOException e)
       {

Modified:
branches/JBoss_Portal_Branch_2_7/widget/src/resources/portal-widget-netvibes-war/WEB-INF/jsp/edit_content.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/widget/src/resources/portal-widget-netvibes-war/WEB-INF/jsp/edit_content.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/widget/src/resources/portal-widget-netvibes-war/WEB-INF/jsp/edit_content.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -12,7 +12,7 @@
 <%@page import="java.util.List"%>
 <%@page import="java.util.Iterator"%>
 <%@ page language="java" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="p" %>
+<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="p" %>
 <%@ page isELIgnored="false" %>
 <%@page import="org.jboss.portal.widget.Widget"%>
 <%@page import="org.jboss.portal.widget.exceptions.WidgetFailure"%>

Modified:
branches/JBoss_Portal_Branch_2_7/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp	2009-01-05
15:36:47 UTC (rev 12426)
+++
branches/JBoss_Portal_Branch_2_7/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp	2009-01-06
00:05:19 UTC (rev 12427)
@@ -14,7 +14,7 @@
 <%@ page import="java.util.Collection" %>
 <%@ page import="java.util.Iterator" %>
 <%@ page language="java" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="p" %>
+<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="p" %>
 <%@ page isELIgnored="false" %>
 
 <%@page import="org.jboss.portal.widget.Widget"%>


    

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: r12427 - in branches/JBoss_Portal_Branch_2_7: core/src/resources/portal-core-war/WEB-INF/jsp/test and 12 other directories.