[struts-menu-cvs] navigator/src/conf/META-INF struts-menu-el.tld, 1.3, 1.4 struts-menu.tld, 1.5, 1.6

[Matt R. <mr...@us...>]

Update of /cvsroot/struts-menu/navigator/src/conf/META-INF
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11297/src/conf/META-INF

Modified Files:
	struts-menu-el.tld struts-menu.tld 
Log Message:
SM-83: Fixed tlibversion - fails in Geronimo 2.x

Index: struts-menu.tld
===================================================================
RCS file: /cvsroot/struts-menu/navigator/src/conf/META-INF/struts-menu.tld,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** struts-menu.tld	12 May 2006 19:52:25 -0000	1.5
--- struts-menu.tld	25 Jun 2007 03:19:58 -0000	1.6
***************
*** 1,74 ****
! <?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/dtd/web-jsptaglibrary_1_1.dtd">
! 
! <taglib>
! 
!   <!-- ============== Tag Library Description Elements ============= -->
!   <tlibversion>2.2-dev</tlibversion>
!   <jspversion>1.1</jspversion>
!   <shortname>menu</shortname>
!   <uri>http://struts-menu.sf.net/tag</uri>
!   <info>
!   	The struts-menu provides a XML configurable
!   	menu-ing system for your Struts applications.
!   </info>
!   
!     <tag>
!       <name>useMenuDisplayer</name>
!       <tagclass>net.sf.navigator.taglib.UseMenuDisplayerTag</tagclass>
!       <bodycontent>JSP</bodycontent>
!       <attribute>
!           <name>id</name>
!           <required>false</required>
!           <rtexprvalue>true</rtexprvalue>
!       </attribute>
!       <attribute>
!           <name>name</name>
!           <required>true</required>
!           <rtexprvalue>true</rtexprvalue>
!       </attribute>
!       <attribute>
!           <name>bundle</name>
!           <required>false</required>
!           <rtexprvalue>true</rtexprvalue>  
!       </attribute>
!       <attribute>
!           <name>config</name>
!           <required>false</required>
!           <rtexprvalue>true</rtexprvalue>  
!       </attribute>
!       <attribute>
!           <name>locale</name>
!           <required>false</required>
!           <rtexprvalue>true</rtexprvalue> 
!       </attribute>
!       <attribute>
!           <name>permissions</name>
!           <required>false</required>
!           <rtexprvalue>true</rtexprvalue> 
!       </attribute>
!       <attribute>
!           <name>repository</name>
!           <required>false</required>
!           <rtexprvalue>true</rtexprvalue>
!       </attribute>
!     </tag>
! 
!     <tag>
!       <name>displayMenu</name>
!       <tagclass>net.sf.navigator.taglib.DisplayMenuTag</tagclass>
!       <attribute>
!           <name>name</name>
!           <required>true</required>
!           <rtexprvalue>true</rtexprvalue>  
!       </attribute>
!       <attribute>
!           <name>target</name>
!           <required>false</required>
!           <rtexprvalue>false</rtexprvalue>  
!       </attribute>
!     </tag>
! 
! </taglib>
--- 1,74 ----
! <?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/dtd/web-jsptaglibrary_1_1.dtd">
! 
! <taglib>
! 
!   <!-- ============== Tag Library Description Elements ============= -->
!   <tlibversion>2.1</tlibversion>
!   <jspversion>1.1</jspversion>
!   <shortname>menu</shortname>
!   <uri>http://struts-menu.sf.net/tag</uri>
!   <info>
!   	The struts-menu provides a XML configurable
!   	menu-ing system for your Struts applications.
!   </info>
!   
!     <tag>
!       <name>useMenuDisplayer</name>
!       <tagclass>net.sf.navigator.taglib.UseMenuDisplayerTag</tagclass>
!       <bodycontent>JSP</bodycontent>
!       <attribute>
!           <name>id</name>
!           <required>false</required>
!           <rtexprvalue>true</rtexprvalue>
!       </attribute>
!       <attribute>
!           <name>name</name>
!           <required>true</required>
!           <rtexprvalue>true</rtexprvalue>
!       </attribute>
!       <attribute>
!           <name>bundle</name>
!           <required>false</required>
!           <rtexprvalue>true</rtexprvalue>  
!       </attribute>
!       <attribute>
!           <name>config</name>
!           <required>false</required>
!           <rtexprvalue>true</rtexprvalue>  
!       </attribute>
!       <attribute>
!           <name>locale</name>
!           <required>false</required>
!           <rtexprvalue>true</rtexprvalue> 
!       </attribute>
!       <attribute>
!           <name>permissions</name>
!           <required>false</required>
!           <rtexprvalue>true</rtexprvalue> 
!       </attribute>
!       <attribute>
!           <name>repository</name>
!           <required>false</required>
!           <rtexprvalue>true</rtexprvalue>
!       </attribute>
!     </tag>
! 
!     <tag>
!       <name>displayMenu</name>
!       <tagclass>net.sf.navigator.taglib.DisplayMenuTag</tagclass>
!       <attribute>
!           <name>name</name>
!           <required>true</required>
!           <rtexprvalue>true</rtexprvalue>  
!       </attribute>
!       <attribute>
!           <name>target</name>
!           <required>false</required>
!           <rtexprvalue>false</rtexprvalue>  
!       </attribute>
!     </tag>
! 
! </taglib>

Index: struts-menu-el.tld
===================================================================
RCS file: /cvsroot/struts-menu/navigator/src/conf/META-INF/struts-menu-el.tld,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** struts-menu-el.tld	12 May 2006 19:52:25 -0000	1.3
--- struts-menu-el.tld	25 Jun 2007 03:19:58 -0000	1.4
***************
*** 1,76 ****
! <?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">
! 
! <taglib>
! 
!   <!-- ============== Tag Library Description Elements ============= -->
! 
!   <tlib-version>2.2-dev</tlib-version>
!   <jsp-version>1.2</jsp-version>
!   <short-name>menu</short-name>
!   <uri>http://struts-menu.sf.net/tag-el</uri>
!   <description>
!   	The struts-menu provides a XML configurable menu-ing system for your 
!   	Struts applications. This TLD is for the Expression Language enabled 
!   	version.  Also, this is a JSP 1.2 TLD whereas the regular tld is JSP 1.1.
!   </description>
!   
!     <tag>
!       <name>useMenuDisplayer</name>
!       <tag-class>net.sf.navigator.taglib.el.UseMenuDisplayerTag</tag-class>
!       <body-content>JSP</body-content>
!       <attribute>
!           <name>id</name>
!           <required>false</required>
!           <rtexprvalue>true</rtexprvalue>
!       </attribute>
!       <attribute>
!           <name>name</name>
!           <required>true</required>
!           <rtexprvalue>true</rtexprvalue>
!       </attribute>
!       <attribute>
!           <name>bundle</name>
!           <required>false</required>
!           <rtexprvalue>true</rtexprvalue>  
!       </attribute>
!       <attribute>
!           <name>config</name>
!           <required>false</required>
!           <rtexprvalue>true</rtexprvalue>  
!       </attribute>
!       <attribute>
!           <name>locale</name>
!           <required>false</required>
!           <rtexprvalue>true</rtexprvalue> 
!       </attribute>
!       <attribute>
!           <name>permissions</name>
!           <required>false</required>
!           <rtexprvalue>true</rtexprvalue> 
!       </attribute>
!       <attribute>
!           <name>repository</name>
!           <required>false</required>
!           <rtexprvalue>true</rtexprvalue>
!       </attribute>
!     </tag>
!     
!     <tag>
!       <name>displayMenu</name>
!       <tag-class>net.sf.navigator.taglib.el.DisplayMenuTag</tag-class>
!       <attribute>
!           <name>name</name>
!           <required>true</required>
!           <rtexprvalue>true</rtexprvalue>  
!       </attribute>
!       <attribute>
!           <name>target</name>
!           <required>false</required>
!           <rtexprvalue>false</rtexprvalue>  
!       </attribute>
!     </tag>
! 
! </taglib>
--- 1,75 ----
! <?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">
! 
! <taglib>
! 
!   <!-- ============== Tag Library Description Elements ============= -->
!   <tlib-version>1.2</tlib-version>
!   <jsp-version>1.2</jsp-version>
!   <short-name>menu</short-name>
!   <uri>http://struts-menu.sf.net/tag-el</uri>
!   <description>
!   	The struts-menu provides a XML configurable menu-ing system for your 
!   	Struts applications. This TLD is for the Expression Language enabled 
!   	version.  Also, this is a JSP 1.2 TLD whereas the regular tld is JSP 1.1.
!   </description>
!   
!     <tag>
!       <name>useMenuDisplayer</name>
!       <tag-class>net.sf.navigator.taglib.el.UseMenuDisplayerTag</tag-class>
!       <body-content>JSP</body-content>
!       <attribute>
!           <name>id</name>
!           <required>false</required>
!           <rtexprvalue>true</rtexprvalue>
!       </attribute>
!       <attribute>
!           <name>name</name>
!           <required>true</required>
!           <rtexprvalue>true</rtexprvalue>
!       </attribute>
!       <attribute>
!           <name>bundle</name>
!           <required>false</required>
!           <rtexprvalue>true</rtexprvalue>  
!       </attribute>
!       <attribute>
!           <name>config</name>
!           <required>false</required>
!           <rtexprvalue>true</rtexprvalue>  
!       </attribute>
!       <attribute>
!           <name>locale</name>
!           <required>false</required>
!           <rtexprvalue>true</rtexprvalue> 
!       </attribute>
!       <attribute>
!           <name>permissions</name>
!           <required>false</required>
!           <rtexprvalue>true</rtexprvalue> 
!       </attribute>
!       <attribute>
!           <name>repository</name>
!           <required>false</required>
!           <rtexprvalue>true</rtexprvalue>
!       </attribute>
!     </tag>
!     
!     <tag>
!       <name>displayMenu</name>
!       <tag-class>net.sf.navigator.taglib.el.DisplayMenuTag</tag-class>
!       <attribute>
!           <name>name</name>
!           <required>true</required>
!           <rtexprvalue>true</rtexprvalue>  
!       </attribute>
!       <attribute>
!           <name>target</name>
!           <required>false</required>
!           <rtexprvalue>false</rtexprvalue>  
!       </attribute>
!     </tag>
! 
! </taglib>