geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r944981 - in /geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF: themes/portlet-skin.jsp tld/pluto.tld tld/portlet-el_2_0.tld tld/portlet_2_0.tld web.xml
Date Mon, 17 May 2010 06:08:50 GMT
Author: xuhaihong
Date: Mon May 17 06:08:50 2010
New Revision: 944981

URL: http://svn.apache.org/viewvc?rev=944981&view=rev
Log:
Add/Update portlet 2.0 tld files and fix the image urls

Added:
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/tld/portlet-el_2_0.tld
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/tld/portlet_2_0.tld
Modified:
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/tld/pluto.tld
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp?rev=944981&r1=944980&r2=944981&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
Mon May 17 06:08:50 2010
@@ -33,9 +33,9 @@ limitations under the License.
       <pluto:modeAnchor portletMode="edit"/>
       <pluto:modeAnchor portletMode="help"/>
       <!-- Window State Controls -->
-      <pluto:windowStateAnchor windowState="minimized"/>
-      <pluto:windowStateAnchor windowState="maximized"/>
-      <pluto:windowStateAnchor windowState="normal"/>
+      <pluto:windowStateAnchor windowState="minimized" icon='<%= (request.getContextPath()
+ "/images/controls/min.png")%>' />
+      <pluto:windowStateAnchor windowState="maximized" icon='<%= request.getContextPath()
+ "/images/controls/max.png"%>'/>
+      <pluto:windowStateAnchor windowState="normal" icon='<%= request.getContextPath()
+ "/images/controls/norm.png"%>'/>
       <a href="<pluto:url windowState="minimized"/>"><span class="min"></span></a>
       <a href="<pluto:url windowState="maximized"/>"><span class="max"></span></a>
       <a href="<pluto:url windowState="normal"/>"><span class="norm"></span></a>

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/tld/pluto.tld
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/tld/pluto.tld?rev=944981&r1=944980&r2=944981&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/tld/pluto.tld
(original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/tld/pluto.tld
Mon May 17 06:08:50 2010
@@ -51,6 +51,12 @@ limitations under the License.
       <rtexprvalue>false</rtexprvalue>
     </attribute>
   </tag>
+
+  <tag>
+    <name>modeDropDown</name>
+    <tagclass>org.apache.pluto.driver.tags.PortletModeDropDownTag</tagclass>
+    <bodycontent>empty</bodycontent>
+  </tag>
   
   <tag>
     <name>windowStateAnchor</name>
@@ -61,6 +67,11 @@ limitations under the License.
       <required>true</required>
       <rtexprvalue>false</rtexprvalue>
     </attribute>
+    <attribute>
+      <name>icon</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
   </tag>
      
   <tag>

Added: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/tld/portlet-el_2_0.tld
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/tld/portlet-el_2_0.tld?rev=944981&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/tld/portlet-el_2_0.tld
(added)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/tld/portlet-el_2_0.tld
Mon May 17 06:08:50 2010
@@ -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_2_0-el</short-name>
+    <uri>http://portals.apache.org/pluto/portlet-el_2_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>

Added: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/tld/portlet_2_0.tld
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/tld/portlet_2_0.tld?rev=944981&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/tld/portlet_2_0.tld
(added)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/tld/portlet_2_0.tld
Mon May 17 06:08:50 2010
@@ -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_2_0</short-name>
+    <uri>http://java.sun.com/portlet_2_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>

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml?rev=944981&r1=944980&r2=944981&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml
Mon May 17 06:08:50 2010
@@ -260,15 +260,25 @@ limitations under the License.
   </taglib>
 
   <taglib>
+    <taglib-uri>http://java.sun.com/portlet_2_0</taglib-uri>
+    <taglib-location>/WEB-INF/tld/portlet_2_0.tld</taglib-location>
+  </taglib>
+
+  <taglib>
     <taglib-uri>http://portals.apache.org/pluto/portlet-el</taglib-uri>
     <taglib-location>/WEB-INF/tld/portlet-el.tld</taglib-location>
   </taglib>
+  
+  <taglib>
+    <taglib-uri>http://portals.apache.org/pluto/portlet-el_2_0</taglib-uri>
+    <taglib-location>/WEB-INF/tld/portlet-el_2_0.tld</taglib-location>
+  </taglib>
 
   <taglib>
     <taglib-uri>http://portals.apache.org/pluto</taglib-uri>
     <taglib-location>/WEB-INF/tld/pluto.tld</taglib-location>
   </taglib>
-
+  
   <security-constraint>
     <web-resource-collection>
       <web-resource-name>Login and HTTPS Required</web-resource-name>



Mime
View raw message