You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by ms...@apache.org on 2015/02/25 15:08:28 UTC
portals-pluto git commit: Changed the portlet.xml and JSP namespaces
according to the suggestions in issues PORTLETSPEC3-46 & PORTLETSPEC3-47.
Repository: portals-pluto
Updated Branches:
refs/heads/V3Prototype 0fa2c310c -> 85aa88744
Changed the portlet.xml and JSP namespaces according to the suggestions in
issues PORTLETSPEC3-46 & PORTLETSPEC3-47.
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/85aa8874
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/85aa8874
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/85aa8874
Branch: refs/heads/V3Prototype
Commit: 85aa887443e33dea0f3b3d046de20ae5fb1c8b15
Parents: 0fa2c31
Author: Scott Nicklous <ms...@apache.org>
Authored: Wed Feb 25 15:06:13 2015 +0100
Committer: Scott Nicklous <ms...@apache.org>
Committed: Wed Feb 25 15:06:13 2015 +0100
----------------------------------------------------------------------
.../src/main/webapp/WEB-INF/jsp/view-csp.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-isp.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-ivp.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-mbp.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-pap.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-ptp.jsp | 2 +-
.../src/main/webapp/WEB-INF/portlet.xml | 4 +-
.../src/main/webapp/WEB-INF/jsp/view-ascp.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-csp.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-isp.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-ivp.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-long.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-mbp.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-pcp.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-ptp.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-uaptp.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-urptp.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-utp.jsp | 2 +-
.../src/main/webapp/WEB-INF/portlet.xml | 4 +-
.../impl/PortletAppDescriptorServiceImpl.java | 2 +-
.../om/portlet30/impl/ObjectFactory.java | 4 +-
.../om/portlet30/impl/PortletAppType.java | 2 +-
.../om/portlet30/impl/package-info.java | 2 +-
.../pluto/container/impl/portlet-app_3_0.xsd | 11 +-
.../main/webapp/WEB-INF/tld/portlet-el_3_0.tld | 177 ++++++++++++++++++
.../src/main/webapp/WEB-INF/tld/portlet_3_0.tld | 178 +++++++++++++++++++
.../main/resources/META-INF/portlet-el_3_0.tld | 177 ++++++++++++++++++
.../src/main/resources/META-INF/portlet_3_0.tld | 178 +++++++++++++++++++
28 files changed, 745 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-csp.jsp
----------------------------------------------------------------------
diff --git a/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-csp.jsp b/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-csp.jsp
index 173d6a4..1dacb93 100644
--- a/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-csp.jsp
+++ b/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-csp.jsp
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
limitations under the License.
--%>
<%@ page session="false" %>
-<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
+<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ page import="static basic.portlet.Constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-isp.jsp
----------------------------------------------------------------------
diff --git a/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-isp.jsp b/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-isp.jsp
index 73ecced..fde3c26 100644
--- a/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-isp.jsp
+++ b/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-isp.jsp
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
limitations under the License.
--%>
<%@ page session="false" %>
-<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
+<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<portlet:defineObjects />
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-ivp.jsp
----------------------------------------------------------------------
diff --git a/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-ivp.jsp b/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-ivp.jsp
index 9719718..d64b323 100644
--- a/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-ivp.jsp
+++ b/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-ivp.jsp
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
limitations under the License.
--%>
<%@ page session="false" %>
-<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
+<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<portlet:defineObjects />
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-mbp.jsp
----------------------------------------------------------------------
diff --git a/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-mbp.jsp b/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-mbp.jsp
index 5e85af0..adb5c4f 100644
--- a/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-mbp.jsp
+++ b/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-mbp.jsp
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
limitations under the License.
--%>
<%@ page session="false" %>
-<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
+<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<portlet:defineObjects />
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-pap.jsp
----------------------------------------------------------------------
diff --git a/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-pap.jsp b/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-pap.jsp
index 8cf3957..a53b4d0 100644
--- a/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-pap.jsp
+++ b/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-pap.jsp
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
limitations under the License.
--%>
<%@ page session="false" %>
-<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
+<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<portlet:defineObjects />
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-ptp.jsp
----------------------------------------------------------------------
diff --git a/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-ptp.jsp b/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-ptp.jsp
index f4a429b..cbb8d63 100644
--- a/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-ptp.jsp
+++ b/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-ptp.jsp
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
limitations under the License.
--%>
<%@ page session="false" %>
-<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
+<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ page import="static basic.portlet.Constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/PortletHubDemo/src/main/webapp/WEB-INF/portlet.xml
----------------------------------------------------------------------
diff --git a/PortletHubDemo/src/main/webapp/WEB-INF/portlet.xml b/PortletHubDemo/src/main/webapp/WEB-INF/portlet.xml
index 9387fd7..f5e8595 100644
--- a/PortletHubDemo/src/main/webapp/WEB-INF/portlet.xml
+++ b/PortletHubDemo/src/main/webapp/WEB-INF/portlet.xml
@@ -1,7 +1,7 @@
-<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_3_0.xsd"
+<portlet-app xmlns="http://xmlns.jcp.org/xml/ns/portlet"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:rp="http://www.apache.org/portals/pluto/pub-render-params/ResourcePortlet"
- xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_3_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_3_0.xsd"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/portlet http://xmlns.jcp.org/xml/ns/portlet/portlet-app_3_0.xsd"
version="3.0"
id="ph.resource.portlet">
<portlet>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-ascp.jsp
----------------------------------------------------------------------
diff --git a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-ascp.jsp b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-ascp.jsp
index 86a9080..ba4c3af 100644
--- a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-ascp.jsp
+++ b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-ascp.jsp
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
limitations under the License.
--%>
<%@ page session="false" %>
-<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
+<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ page import="java.io.*,java.util.*,javax.portlet.*" %>
<%@ page import="javax.portlet.MimeResponse.ParameterCopyOption" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-csp.jsp
----------------------------------------------------------------------
diff --git a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-csp.jsp b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-csp.jsp
index 173d6a4..1dacb93 100644
--- a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-csp.jsp
+++ b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-csp.jsp
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
limitations under the License.
--%>
<%@ page session="false" %>
-<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
+<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ page import="static basic.portlet.Constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-isp.jsp
----------------------------------------------------------------------
diff --git a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-isp.jsp b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-isp.jsp
index c558bcc..29393ee 100644
--- a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-isp.jsp
+++ b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-isp.jsp
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
limitations under the License.
--%>
<%@ page session="false" %>
-<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
+<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<portlet:defineObjects />
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-ivp.jsp
----------------------------------------------------------------------
diff --git a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-ivp.jsp b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-ivp.jsp
index 9719718..d64b323 100644
--- a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-ivp.jsp
+++ b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-ivp.jsp
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
limitations under the License.
--%>
<%@ page session="false" %>
-<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
+<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<portlet:defineObjects />
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-long.jsp
----------------------------------------------------------------------
diff --git a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-long.jsp b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-long.jsp
index 10a723f..18036fd 100644
--- a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-long.jsp
+++ b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-long.jsp
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
limitations under the License.
--%>
<%@ page session="false" %>
-<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
+<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ page import="java.io.*,java.util.*,javax.portlet.*" %>
<%@ page import="javax.portlet.MimeResponse.ParameterCopyOption" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-mbp.jsp
----------------------------------------------------------------------
diff --git a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-mbp.jsp b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-mbp.jsp
index 6e5ff8a..ea0ce7f 100644
--- a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-mbp.jsp
+++ b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-mbp.jsp
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
limitations under the License.
--%>
<%@ page session="false" %>
-<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
+<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<portlet:defineObjects />
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-pcp.jsp
----------------------------------------------------------------------
diff --git a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-pcp.jsp b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-pcp.jsp
index b997660..b407353 100644
--- a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-pcp.jsp
+++ b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-pcp.jsp
@@ -18,7 +18,7 @@ limitations under the License.
--%>
<%@ page import="static basic.portlet.Constants.*" %>
<%@ page session="false" %>
-<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
+<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<portlet:defineObjects />
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-ptp.jsp
----------------------------------------------------------------------
diff --git a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-ptp.jsp b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-ptp.jsp
index 7a59dd2..9c1ee22 100644
--- a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-ptp.jsp
+++ b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-ptp.jsp
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
limitations under the License.
--%>
<%@ page session="false" %>
-<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
+<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ page import="java.io.*,java.util.*,javax.portlet.*" %>
<%@ page import="static basic.portlet.Constants.*" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-uaptp.jsp
----------------------------------------------------------------------
diff --git a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-uaptp.jsp b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-uaptp.jsp
index 04dead6..56a841b 100644
--- a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-uaptp.jsp
+++ b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-uaptp.jsp
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
limitations under the License.
--%>
<%@ page session="false" %>
-<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
+<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ page import="java.io.*,java.util.*,javax.portlet.*" %>
<%@ page import="javax.portlet.MimeResponse.ParameterCopyOption" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-urptp.jsp
----------------------------------------------------------------------
diff --git a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-urptp.jsp b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-urptp.jsp
index 557d40e..615c38d 100644
--- a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-urptp.jsp
+++ b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-urptp.jsp
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
limitations under the License.
--%>
<%@ page session="false" %>
-<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
+<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ page import="java.io.*,java.util.*,javax.portlet.*" %>
<%@ page import="javax.portlet.MimeResponse.ParameterCopyOption" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-utp.jsp
----------------------------------------------------------------------
diff --git a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-utp.jsp b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-utp.jsp
index 63b0a66..fa8865d 100644
--- a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-utp.jsp
+++ b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-utp.jsp
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
limitations under the License.
--%>
<%@ page session="false" %>
-<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
+<%@ taglib uri="http://xmlns.jcp.org/portlet_3_0" prefix="portlet" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ page import="java.io.*,java.util.*,javax.portlet.*" %>
<%@ page import="javax.portlet.MimeResponse.ParameterCopyOption" %>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/PortletV3Demo/src/main/webapp/WEB-INF/portlet.xml
----------------------------------------------------------------------
diff --git a/PortletV3Demo/src/main/webapp/WEB-INF/portlet.xml b/PortletV3Demo/src/main/webapp/WEB-INF/portlet.xml
index e341c35..d19f1be 100644
--- a/PortletV3Demo/src/main/webapp/WEB-INF/portlet.xml
+++ b/PortletV3Demo/src/main/webapp/WEB-INF/portlet.xml
@@ -1,7 +1,7 @@
-<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_3_0.xsd"
+<portlet-app xmlns="http://xmlns.jcp.org/xml/ns/portlet"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:rp="http://www.apache.org/portals/pluto/pub-render-params/ResourcePortlet"
- xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_3_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_3_0.xsd"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/portlet http://xmlns.jcp.org/xml/ns/portlet/portlet-app_3_0.xsd"
version="3.0"
id="v3.demo.portlet">
<portlet>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java b/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java
index 1464ec9..f7876a8 100644
--- a/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java
+++ b/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletAppDescriptorServiceImpl.java
@@ -93,7 +93,7 @@ public class PortletAppDescriptorServiceImpl implements PortletAppDescriptorServ
}
else if ("3.0".equals(version))
{
- adjustedNamespaceURI = "http://java.sun.com/xml/ns/portlet/portlet-app_3_0.xsd";
+ adjustedNamespaceURI = "http://xmlns.jcp.org/xml/ns/portlet";
}
}
return eventCode;
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/ObjectFactory.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/ObjectFactory.java b/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/ObjectFactory.java
index 73ed471..b3edf02 100644
--- a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/ObjectFactory.java
+++ b/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/ObjectFactory.java
@@ -33,7 +33,7 @@ import javax.xml.namespace.QName;
@XmlRegistry
public class ObjectFactory
{
- private final static QName _PortletApp_QNAME = new QName("http://java.sun.com/xml/ns/portlet/portlet-app_3_0.xsd",
+ private final static QName _PortletApp_QNAME = new QName("http://xmlns.jcp.org/xml/ns/portlet",
"portlet-app");
public ObjectFactory()
@@ -45,7 +45,7 @@ public class ObjectFactory
return new PortletAppType();
}
- @XmlElementDecl(namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_3_0.xsd", name = "portlet-app")
+ @XmlElementDecl(namespace = "http://xmlns.jcp.org/xml/ns/portlet", name = "portlet-app")
public JAXBElement<PortletAppType> createPortletApp(PortletAppType value)
{
return new JAXBElement<PortletAppType>(_PortletApp_QNAME, PortletAppType.class, null, value);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/PortletAppType.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/PortletAppType.java b/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/PortletAppType.java
index 551e01d..1a662ef 100644
--- a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/PortletAppType.java
+++ b/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/PortletAppType.java
@@ -117,7 +117,7 @@ public class PortletAppType implements PortletApplicationDefinition
@XmlElement(name = "container-runtime-option")
protected List<ContainerRuntimeOptionType> containerRuntimeOption;
@XmlAttribute(required = true)
- protected String version = JSR_362_VERSION;
+ protected String version;
@XmlTransient
protected String name;
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/package-info.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/package-info.java b/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/package-info.java
index 2d2d07e..f61841d 100644
--- a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/package-info.java
+++ b/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/package-info.java
@@ -16,6 +16,6 @@
*
* @version $Id$
*/
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_3_0.xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://xmlns.jcp.org/xml/ns/portlet", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.apache.pluto.container.om.portlet30.impl;
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_3_0.xsd
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_3_0.xsd b/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_3_0.xsd
index 65ccac8..524b494 100644
--- a/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_3_0.xsd
+++ b/pluto-container/src/main/resources/org/apache/pluto/container/impl/portlet-app_3_0.xsd
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:portlet="http://java.sun.com/xml/ns/portlet/portlet-app_3_0.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://java.sun.com/xml/ns/portlet/portlet-app_3_0.xsd" elementFormDefault="qualified" attributeFormDefault="unqualified" version="3.0" xml:lang="en">
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:portlet="http://xmlns.jcp.org/xml/ns/portlet"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://xmlns.jcp.org/xml/ns/portlet"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="3.0"
+ xml:lang="en">
<annotation>
<documentation>
This is the XML Schema for the Portlet 3.0 deployment descriptor.
@@ -27,7 +34,7 @@
The portlet-app element is the root of the deployment descriptor
for a portlet application. This element has a required attribute version
to specify to which version of the schema the deployment descriptor
- conforms. In order to be a valid JSR 286 portlet application the version
+ conforms. In order to be a valid JSR 362 portlet application the version
must have the value "3.0".
</documentation>
</annotation>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/pluto-portal/src/main/webapp/WEB-INF/tld/portlet-el_3_0.tld
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/WEB-INF/tld/portlet-el_3_0.tld b/pluto-portal/src/main/webapp/WEB-INF/tld/portlet-el_3_0.tld
new file mode 100644
index 0000000..472a158
--- /dev/null
+++ b/pluto-portal/src/main/webapp/WEB-INF/tld/portlet-el_3_0.tld
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE taglib PUBLIC
+ "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+ "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd">
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<taglib>
+ <tlib-version>2.0</tlib-version>
+ <jsp-version>1.2</jsp-version>
+ <short-name>portlet_3_0-el</short-name>
+ <uri>http://portals.apache.org/pluto/portlet-el_3_0</uri>
+ <tag>
+ <name>defineObjects</name>
+ <tag-class>org.apache.pluto.tags.DefineObjectsTag286</tag-class>
+ <tei-class>org.apache.pluto.tags.DefineObjectsTag286$TEI</tei-class>
+ <body-content>empty</body-content>
+ </tag>
+ <tag>
+ <name>param</name>
+ <tag-class>org.apache.pluto.tags.el.ParamTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <name>name</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>value</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>property</name>
+ <tag-class>org.apache.pluto.tags.el.PropertyTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <name>name</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>value</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>actionURL</name>
+ <tag-class>org.apache.pluto.tags.ActionURLTag286</tag-class>
+ <tei-class>org.apache.pluto.tags.PortletURLTag168$TEI</tei-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <name>windowState</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>portletMode</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>var</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>secure</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>copyCurrentRenderParameters</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>escapeXml</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>name</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>renderURL</name>
+ <tag-class>org.apache.pluto.tags.RenderURLTag286</tag-class>
+ <tei-class>org.apache.pluto.tags.PortletURLTag168$TEI</tei-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <name>windowState</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>portletMode</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>secure</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>var</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>copyCurrentRenderParameters</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>escapeXml</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>resourceURL</name>
+ <tag-class>org.apache.pluto.tags.ResourceURLTag286</tag-class>
+ <tei-class>org.apache.pluto.tags.BaseURLTag$TEI</tei-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <name>var</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>secure</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>escapeXml</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>id</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>cacheability</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>namespace</name>
+ <tag-class>org.apache.pluto.tags.NamespaceTag</tag-class>
+ <body-content>empty</body-content>
+ </tag>
+</taglib>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/pluto-portal/src/main/webapp/WEB-INF/tld/portlet_3_0.tld
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/WEB-INF/tld/portlet_3_0.tld b/pluto-portal/src/main/webapp/WEB-INF/tld/portlet_3_0.tld
new file mode 100644
index 0000000..87f1b36
--- /dev/null
+++ b/pluto-portal/src/main/webapp/WEB-INF/tld/portlet_3_0.tld
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE taglib PUBLIC
+ "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+ "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<taglib>
+ <tlib-version>2.0</tlib-version>
+ <jsp-version>1.2</jsp-version>
+ <short-name>portlet_3_0</short-name>
+ <uri>http://xmlns.jcp.org/portlet_3_0</uri>
+ <description>Pluto Tag Library</description>
+ <tag>
+ <name>defineObjects</name>
+ <tag-class>org.apache.pluto.tags.DefineObjectsTag286</tag-class>
+ <tei-class>org.apache.pluto.tags.DefineObjectsTag286$TEI</tei-class>
+ <body-content>empty</body-content>
+ </tag>
+ <tag>
+ <name>param</name>
+ <tag-class>org.apache.pluto.tags.ParamTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <name>name</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>value</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>property</name>
+ <tag-class>org.apache.pluto.tags.PropertyTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <name>name</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>value</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>actionURL</name>
+ <tag-class>org.apache.pluto.tags.ActionURLTag286</tag-class>
+ <tei-class>org.apache.pluto.tags.PortletURLTag168$TEI</tei-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <name>windowState</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>portletMode</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>var</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>secure</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>copyCurrentRenderParameters</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>escapeXml</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>name</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>renderURL</name>
+ <tag-class>org.apache.pluto.tags.RenderURLTag286</tag-class>
+ <tei-class>org.apache.pluto.tags.PortletURLTag168$TEI</tei-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <name>windowState</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>portletMode</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>secure</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>var</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>copyCurrentRenderParameters</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>escapeXml</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>resourceURL</name>
+ <tag-class>org.apache.pluto.tags.ResourceURLTag286</tag-class>
+ <tei-class>org.apache.pluto.tags.BaseURLTag$TEI</tei-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <name>var</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>secure</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>escapeXml</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>id</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>cacheability</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>namespace</name>
+ <tag-class>org.apache.pluto.tags.NamespaceTag</tag-class>
+ <body-content>empty</body-content>
+ </tag>
+</taglib>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/pluto-taglib/src/main/resources/META-INF/portlet-el_3_0.tld
----------------------------------------------------------------------
diff --git a/pluto-taglib/src/main/resources/META-INF/portlet-el_3_0.tld b/pluto-taglib/src/main/resources/META-INF/portlet-el_3_0.tld
new file mode 100644
index 0000000..472a158
--- /dev/null
+++ b/pluto-taglib/src/main/resources/META-INF/portlet-el_3_0.tld
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE taglib PUBLIC
+ "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+ "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd">
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<taglib>
+ <tlib-version>2.0</tlib-version>
+ <jsp-version>1.2</jsp-version>
+ <short-name>portlet_3_0-el</short-name>
+ <uri>http://portals.apache.org/pluto/portlet-el_3_0</uri>
+ <tag>
+ <name>defineObjects</name>
+ <tag-class>org.apache.pluto.tags.DefineObjectsTag286</tag-class>
+ <tei-class>org.apache.pluto.tags.DefineObjectsTag286$TEI</tei-class>
+ <body-content>empty</body-content>
+ </tag>
+ <tag>
+ <name>param</name>
+ <tag-class>org.apache.pluto.tags.el.ParamTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <name>name</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>value</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>property</name>
+ <tag-class>org.apache.pluto.tags.el.PropertyTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <name>name</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>value</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>actionURL</name>
+ <tag-class>org.apache.pluto.tags.ActionURLTag286</tag-class>
+ <tei-class>org.apache.pluto.tags.PortletURLTag168$TEI</tei-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <name>windowState</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>portletMode</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>var</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>secure</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>copyCurrentRenderParameters</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>escapeXml</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>name</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>renderURL</name>
+ <tag-class>org.apache.pluto.tags.RenderURLTag286</tag-class>
+ <tei-class>org.apache.pluto.tags.PortletURLTag168$TEI</tei-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <name>windowState</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>portletMode</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>secure</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>var</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>copyCurrentRenderParameters</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>escapeXml</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>resourceURL</name>
+ <tag-class>org.apache.pluto.tags.ResourceURLTag286</tag-class>
+ <tei-class>org.apache.pluto.tags.BaseURLTag$TEI</tei-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <name>var</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>secure</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>escapeXml</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>id</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>cacheability</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>namespace</name>
+ <tag-class>org.apache.pluto.tags.NamespaceTag</tag-class>
+ <body-content>empty</body-content>
+ </tag>
+</taglib>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/85aa8874/pluto-taglib/src/main/resources/META-INF/portlet_3_0.tld
----------------------------------------------------------------------
diff --git a/pluto-taglib/src/main/resources/META-INF/portlet_3_0.tld b/pluto-taglib/src/main/resources/META-INF/portlet_3_0.tld
new file mode 100644
index 0000000..87f1b36
--- /dev/null
+++ b/pluto-taglib/src/main/resources/META-INF/portlet_3_0.tld
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE taglib PUBLIC
+ "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+ "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<taglib>
+ <tlib-version>2.0</tlib-version>
+ <jsp-version>1.2</jsp-version>
+ <short-name>portlet_3_0</short-name>
+ <uri>http://xmlns.jcp.org/portlet_3_0</uri>
+ <description>Pluto Tag Library</description>
+ <tag>
+ <name>defineObjects</name>
+ <tag-class>org.apache.pluto.tags.DefineObjectsTag286</tag-class>
+ <tei-class>org.apache.pluto.tags.DefineObjectsTag286$TEI</tei-class>
+ <body-content>empty</body-content>
+ </tag>
+ <tag>
+ <name>param</name>
+ <tag-class>org.apache.pluto.tags.ParamTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <name>name</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>value</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>property</name>
+ <tag-class>org.apache.pluto.tags.PropertyTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <name>name</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>value</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>actionURL</name>
+ <tag-class>org.apache.pluto.tags.ActionURLTag286</tag-class>
+ <tei-class>org.apache.pluto.tags.PortletURLTag168$TEI</tei-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <name>windowState</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>portletMode</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>var</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>secure</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>copyCurrentRenderParameters</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>escapeXml</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>name</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>renderURL</name>
+ <tag-class>org.apache.pluto.tags.RenderURLTag286</tag-class>
+ <tei-class>org.apache.pluto.tags.PortletURLTag168$TEI</tei-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <name>windowState</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>portletMode</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>secure</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>var</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>copyCurrentRenderParameters</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>escapeXml</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>resourceURL</name>
+ <tag-class>org.apache.pluto.tags.ResourceURLTag286</tag-class>
+ <tei-class>org.apache.pluto.tags.BaseURLTag$TEI</tei-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <name>var</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>secure</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>escapeXml</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>id</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>cacheability</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>namespace</name>
+ <tag-class>org.apache.pluto.tags.NamespaceTag</tag-class>
+ <body-content>empty</body-content>
+ </tag>
+</taglib>