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 de...@apache.org on 2007/12/10 20:45:24 UTC

svn commit: r603014 [2/2] - in /portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main: java/org/apache/pluto/tags/ java/org/apache/pluto/tags/el/ resources/META-INF/

Added: portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/resources/META-INF/portlet-el_2_0.tld
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/resources/META-INF/portlet-el_2_0.tld?rev=603014&view=auto
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/resources/META-INF/portlet-el_2_0.tld (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/resources/META-INF/portlet-el_2_0.tld Mon Dec 10 11:45:21 2007
@@ -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>portlet2-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.PortletURLTag286$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.PortletURLTag286$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: portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/resources/META-INF/portlet.tld
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/resources/META-INF/portlet.tld?rev=603014&r1=603013&r2=603014&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/resources/META-INF/portlet.tld (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/resources/META-INF/portlet.tld Mon Dec 10 11:45:21 2007
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE taglib PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
-  "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+  "-//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
+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
@@ -21,20 +21,20 @@
 limitations under the License.
 -->
 <taglib>
-    <tlibversion>1.0</tlibversion>
-    <jspversion>1.1</jspversion>
-    <shortname>portlet</shortname>
+    <tlib-version>1.0</tlib-version>
+    <jsp-version>1.2</jsp-version>
+    <short-name>portlet</short-name>
     <uri>http://java.sun.com/portlet</uri>
     <tag>
         <name>defineObjects</name>
-        <tagclass>org.apache.pluto.tags.DefineObjectsTag</tagclass>
-        <teiclass>org.apache.pluto.tags.DefineObjectsTag$TEI</teiclass>
-        <bodycontent>empty</bodycontent>
+        <tag-class>org.apache.pluto.tags.DefineObjectsTag168</tag-class>
+        <tei-class>org.apache.pluto.tags.DefineObjectsTag168$TEI</tei-class>
+        <body-content>empty</body-content>
     </tag>
     <tag>
         <name>param</name>
-        <tagclass>org.apache.pluto.tags.ParamTag</tagclass>
-        <bodycontent>empty</bodycontent>
+        <tag-class>org.apache.pluto.tags.ParamTag</tag-class>
+        <body-content>empty</body-content>
         <attribute>
             <name>name</name>
             <required>true</required>
@@ -47,25 +47,10 @@
         </attribute>
     </tag>
     <tag>
-        <name>property</name>
-        <tagclass>org.apache.pluto.tags.PropertyTag</tagclass>
-        <bodycontent>empty</bodycontent>
-        <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>
-        <tagclass>org.apache.pluto.tags.ActionURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.PortletURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
+        <tag-class>org.apache.pluto.tags.ActionURLTag168</tag-class>
+        <tei-class>org.apache.pluto.tags.PortletURLTag168$TEI</tei-class>
+        <body-content>JSP</body-content>
         <attribute>
             <name>windowState</name>
             <required>false</required>
@@ -76,32 +61,22 @@
             <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>
+            <name>var</name>
             <required>false</required>
             <rtexprvalue>true</rtexprvalue>
         </attribute>
     </tag>
     <tag>
         <name>renderURL</name>
-        <tagclass>org.apache.pluto.tags.RenderURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.PortletURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
+        <tag-class>org.apache.pluto.tags.RenderURLTag168</tag-class>
+        <tei-class>org.apache.pluto.tags.PortletURLTag168$TEI</tei-class>
+        <body-content>JSP</body-content>
         <attribute>
             <name>windowState</name>
             <required>false</required>
@@ -122,51 +97,10 @@
             <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>
-        <tagclass>org.apache.pluto.tags.ResourceURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.BaseURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
-        <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>
-        <tagclass>org.apache.pluto.tags.NamespaceTag</tagclass>
-        <bodycontent>empty</bodycontent>
+        <tag-class>org.apache.pluto.tags.NamespaceTag</tag-class>
+        <body-content>empty</body-content>
     </tag>
-</taglib>
+</taglib>
\ No newline at end of file

Added: portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/resources/META-INF/portlet_2_0.tld
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/resources/META-INF/portlet_2_0.tld?rev=603014&view=auto
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/resources/META-INF/portlet_2_0.tld (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/resources/META-INF/portlet_2_0.tld Mon Dec 10 11:45:21 2007
@@ -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>portlet2</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.PortletURLTag286$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.PortletURLTag286$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>