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 cd...@apache.org on 2007/10/20 05:47:32 UTC
svn commit: r586662 - in
/portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/resources/META-INF:
portlet-el.tld portlet.tld
Author: cdoremus
Date: Fri Oct 19 20:47:31 2007
New Revision: 586662
URL: http://svn.apache.org/viewvc?rev=586662&view=rev
Log:
This should have been committed with other PLUTO-408 changes.
Modified:
portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/resources/META-INF/portlet-el.tld
portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/resources/META-INF/portlet.tld
Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/resources/META-INF/portlet-el.tld
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/resources/META-INF/portlet-el.tld?rev=586662&r1=586661&r2=586662&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/resources/META-INF/portlet-el.tld (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-taglib/src/main/resources/META-INF/portlet-el.tld Fri Oct 19 20:47:31 2007
@@ -3,11 +3,11 @@
"-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
"http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.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
@@ -46,6 +46,21 @@
<rtexprvalue>false</rtexprvalue>
</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>
@@ -137,7 +152,17 @@
<name>escapeXml</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
- </attribute>
+ </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>
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=586662&r1=586661&r2=586662&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 Fri Oct 19 20:47:31 2007
@@ -3,11 +3,11 @@
"-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
"http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.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
@@ -47,6 +47,21 @@
</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>
@@ -137,7 +152,17 @@
<name>escapeXml</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
- </attribute>
+ </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>