Menu
▾
▴
openutils-svn
|
From: <fg...@us...> - 2007-01-05 16:55:49
|
Revision: 149
http://svn.sourceforge.net/openutils/?rev=149&view=rev
Author: fgiust
Date: 2007-01-05 08:55:48 -0800 (Fri, 05 Jan 2007)
Log Message:
-----------
new taglib URIs plus minor fixes
Modified Paths:
--------------
trunk/openutils-tags-spring/src/main/java/it/openutils/web/jstl/DaoFunctions.java
trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-dao.tld
trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-elx.tld
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/button.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/buttons.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/checkbox.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/compositeproperty.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/date.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/daterange.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/debug.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docbutton.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docframe.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docprintbutton.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docsvg.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/errorbox.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/li.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/messages.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/na.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/select.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/tablelang.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/text.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtinput.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtoption.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtselect.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txttextarea.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/ul.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/url.tag
Added Paths:
-----------
trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-commonslang.tld
Removed Paths:
-------------
trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-su.tld
Modified: trunk/openutils-tags-spring/src/main/java/it/openutils/web/jstl/DaoFunctions.java
===================================================================
--- trunk/openutils-tags-spring/src/main/java/it/openutils/web/jstl/DaoFunctions.java 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/java/it/openutils/web/jstl/DaoFunctions.java 2007-01-05 16:55:48 UTC (rev 149)
@@ -6,7 +6,8 @@
import javax.servlet.jsp.PageContext;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -22,7 +23,7 @@
/**
* Logger.
*/
- private static Logger log = Logger.getLogger(DaoFunctions.class);
+ private static Logger log = LoggerFactory.getLogger(DaoFunctions.class);
/**
* Call findAll on a given DAO and retuns the result. The findAll method is caled using reflection, so the DAO
Copied: trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-commonslang.tld (from rev 148, trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-su.tld)
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-commonslang.tld (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-commonslang.tld 2007-01-05 16:55:48 UTC (rev 149)
@@ -0,0 +1,54 @@
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+ version="2.0">
+ <description>jakarta commons-lang EL functions</description>
+ <display-name>Commons lang EL library</display-name>
+ <tlib-version>1.2</tlib-version>
+ <short-name>commonslang</short-name>
+ <uri>http://openutils.sourceforge.net/openutils-tags-commonslang</uri>
+ <function>
+ <name>substringAfter</name>
+ <function-class>org.apache.commons.lang.StringUtils</function-class>
+ <function-signature>java.lang.String substringAfter(java.lang.String, java.lang.String)</function-signature>
+ </function>
+ <function>
+ <name>substringBefore</name>
+ <function-class>org.apache.commons.lang.StringUtils</function-class>
+ <function-signature>java.lang.String substringBefore(java.lang.String, java.lang.String)</function-signature>
+ </function>
+ <function>
+ <name>substringAfterLast</name>
+ <function-class>org.apache.commons.lang.StringUtils</function-class>
+ <function-signature>java.lang.String substringAfterLast(java.lang.String, java.lang.String)</function-signature>
+ </function>
+ <function>
+ <name>substringBeforeLast</name>
+ <function-class>org.apache.commons.lang.StringUtils</function-class>
+ <function-signature>java.lang.String substringBeforeLast(java.lang.String, java.lang.String)</function-signature>
+ </function>
+ <function>
+ <name>indexOf</name>
+ <function-class>org.apache.commons.lang.StringUtils</function-class>
+ <function-signature>int indexOf(java.lang.String, java.lang.String)</function-signature>
+ </function>
+ <function>
+ <name>split</name>
+ <function-class>org.apache.commons.lang.StringUtils</function-class>
+ <function-signature>java.lang.String[] split(java.lang.String, java.lang.String)</function-signature>
+ </function>
+ <function>
+ <name>contains</name>
+ <function-class>org.apache.commons.lang.ArrayUtils</function-class>
+ <function-signature>boolean contains(java.lang.Object[], java.lang.Object)</function-signature>
+ </function>
+ <function>
+ <name>getFullStackTrace</name>
+ <function-class>org.apache.commons.lang.exception.ExceptionUtils</function-class>
+ <function-signature>java.lang.String getFullStackTrace(java.lang.Throwable)</function-signature>
+ </function>
+ <function>
+ <name>escapeXml</name>
+ <function-class>org.apache.commons.lang.StringEscapeUtils</function-class>
+ <function-signature>java.lang.String escapeXml(java.lang.String)</function-signature>
+ </function>
+</taglib>
\ No newline at end of file
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-dao.tld
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-dao.tld 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-dao.tld 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,13 +1,14 @@
<taglib xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" version="2.0">
- <description>DAO Tag Library</description>
- <display-name>DAO extension</display-name>
- <tlib-version>1.1</tlib-version>
- <short-name>dao</short-name>
- <uri>dao</uri>
- <function>
- <name>findAll</name>
- <function-class>it.openutils.web.jstl.DaoFunctions</function-class>
- <function-signature>java.util.List findAll(javax.servlet.jsp.PageContext, java.lang.String)</function-signature>
- </function>
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+ version="2.0">
+ <description>DAO Tag Library</description>
+ <display-name>DAO extension</display-name>
+ <tlib-version>1.0</tlib-version>
+ <short-name>dao</short-name>
+ <uri>http://openutils.sourceforge.net/openutils-tags-dao</uri>
+ <function>
+ <name>findAll</name>
+ <function-class>it.openutils.web.jstl.DaoFunctions</function-class>
+ <function-signature>java.util.List findAll(javax.servlet.jsp.PageContext, java.lang.String)</function-signature>
+ </function>
</taglib>
\ No newline at end of file
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-elx.tld
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-elx.tld 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-elx.tld 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,87 +1,87 @@
<taglib xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
- version="2.0">
- <description>EL extension Tag Library</description>
- <display-name>EL extension</display-name>
- <tlib-version>1.1</tlib-version>
- <short-name>elx</short-name>
- <uri>elx</uri>
- <tag>
- <description>Converts text in the body of the tag to options tags.</description>
- <name>stringToOptions</name>
- <tag-class>it.openutils.web.jstl.StringToOptionsTag</tag-class>
- <body-content>JSP</body-content>
- <attribute>
- <description>Separator, defaults to |.</description>
- <name>separator</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
- <tag>
- <name>summary</name>
- <tag-class>it.openutils.web.tag.SummaryTag</tag-class>
- <body-content>JSP</body-content>
- <attribute>
- <name>lines</name>
- <required>true</required>
- </attribute>
- <attribute>
- <name>charsPerLine</name>
- <required>true</required>
- </attribute>
- <attribute>
- <name>ellipses</name>
- <required>false</required>
- </attribute>
- </tag>
- <function>
- <name>lang</name>
- <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
- <function-signature>Object chooseLanguage(java.lang.Object)</function-signature>
- </function>
- <function>
- <name>isempty</name>
- <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
- <function-signature>boolean isCollectionEmpty(java.lang.Object)</function-signature>
- </function>
- <function>
- <name>size</name>
- <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
- <function-signature>int getCollectionSize(java.lang.Object)</function-signature>
- </function>
- <function>
- <name>fmt</name>
- <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
- <function-signature>
- java.lang.String formatMessage(javax.servlet.jsp.PageContext, java.lang.String)
- </function-signature>
- </function>
- <function>
- <name>containsString</name>
- <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
- <function-signature>boolean containsString(java.lang.String[], java.lang.Object)</function-signature>
- </function>
- <function>
- <name>equalsString</name>
- <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
- <function-signature>boolean equalsString(java.lang.Object, java.lang.Object)</function-signature>
- </function>
- <function>
- <name>getProperty</name>
- <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
- <function-signature>java.lang.Object getProperty(java.lang.Object, java.lang.String)</function-signature>
- </function>
- <function>
- <name>space</name>
- <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
- <function-signature>java.lang.String space()</function-signature>
- </function>
- <function>
- <name>dateRange</name>
- <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
- <function-signature>
- boolean dateRange(java.util.Date, java.util.Date, java.util.Date, java.util.Date)
- </function-signature>
- </function>
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+ version="2.0">
+ <description>EL extension Tag Library</description>
+ <display-name>EL extension</display-name>
+ <tlib-version>1.0</tlib-version>
+ <short-name>elx</short-name>
+ <uri>http://openutils.sourceforge.net/openutils-tags-elx</uri>
+ <tag>
+ <description>Converts text in the body of the tag to options tags.</description>
+ <name>stringToOptions</name>
+ <tag-class>it.openutils.web.jstl.StringToOptionsTag</tag-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <description>Separator, defaults to |.</description>
+ <name>separator</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>summary</name>
+ <tag-class>it.openutils.web.tag.SummaryTag</tag-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <name>lines</name>
+ <required>true</required>
+ </attribute>
+ <attribute>
+ <name>charsPerLine</name>
+ <required>true</required>
+ </attribute>
+ <attribute>
+ <name>ellipses</name>
+ <required>false</required>
+ </attribute>
+ </tag>
+ <function>
+ <name>lang</name>
+ <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+ <function-signature>Object chooseLanguage(java.lang.Object)</function-signature>
+ </function>
+ <function>
+ <name>isempty</name>
+ <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+ <function-signature>boolean isCollectionEmpty(java.lang.Object)</function-signature>
+ </function>
+ <function>
+ <name>size</name>
+ <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+ <function-signature>int getCollectionSize(java.lang.Object)</function-signature>
+ </function>
+ <function>
+ <name>fmt</name>
+ <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+ <function-signature>
+ java.lang.String formatMessage(javax.servlet.jsp.PageContext, java.lang.String)
+ </function-signature>
+ </function>
+ <function>
+ <name>containsString</name>
+ <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+ <function-signature>boolean containsString(java.lang.String[], java.lang.Object)</function-signature>
+ </function>
+ <function>
+ <name>equalsString</name>
+ <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+ <function-signature>boolean equalsString(java.lang.Object, java.lang.Object)</function-signature>
+ </function>
+ <function>
+ <name>getProperty</name>
+ <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+ <function-signature>java.lang.Object getProperty(java.lang.Object, java.lang.String)</function-signature>
+ </function>
+ <function>
+ <name>space</name>
+ <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+ <function-signature>java.lang.String space()</function-signature>
+ </function>
+ <function>
+ <name>dateRange</name>
+ <function-class>it.openutils.web.jstl.ElxFunctions</function-class>
+ <function-signature>
+ boolean dateRange(java.util.Date, java.util.Date, java.util.Date, java.util.Date)
+ </function-signature>
+ </function>
</taglib>
\ No newline at end of file
Deleted: trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-su.tld
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-su.tld 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-su.tld 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,53 +0,0 @@
-<taglib xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" version="2.0">
- <description>jakarta commons-lang EL functions</description>
- <display-name>Commons lang EL library</display-name>
- <tlib-version>1.2</tlib-version>
- <short-name>cl</short-name>
- <uri>stringutils</uri>
- <function>
- <name>substringAfter</name>
- <function-class>org.apache.commons.lang.StringUtils</function-class>
- <function-signature>java.lang.String substringAfter(java.lang.String, java.lang.String)</function-signature>
- </function>
- <function>
- <name>substringBefore</name>
- <function-class>org.apache.commons.lang.StringUtils</function-class>
- <function-signature>java.lang.String substringBefore(java.lang.String, java.lang.String)</function-signature>
- </function>
- <function>
- <name>substringAfterLast</name>
- <function-class>org.apache.commons.lang.StringUtils</function-class>
- <function-signature>java.lang.String substringAfterLast(java.lang.String, java.lang.String)</function-signature>
- </function>
- <function>
- <name>substringBeforeLast</name>
- <function-class>org.apache.commons.lang.StringUtils</function-class>
- <function-signature>java.lang.String substringBeforeLast(java.lang.String, java.lang.String)</function-signature>
- </function>
- <function>
- <name>indexOf</name>
- <function-class>org.apache.commons.lang.StringUtils</function-class>
- <function-signature>int indexOf(java.lang.String, java.lang.String)</function-signature>
- </function>
- <function>
- <name>split</name>
- <function-class>org.apache.commons.lang.StringUtils</function-class>
- <function-signature>java.lang.String[] split(java.lang.String, java.lang.String)</function-signature>
- </function>
- <function>
- <name>contains</name>
- <function-class>org.apache.commons.lang.ArrayUtils</function-class>
- <function-signature>boolean contains(java.lang.Object[], java.lang.Object)</function-signature>
- </function>
- <function>
- <name>getFullStackTrace</name>
- <function-class>org.apache.commons.lang.exception.ExceptionUtils</function-class>
- <function-signature>java.lang.String getFullStackTrace(java.lang.Throwable)</function-signature>
- </function>
- <function>
- <name>escapeXml</name>
- <function-class>org.apache.commons.lang.StringEscapeUtils</function-class>
- <function-signature>java.lang.String escapeXml(java.lang.String)</function-signature>
- </function>
-</taglib>
\ No newline at end of file
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/button.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/button.tag 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/button.tag 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,43 +1,35 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
-
-
- <jsp:directive.attribute name="type" required="true" />
- <jsp:directive.attribute name="href" required="true" />
- <jsp:directive.attribute name="text" />
-
-
- <c:if test="${empty(text)}">
- <c:set var="text">action.${type}</c:set>
- </c:if>
-
- <c:set var="message" value="${elx:fmt(pageContext,text)}" />
-
-
- <c:choose>
- <c:when test="${type == 'delete'}">
- <c:set var="image" value="ico_delete.png" />
- </c:when>
- <c:when test="${type == 'edit'}">
- <c:set var="image" value="ico_arrow.png" />
- </c:when>
- <c:when test="${type == 'mail'}">
- <c:set var="image" value="ico_mail.png" />
- </c:when>
- <c:when test="${type == 'duplica'}">
- <c:set var="image" value="ico_saveas.png" />
- </c:when>
- <c:when test="${type == 'view'}">
- <c:set var="image" value="icon_doc_sml.png" />
- </c:when>
- <c:otherwise>
- <c:set var="image" value="ico_arrow.png" />
- </c:otherwise>
- </c:choose>
-
- <a href="${href}" title="${message}">
- <img src="${pageContext.request.contextPath}/docroot/img/${image}" alt="${message}"/>
- </a>
-
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags"
+ xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+ xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
+ xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
+ <jsp:directive.attribute name="type" required="true" />
+ <jsp:directive.attribute name="href" required="true" />
+ <jsp:directive.attribute name="text" />
+ <c:if test="${empty(text)}">
+ <c:set var="text">action.${type}</c:set>
+ </c:if>
+ <c:set var="message" value="${elx:fmt(pageContext,text)}" />
+ <c:choose>
+ <c:when test="${type == 'delete'}">
+ <c:set var="image" value="ico_delete.png" />
+ </c:when>
+ <c:when test="${type == 'edit'}">
+ <c:set var="image" value="ico_arrow.png" />
+ </c:when>
+ <c:when test="${type == 'mail'}">
+ <c:set var="image" value="ico_mail.png" />
+ </c:when>
+ <c:when test="${type == 'duplica'}">
+ <c:set var="image" value="ico_saveas.png" />
+ </c:when>
+ <c:when test="${type == 'view'}">
+ <c:set var="image" value="icon_doc_sml.png" />
+ </c:when>
+ <c:otherwise>
+ <c:set var="image" value="ico_arrow.png" />
+ </c:otherwise>
+ </c:choose>
+ <a href="${href}" title="${message}">
+ <img src="${pageContext.request.contextPath}/docroot/img/${image}" alt="${message}" />
+ </a>
</jsp:root>
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/buttons.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/buttons.tag 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/buttons.tag 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,15 +1,12 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
-
-
- <jsp:directive.attribute name="reset" required="false" type="java.lang.Boolean" />
-
- <div class="buttons">
- <c:if test="${reset}">
- <input type="reset" name="reset" id="reset" />
- </c:if>
- <input type="submit" name="save" value="save" id="save" />
- </div>
-
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags"
+ xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+ xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
+ xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
+ <jsp:directive.attribute name="reset" required="false" type="java.lang.Boolean" />
+ <div class="buttons">
+ <c:if test="${reset}">
+ <input type="reset" name="reset" id="reset" />
+ </c:if>
+ <input type="submit" name="save" value="save" id="save" />
+ </div>
</jsp:root>
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/checkbox.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/checkbox.tag 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/checkbox.tag 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,6 +1,7 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring">
+ xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
+ xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring">
<jsp:directive.attribute name="path" required="true" />
<jsp:directive.attribute name="name" required="false" />
@@ -9,19 +10,19 @@
<jsp:directive.attribute name="style" required="false" />
<spring:bind path="${path}">
- <c:if test="${empty(name)}">
- <c:set var="name">${su:substringAfter(path, ".")}</c:set>
- </c:if>
+ <c:if test="${empty(name)}">
+ <c:set var="name">${su:substringAfter(path, ".")}</c:set>
+ </c:if>
<c:choose>
<c:when test="${bare}">
<c:choose>
<c:when test="${status.value}">
- <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" checked="checked" />
+ <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" checked="checked" />
</c:when>
<c:otherwise>
- <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" />
+ <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" />
</c:otherwise>
</c:choose>
<input type="hidden" name="_${name}" />
@@ -29,35 +30,35 @@
<c:when test="${multiline}">
<c:set var="divclass">formelement <c:if test="${!empty(status.errorMessage)}"> formelementerror</c:if></c:set>
- <div class="${divclass}" style="${style}">
+ <div class="${divclass}" style="${style}">
<label for="${name}"><fmt:message key="${path}" />:</label>
<c:choose>
<c:when test="${status.value}">
- <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" checked="checked" />
+ <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" checked="checked" />
</c:when>
<c:otherwise>
- <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" />
+ <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" />
</c:otherwise>
</c:choose>
<input type="hidden" name="_${name}" />
- <div class="clear"><!-- --></div>
- </div>
+ <div class="clear"><!-- --></div>
+ </div>
</c:when>
<c:otherwise>
- <c:set var="divclass">formelementch <c:if test="${!empty(status.errorMessage)}"> formelementerror</c:if></c:set>
- <span class="${divclass}" style="${style}">
+ <c:set var="divclass">formelementch<c:if test="${!empty(status.errorMessage)}"><![CDATA[ ]]>formelementerror</c:if></c:set>
+ <span class="${divclass}" style="${style}">
<c:choose>
<c:when test="${status.value}">
- <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" checked="checked" />
+ <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" checked="checked" />
</c:when>
<c:otherwise>
- <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" />
+ <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" />
</c:otherwise>
</c:choose>
<input type="hidden" name="_${name}" />
- <jsp:text><![CDATA[ ]]></jsp:text>
+ <jsp:text><![CDATA[ ]]></jsp:text>
<span class="chlabel"><fmt:message key="${path}" /></span>
- </span>
+ </span>
</c:otherwise>
</c:choose>
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/compositeproperty.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/compositeproperty.tag 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/compositeproperty.tag 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,7 +1,7 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils"
- xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring" xmlns:elx="urn:jsptld:elx">
+ xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
+ xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
<jsp:directive.attribute name="bean" required="true" type="java.lang.Object" />
<jsp:directive.attribute name="property" required="false" />
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/date.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/date.tag 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/date.tag 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,6 +1,6 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring">
+ xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring">
<jsp:directive.attribute name="path" required="true" />
<jsp:directive.attribute name="name" required="false" />
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/daterange.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/daterange.tag 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/daterange.tag 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,5 +1,5 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt"
- xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+ xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
<jsp:directive.attribute name="from" required="true" type="java.util.Date" />
<jsp:directive.attribute name="to" required="true" type="java.util.Date" />
<!-- elimina date anteriori al 1970 -->
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/debug.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/debug.tag 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/debug.tag 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,5 +1,5 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:debug="urn:jsptld:debug" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core">
+ xmlns:debug="urn:jsptld:debug" xmlns:c="http://java.sun.com/jsp/jstl/core">
<script type="text/javascript">
<![CDATA[
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docbutton.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docbutton.tag 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docbutton.tag 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,6 +1,6 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+ xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
<jsp:directive.attribute name="type" required="true" />
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docframe.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docframe.tag 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docframe.tag 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,23 +1,19 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
-
- <jsp:directive.attribute name="width" required="false" />
- <jsp:directive.attribute name="height" required="false" />
- <jsp:directive.attribute name="doc" required="true" />
- <jsp:directive.attribute name="id" required="false" />
-
- <c:choose>
- <c:when test="${!empty(doc)}">
- <iframe src="${jspContext.request.contextPath}/docs/pdf/${doc}" width="${width}" height="${height}" id="${id}">
- <!-- a -->
- </iframe>
- </c:when>
- <c:otherwise>
-
- <![CDATA[ <!-- doc is empty --> ]]>
- </c:otherwise>
- </c:choose>
-
-
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags"
+ xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+ xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
+ xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
+ <jsp:directive.attribute name="width" required="false" />
+ <jsp:directive.attribute name="height" required="false" />
+ <jsp:directive.attribute name="doc" required="true" />
+ <jsp:directive.attribute name="id" required="false" />
+ <c:choose>
+ <c:when test="${!empty(doc)}">
+ <iframe src="${jspContext.request.contextPath}/docs/pdf/${doc}" width="${width}" height="${height}" id="${id}">
+ <!-- a -->
+ </iframe>
+ </c:when>
+ <c:otherwise>
+ <![CDATA[ <!-- doc is empty --> ]]>
+ </c:otherwise>
+ </c:choose>
</jsp:root>
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docprintbutton.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docprintbutton.tag 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docprintbutton.tag 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,6 +1,6 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+ xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
<jsp:directive.attribute name="href" required="true" />
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docsvg.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docsvg.tag 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docsvg.tag 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,6 +1,6 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+ xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
<jsp:directive.attribute name="modello" required="true" />
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/errorbox.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/errorbox.tag 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/errorbox.tag 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,5 +1,5 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core">
+ xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core">
<!--
errorbox
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,6 +1,6 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring">
+ xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring">
<jsp:directive.attribute name="path" required="true" />
<jsp:directive.attribute name="name" required="false" />
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/li.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/li.tag 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/li.tag 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,7 +1,7 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils"
- xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring" xmlns:elx="urn:jsptld:elx">
+ xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
+ xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
<jsp:directive.attribute name="selected" required="false" />
<jsp:directive.attribute name="href" required="true" />
<jsp:directive.attribute name="text" required="true" />
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/messages.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/messages.tag 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/messages.tag 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,16 +1,16 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="urn:jsptld:http://www.springframework.org/tags"
- xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
- xmlns:su="urn:jsptld:stringutils"
- xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt">
+ xmlns:spring="http://www.springframework.org/tags"
+ xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt">
<c:if test="${not empty errors}">
<div class="error">
- <ul>
- <c:forEach var="msg" items="${errors}">
- <li><c:out value="${msg}" escapeXml="false" /></li>
- </c:forEach>
- </ul>
+ <ul>
+ <c:forEach var="msg" items="${errors}">
+ <li><c:out value="${msg}" escapeXml="false" /></li>
+ </c:forEach>
+ </ul>
</div>
<c:remove var="errors" />
</c:if>
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/na.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/na.tag 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/na.tag 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,15 +1,12 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
-
- <c:set var="body"><jsp:doBody /></c:set>
- <c:choose>
- <c:when test="${!empty(body)}">
- ${body}
- </c:when>
- <c:otherwise>
- N/A
- </c:otherwise>
- </c:choose>
-
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags"
+ xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+ xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
+ xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
+ <c:set var="body">
+ <jsp:doBody />
+ </c:set>
+ <c:choose>
+ <c:when test="${!empty(body)}">${body}</c:when>
+ <c:otherwise>N/A</c:otherwise>
+ </c:choose>
</jsp:root>
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/select.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/select.tag 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/select.tag 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,6 +1,6 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx"
+ xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx"
xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring" xmlns:dao="urn:jsptld:dao">
<jsp:directive.attribute name="path" required="true" />
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/tablelang.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/tablelang.tag 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/tablelang.tag 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,7 +1,7 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils"
- xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring" xmlns:elx="urn:jsptld:elx">
+ xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
+ xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
<jsp:directive.attribute name="path" required="true" />
<jsp:directive.attribute name="maxlength" required="false" />
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/text.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/text.tag 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/text.tag 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,6 +1,6 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring">
+ xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring">
<jsp:directive.attribute name="path" required="true" />
<jsp:directive.attribute name="name" required="false" />
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtinput.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtinput.tag 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtinput.tag 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,6 +1,6 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+ xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
<jsp:directive.attribute name="name" required="true" />
@@ -14,25 +14,25 @@
<jsp:directive.attribute name="onkeypress" required="false" />
<jsp:directive.attribute name="onkeydown" required="false" />
<jsp:directive.attribute name="onkeyup" required="false" />
- <jsp:directive.attribute name="onchange" required="false" />
- <jsp:directive.attribute name="onblur" required="false" />
+ <jsp:directive.attribute name="onchange" required="false" />
+ <jsp:directive.attribute name="onblur" required="false" />
<c:if test="${empty(type)}">
<c:set var="type" value="text" />
</c:if>
- <![CDATA[<input name="]]>${name}<![CDATA[" id="]]>${name}<![CDATA[" value="]]>${value}<![CDATA[" type="]]>${type}<![CDATA["]]>
- <c:if test="${!empty(cssclass)}"><![CDATA[ class="]]>${cssclass}<![CDATA[" ]]></c:if>
- <c:if test="${!empty(maxlength)}"><![CDATA[ maxlength="]]>${maxlength}<![CDATA[" ]]></c:if>
- <c:if test="${!empty(onkeypress)}"><![CDATA[ onkeypress="]]>${onkeypress}<![CDATA[" ]]></c:if>
- <c:if test="${!empty(onkeydown)}"><![CDATA[ onkeydown="]]>${onkeydown}<![CDATA[" ]]></c:if>
- <c:if test="${!empty(onkeyup)}"><![CDATA[ onkeydown="]]>${onkeyup}<![CDATA[" ]]></c:if>
- <c:if test="${!empty(onchange)}"><![CDATA[ onchange="]]>${onchange}<![CDATA[" ]]></c:if>
- <c:if test="${!empty(onblur)}"><![CDATA[ onblur="]]>${onblur}<![CDATA[" ]]></c:if>
- <c:if test="${!empty(style)}"><![CDATA[ style="]]>${style}<![CDATA[" ]]></c:if>
- <c:if test="${readonly}"><![CDATA[ readonly="readonly" ]]></c:if>
- <c:if test="${disabled}"><![CDATA[ disabled="disabled" ]]></c:if>
- <c:if test="${!empty(onkeypress) || !empty(onkeydown) || !empty(onkeyup) || !empty(onchange) || !empty(onblur)}"><![CDATA[ autocomplete="off" ]]></c:if>
+ <![CDATA[<input name="]]>${name}<![CDATA[" id="]]>${name}<![CDATA[" value="]]>${value}<![CDATA[" type="]]>${type}<![CDATA["]]>
+ <c:if test="${!empty(cssclass)}"><![CDATA[ class="]]>${cssclass}<![CDATA[" ]]></c:if>
+ <c:if test="${!empty(maxlength)}"><![CDATA[ maxlength="]]>${maxlength}<![CDATA[" ]]></c:if>
+ <c:if test="${!empty(onkeypress)}"><![CDATA[ onkeypress="]]>${onkeypress}<![CDATA[" ]]></c:if>
+ <c:if test="${!empty(onkeydown)}"><![CDATA[ onkeydown="]]>${onkeydown}<![CDATA[" ]]></c:if>
+ <c:if test="${!empty(onkeyup)}"><![CDATA[ onkeydown="]]>${onkeyup}<![CDATA[" ]]></c:if>
+ <c:if test="${!empty(onchange)}"><![CDATA[ onchange="]]>${onchange}<![CDATA[" ]]></c:if>
+ <c:if test="${!empty(onblur)}"><![CDATA[ onblur="]]>${onblur}<![CDATA[" ]]></c:if>
+ <c:if test="${!empty(style)}"><![CDATA[ style="]]>${style}<![CDATA[" ]]></c:if>
+ <c:if test="${readonly}"><![CDATA[ readonly="readonly" ]]></c:if>
+ <c:if test="${disabled}"><![CDATA[ disabled="disabled" ]]></c:if>
+ <c:if test="${!empty(onkeypress) || !empty(onkeydown) || !empty(onkeyup) || !empty(onchange) || !empty(onblur)}"><![CDATA[ autocomplete="off" ]]></c:if>
<![CDATA[ />]]>
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtoption.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtoption.tag 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtoption.tag 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,6 +1,6 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+ xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
<jsp:directive.attribute name="value" required="true" />
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtselect.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtselect.tag 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtselect.tag 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,6 +1,6 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+ xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
<jsp:directive.attribute name="name" required="true" />
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txttextarea.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txttextarea.tag 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txttextarea.tag 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,6 +1,6 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
+ xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
<jsp:directive.attribute name="name" required="true" />
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/ul.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/ul.tag 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/ul.tag 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,17 +1,17 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils"
- xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring" xmlns:elx="urn:jsptld:elx">
-
- <jsp:directive.attribute name="collection" required="true" type="java.lang.Object" />
- <jsp:directive.attribute name="property" required="false" />
-
- <c:if test="${!empty(collection)}">
- <ul>
- <c:forEach items="${collection}" var="item">
- <li><ou:compositeproperty bean="${item}" property="${property}" /></li>
- </c:forEach>
- </ul>
- </c:if>
-
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags"
+ xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+ xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
+ xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring"
+ xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
+ <jsp:directive.attribute name="collection" required="true" type="java.lang.Object" />
+ <jsp:directive.attribute name="property" required="false" />
+ <c:if test="${!empty(collection)}">
+ <ul>
+ <c:forEach items="${collection}" var="item">
+ <li>
+ <ou:compositeproperty bean="${item}" property="${property}" />
+ </li>
+ </c:forEach>
+ </ul>
+ </c:if>
</jsp:root>
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/url.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/url.tag 2007-01-04 17:32:56 UTC (rev 148)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/url.tag 2007-01-05 16:55:48 UTC (rev 149)
@@ -1,20 +1,21 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="urn:jsptld:http://www.springframework.org/tags" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:su="urn:jsptld:stringutils" xmlns:elx="urn:jsptld:elx">
- <jsp:directive.attribute name="var" required="false" />
- <jsp:directive.attribute name="value" required="true" />
- <c:url var="tmpVar" value="${currentpage}">
- <c:param name="springaction" value="${value}" />
- <jsp:doBody />
- </c:url>
- <c:choose>
- <c:when test="${!empty(var)}">
- <jsp:scriptlet>
- String varName = (String)jspContext.getAttribute("var");
- String varContent = (String)jspContext.getAttribute("tmpVar");
- jspContext.setAttribute(varName, varContent);
- </jsp:scriptlet>
- <!-- <c:set var="${var}" value="tmpVar" /> -->
- </c:when>
- <c:otherwise>${tmpVar}</c:otherwise>
- </c:choose>
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags"
+ xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+ xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
+ xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
+ <jsp:directive.attribute name="var" required="false" />
+ <jsp:directive.attribute name="value" required="true" />
+ <c:url var="tmpVar" value="${currentpage}">
+ <c:param name="springaction" value="${value}" />
+ <jsp:doBody />
+ </c:url>
+ <c:choose>
+ <c:when test="${!empty(var)}">
+ <jsp:scriptlet>
+ String varName = (String)jspContext.getAttribute("var");
+ String varContent = (String)jspContext.getAttribute("tmpVar");
+ jspContext.setAttribute(varName, varContent);
+ </jsp:scriptlet>
+ </c:when>
+ <c:otherwise>${tmpVar}</c:otherwise>
+ </c:choose>
</jsp:root>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2007-02-13 21:21:39
|
Revision: 253
http://svn.sourceforge.net/openutils/?rev=253&view=rev
Author: fgiust
Date: 2007-02-13 13:21:37 -0800 (Tue, 13 Feb 2007)
Log Message:
-----------
adding debug tags
Modified Paths:
--------------
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/debug.tag
Added Paths:
-----------
trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/
trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/
trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/BaseDebugTag.java
trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/DebugAttributesTag.java
trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/DebugExecutionTag.java
trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/DebugHeadersTag.java
trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/DebugParametersTag.java
trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-debug.tld
Added: trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/BaseDebugTag.java
===================================================================
--- trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/BaseDebugTag.java (rev 0)
+++ trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/BaseDebugTag.java 2007-02-13 21:21:37 UTC (rev 253)
@@ -0,0 +1,214 @@
+package it.openutils.web.tag.debug;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author fgiust
+ * @version $Revision$ ($Author$)
+ */
+public class BaseDebugTag extends TagSupport
+{
+
+ /**
+ * Stable <code>serialVersionUID</code>
+ */
+ private static final long serialVersionUID = 222;
+
+ /**
+ * codice html HTML_TABLE_START_4COL
+ */
+ protected static final String HTML_TABLE_START_4COL = "<table><thead><tr>"
+ + "<th>key</th><th>value</th><th>class</th><th>size</th>"
+ + "</tr></thead><tbody>";
+
+ /**
+ * codice html HTML_TABLE_START_3COL
+ */
+ protected static final String HTML_TABLE_START_3COL = "<table><thead><tr>"
+ + "<th>key</th><th>value</th><th>class</th>"
+ + "</tr></thead><tbody>";
+
+ /**
+ * codice html HTML_TABLE_START_2COL
+ */
+ protected static final String HTML_TABLE_START_2COL = "<table><thead><tr>"
+ + "<th>key</th><th>value</th>"
+ + "</tr></thead><tbody>";
+
+ /**
+ * codice html HTML_TABLE_END
+ */
+ protected static final String HTML_TABLE_END = "</tbody></table>";
+
+ /**
+ * Map contenente i valori per il debug
+ */
+ private Map debugMap;
+
+ /**
+ * write ClassName In Table?
+ */
+ private boolean outputClassName;
+
+ /**
+ * Setta la map con i valori da mostrare nel debug
+ * @param debug map con i valori da mostrare nel debug
+ */
+ protected void setDebugMap(Map debug)
+ {
+ debugMap = debug;
+ }
+
+ /**
+ * Scrivi il nome della classe nel debug
+ * @param writeClassNameInTable <code>true</code> per far si che il nome della classe appaia nel debug
+ */
+ public void setOutputClassName(boolean writeClassNameInTable)
+ {
+ outputClassName = writeClassNameInTable;
+ }
+
+ /**
+ * doEndTag. Scrive come tabella html la Map settata col metodo setDebugMap()
+ * @return int
+ * @throws JspException in caso di eccezioni nella scrittura sull'out
+ * @see javax.servlet.jsp.tagext.Tag#doEndTag()
+ */
+ @Override
+ public int doEndTag() throws JspException
+ {
+
+ if (debugMap.size() > 0)
+ {
+ StringBuffer buffer = new StringBuffer(debugMap.size() * 200);
+
+ if (outputClassName)
+ {
+ buffer.append(HTML_TABLE_START_3COL);
+ }
+ else
+ {
+ buffer.append(HTML_TABLE_START_2COL);
+ }
+
+ Set set = debugMap.entrySet();
+ Iterator iterator = set.iterator();
+ int totalSize = 0;
+
+ while (iterator.hasNext())
+ {
+ Map.Entry entry = (Map.Entry) iterator.next();
+
+ Object value = entry.getValue();
+ String key = (String) entry.getKey();
+
+ buffer.append("<tr>");
+ buffer.append("<td>" + key + "</td>");
+ buffer.append("<td>" + escapeXml(value) + "</td>");
+ if (outputClassName)
+ {
+ if (value != null)
+ {
+ buffer.append("<td>" + value.getClass().getName() + "</td>");
+ }
+ else
+ {
+ buffer.append("<td>null</td>");
+ }
+ }
+
+ buffer.append("</tr>");
+ }
+ if (totalSize > 0)
+ {
+ buffer.append("<tr><td colspan=\"3\"><strong>total size (solo portlet webbank)</strong></td><td>"
+ + totalSize
+ + " byte</td></tr>");
+ }
+
+ buffer.append(HTML_TABLE_END);
+ writeToOut(buffer);
+ }
+ else
+ {
+ writeToOut("nessun valore");
+ }
+
+ return super.doEndTag();
+ }
+
+ /**
+ * trasforma tutte le occorrenze di < in &lt;
+ * @param string stringa di cui fare l'escape - il metodo accetta un Object per comodit� (utilizza il toString()
+ * dell'Object)
+ * @return String
+ */
+ private String escapeXml(Object string)
+ {
+ if (string == null)
+ {
+ return null;
+ }
+
+ String stringed;
+
+ // supporto per array di oggetti
+ if (string.getClass().isArray())
+ {
+ stringed = ArrayUtils.toString(string);
+ }
+ // supporto per iterators
+ else if (string instanceof Iterator)
+ {
+ List list = new ArrayList();
+ Iterator iterator = (Iterator) string;
+ while (iterator.hasNext())
+ {
+ list.add(iterator.next());
+ }
+
+ stringed = ArrayUtils.toString(list.toArray());
+ }
+ else
+ {
+ stringed = string.toString();
+ }
+
+ return StringUtils.replace(stringed, "<", "<");
+ }
+
+ /**
+ * metodo di utility per scrivere una semplice stringa sul JspWriter
+ * @param string stringa da scrivere
+ * @throws JspException nel caso si verifichi una IOException nella scrittura
+ */
+ protected void writeToOut(Object string) throws JspException
+ {
+ if (string != null)
+ {
+ try
+ {
+ pageContext.getOut().write(ObjectUtils.toString(string));
+ }
+ catch (IOException e)
+ {
+ throw new JspException("errore nella scrittura dell'output. String=[" + string + "]");
+ }
+ }
+
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/BaseDebugTag.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/DebugAttributesTag.java
===================================================================
--- trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/DebugAttributesTag.java (rev 0)
+++ trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/DebugAttributesTag.java 2007-02-13 21:21:37 UTC (rev 253)
@@ -0,0 +1,114 @@
+package it.openutils.web.tag.debug;
+
+import java.util.Enumeration;
+import java.util.HashMap;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+
+/**
+ * @author fgiust
+ * @version $Revision$ ($Author$)
+ */
+public class DebugAttributesTag extends BaseDebugTag
+{
+
+ /**
+ * Stable <code>serialVersionUID</code>
+ */
+ private static final long serialVersionUID = 222;
+
+ /**
+ * riferimento al Logger
+ */
+ private static Log log = LogFactory.getLog(DebugAttributesTag.class);
+
+ /**
+ * Scope. Pu� assumere i valori:
+ * <ul>
+ * <li>PageContext.PAGE_SCOPE</li>
+ * <li>PageContext.REQUEST_SCOPE</li>
+ * <li>PageContext.SESSION_SCOPE</li>
+ * <li>PageContext.APPLICATION_SCOPE</li>
+ * </ul>
+ * Corrispondenti alle stringhe settate tramite l'attributo "scope" del tag:
+ * <ul>
+ * <li>page</li>
+ * <li>request</li>
+ * <li>session</li>
+ * <li>application</li>
+ * </ul>
+ */
+ private int scope = PageContext.PAGE_SCOPE;
+
+ /**
+ * Setta lo scope in cui recuperare la collezione su cui iterare
+ * @param scopeString Scope dell'oggetto collection
+ * @throws JspException se il valore passato non � tra: "page", "request", "session", "application"
+ */
+ public void setScope(String scopeString) throws JspException
+ {
+
+ if (scopeString.equalsIgnoreCase("page"))
+ {
+ scope = PageContext.PAGE_SCOPE;
+ }
+ else if (scopeString.equalsIgnoreCase("request"))
+ {
+ scope = PageContext.REQUEST_SCOPE;
+ }
+ else if (scopeString.equalsIgnoreCase("session"))
+ {
+ scope = PageContext.SESSION_SCOPE;
+ }
+ else if (scopeString.equalsIgnoreCase("application"))
+ {
+ scope = PageContext.APPLICATION_SCOPE;
+ }
+ else
+ {
+ log.error("Attributo \"scope\" non valido. Valore fornito= ["
+ + scopeString
+ + "]; valori ammessi: page, request, session, application");
+ throw new JspException("Attributo \"scope\" non valido. Valore fornito= ["
+ + scopeString
+ + "]; valori ammessi: page, request, session, application");
+ }
+ }
+
+ /**
+ * crea l'HashMap che evrr� stampata nel metodo doEndTag()
+ * @return int
+ * @throws JspException eccezione generica
+ * @see javax.servlet.jsp.tagext.Tag#doStartTag()
+ */
+ @Override
+ public int doStartTag() throws JspException
+ {
+
+ HashMap map = new HashMap();
+
+ Enumeration enm = pageContext.getAttributeNamesInScope(scope);
+
+ while (enm.hasMoreElements())
+ {
+ String key = enm.nextElement().toString();
+
+ if (!(scope == PageContext.PAGE_SCOPE && key.startsWith("javax.servlet")))
+ {
+ Object value = pageContext.getAttribute(key, scope);
+ map.put(key, value);
+ }
+ }
+
+ setOutputClassName(true);
+ setDebugMap(map);
+
+ return super.doStartTag();
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/DebugAttributesTag.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/DebugExecutionTag.java
===================================================================
--- trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/DebugExecutionTag.java (rev 0)
+++ trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/DebugExecutionTag.java 2007-02-13 21:21:37 UTC (rev 253)
@@ -0,0 +1,43 @@
+package it.openutils.web.tag.debug;
+
+import java.util.HashMap;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.jsp.JspException;
+
+
+/**
+ * @author fgiust
+ * @version $Revision$ ($Author$)
+ */
+public class DebugExecutionTag extends BaseDebugTag
+{
+
+ /**
+ * Stable <code>serialVersionUID</code>
+ */
+ private static final long serialVersionUID = 222;
+
+ /**
+ * crea l'HashMap che verr� stampata nel metodo doEndTag()
+ * @return int
+ * @throws JspException eccezione generica
+ * @see javax.servlet.jsp.tagext.Tag#doStartTag()
+ */
+ @Override
+ public int doStartTag() throws JspException
+ {
+
+ HashMap map = new HashMap();
+
+ ServletRequest request = pageContext.getRequest();
+
+ map.put("action", request.getAttribute(""));
+
+ setOutputClassName(false);
+ setDebugMap(map);
+
+ return super.doStartTag();
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/DebugExecutionTag.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/DebugHeadersTag.java
===================================================================
--- trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/DebugHeadersTag.java (rev 0)
+++ trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/DebugHeadersTag.java 2007-02-13 21:21:37 UTC (rev 253)
@@ -0,0 +1,73 @@
+package it.openutils.web.tag.debug;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Enumeration;
+import java.util.HashMap;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+
+
+/**
+ * @author fgiust
+ * @version $Revision$ ($Author$)
+ */
+public class DebugHeadersTag extends BaseDebugTag
+{
+
+ /**
+ * Stable <code>serialVersionUID</code>
+ */
+ private static final long serialVersionUID = 222;
+
+ /**
+ * crea l'HashMap che evrr� stampata nel metodo doEndTag()
+ * @return int
+ * @throws JspException eccezione generica
+ * @see javax.servlet.jsp.tagext.Tag#doStartTag()
+ */
+ @Override
+ public int doStartTag() throws JspException
+ {
+
+ HashMap map = new HashMap();
+
+ HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
+ Enumeration enm = request.getHeaderNames();
+
+ while (enm.hasMoreElements())
+ {
+ String key = enm.nextElement().toString();
+ Object value = request.getHeader(key);
+ map.put(key, value);
+ }
+
+ String remoteHost = request.getRemoteHost();
+ map.put("getRemoteHost", remoteHost);
+ map.put("getRemoteUser", request.getRemoteUser());
+ map.put("getCharacterEncoding", request.getCharacterEncoding());
+ map.put("getAuthType", request.getAuthType());
+ map.put("getAuthType", request.getAuthType());
+ map.put("getPathInfo", request.getPathInfo());
+ map.put("getPathTranslated", request.getPathTranslated());
+ map.put("getMethod", request.getMethod());
+
+ if (remoteHost != null)
+ {
+ try
+ {
+ map.put("getHostName(remoteHost)", InetAddress.getByName(remoteHost).getHostName());
+ }
+ catch (UnknownHostException e)
+ {
+ map.put("getHostName(remoteHost)", "UnknownHostException!");
+ }
+ }
+
+ setOutputClassName(false);
+ setDebugMap(map);
+
+ return super.doStartTag();
+ }
+}
\ No newline at end of file
Property changes on: trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/DebugHeadersTag.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/DebugParametersTag.java
===================================================================
--- trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/DebugParametersTag.java (rev 0)
+++ trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/DebugParametersTag.java 2007-02-13 21:21:37 UTC (rev 253)
@@ -0,0 +1,50 @@
+package it.openutils.web.tag.debug;
+
+import java.util.Enumeration;
+import java.util.HashMap;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.jsp.JspException;
+
+
+/**
+ * @author fgiust
+ * @version $Revision$ ($Author$)
+ */
+public class DebugParametersTag extends BaseDebugTag
+{
+
+ /**
+ * Stable <code>serialVersionUID</code>
+ */
+ private static final long serialVersionUID = 222;
+
+ /**
+ * crea l'HashMap che verr� stampata nel metodo doEndTag()
+ * @return int
+ * @throws JspException eccezione generica
+ * @see javax.servlet.jsp.tagext.Tag#doStartTag()
+ */
+ @Override
+ public int doStartTag() throws JspException
+ {
+
+ HashMap map = new HashMap();
+
+ ServletRequest request = pageContext.getRequest();
+ Enumeration enm = request.getParameterNames();
+
+ while (enm.hasMoreElements())
+ {
+ String key = enm.nextElement().toString();
+ Object value = request.getParameter(key);
+ map.put(key, value);
+ }
+
+ setOutputClassName(false);
+ setDebugMap(map);
+
+ return super.doStartTag();
+ }
+
+}
Property changes on: trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/DebugParametersTag.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-debug.tld
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-debug.tld (rev 0)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-debug.tld 2007-02-13 21:21:37 UTC (rev 253)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+ "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+<taglib>
+ <tlib-version>1.1</tlib-version>
+ <jsp-version>1.2</jsp-version>
+ <short-name>debug</short-name>
+ <uri>http://openutils.sourceforge.net/openutils-tags-debug</uri>
+ <description>Debug tag library</description>
+ <tag>
+ <name>attributes</name>
+ <tag-class>it.openutils.web.tag.debug.DebugAttributesTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <name>scope</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>parameters</name>
+ <tag-class>it.openutils.web.tag.debug.DebugParametersTag</tag-class>
+ <body-content>empty</body-content>
+ </tag>
+ <tag>
+ <name>execution</name>
+ <tag-class>it.openutils.web.tag.debug.DebugExecutionTag</tag-class>
+ <body-content>empty</body-content>
+ </tag>
+ <tag>
+ <name>headers</name>
+ <tag-class>it.openutils.web.tag.debug.DebugHeadersTag</tag-class>
+ <body-content>empty</body-content>
+ </tag>
+</taglib>
\ No newline at end of file
Property changes on: trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-debug.tld
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/debug.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/debug.tag 2007-02-13 21:21:00 UTC (rev 252)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/debug.tag 2007-02-13 21:21:37 UTC (rev 253)
@@ -1,7 +1,6 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:debug="urn:jsptld:debug" xmlns:c="http://java.sun.com/jsp/jstl/core">
-
- <script type="text/javascript">
+ xmlns:debug="http://openutils.sourceforge.net/openutils-tags-debug" xmlns:c="http://java.sun.com/jsp/jstl/core">
+ <script type="text/javascript">
<![CDATA[
function showDebug(pId) {
lDebugDiv = document.getElementById(pId);
@@ -14,34 +13,48 @@
}
}
]]>
- </script>
- <div class="debugtabs"><a href="javascript:showDebug('debug')">&raquo; debug</a></div>
- <div id="debug" class="debug" style="display:none">
+ </script>
+ <div class="debugtabs">
+ <a href="javascript:showDebug('debug')">&raquo; debug</a>
+ </div>
+ <div id="debug" class="debug" style="display:none">
<table>
- <tr>
- <th onclick="showDebug('parameters')">Parameters</th>
- <td id="parameters" style="display:none"><debug:parameters /></td>
- </tr>
- <tr>
- <th onclick="showDebug('request')">Request</th>
- <td id="request" style="display:none"><debug:attributes scope="request" /></td>
- </tr>
- <tr>
- <th onclick="showDebug('session')">Session</th>
- <td id="session" style="display:none"><debug:attributes scope="session" /></td>
- </tr>
- <tr>
- <th onclick="showDebug('page')">Page</th>
- <td id="page" style="display:none"><debug:attributes scope="page" /></td>
- </tr>
- <tr>
- <th onclick="showDebug('application')">Application</th>
- <td id="application" style="display:none"><debug:attributes scope="application" /></td>
- </tr>
- <tr>
- <th onclick="showDebug('headers')">Request headers</th>
- <td id="headers" style="display:none"><debug:headers /></td>
- </tr>
+ <tr>
+ <th onclick="showDebug('parameters')">Parameters</th>
+ <td id="parameters" style="display:none">
+ <debug:parameters />
+ </td>
+ </tr>
+ <tr>
+ <th onclick="showDebug('request')">Request</th>
+ <td id="request" style="display:none">
+ <debug:attributes scope="request" />
+ </td>
+ </tr>
+ <tr>
+ <th onclick="showDebug('session')">Session</th>
+ <td id="session" style="display:none">
+ <debug:attributes scope="session" />
+ </td>
+ </tr>
+ <tr>
+ <th onclick="showDebug('page')">Page</th>
+ <td id="page" style="display:none">
+ <debug:attributes scope="page" />
+ </td>
+ </tr>
+ <tr>
+ <th onclick="showDebug('application')">Application</th>
+ <td id="application" style="display:none">
+ <debug:attributes scope="application" />
+ </td>
+ </tr>
+ <tr>
+ <th onclick="showDebug('headers')">Request headers</th>
+ <td id="headers" style="display:none">
+ <debug:headers />
+ </td>
+ </tr>
</table>
- </div>
+ </div>
</jsp:root>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2007-02-14 21:15:50
|
Revision: 257
http://svn.sourceforge.net/openutils/?rev=257&view=rev
Author: fgiust
Date: 2007-02-14 13:15:50 -0800 (Wed, 14 Feb 2007)
Log Message:
-----------
fix debug when no session is available, fix label mode in input tag
Modified Paths:
--------------
trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/DebugAttributesTag.java
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag
Modified: trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/DebugAttributesTag.java
===================================================================
--- trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/DebugAttributesTag.java 2007-02-14 17:34:52 UTC (rev 256)
+++ trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/DebugAttributesTag.java 2007-02-14 21:15:50 UTC (rev 257)
@@ -91,19 +91,25 @@
{
HashMap map = new HashMap();
-
- Enumeration enm = pageContext.getAttributeNamesInScope(scope);
-
- while (enm.hasMoreElements())
+ try
{
- String key = enm.nextElement().toString();
+ Enumeration enm = pageContext.getAttributeNamesInScope(scope);
- if (!(scope == PageContext.PAGE_SCOPE && key.startsWith("javax.servlet")))
+ while (enm.hasMoreElements())
{
- Object value = pageContext.getAttribute(key, scope);
- map.put(key, value);
+ String key = enm.nextElement().toString();
+
+ if (!(scope == PageContext.PAGE_SCOPE && key.startsWith("javax.servlet")))
+ {
+ Object value = pageContext.getAttribute(key, scope);
+ map.put(key, value);
+ }
}
}
+ catch (IllegalStateException e)
+ {
+ // ignore, no attributes available
+ }
setOutputClassName(true);
setDebugMap(map);
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag 2007-02-14 17:34:52 UTC (rev 256)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag 2007-02-14 21:15:50 UTC (rev 257)
@@ -54,7 +54,7 @@
<c:set var="type" value="textarea" />
</c:if>
<c:if test="${type eq 'label'}">
- <c:set var="nobind" value="true" />
+ <c:set var="nobind" value="${true}" />
</c:if>
<c:set var="divclass">
<jsp:text>formelement formelement${type}</jsp:text>
@@ -91,7 +91,7 @@
</c:when>
<c:otherwise>
<div class="${divclass}">
- <label for="${name}">${labelmsg}:</label>
+ <label for="${name}">${labelmsg}</label>
<ou:txtinput type="${type}" name="${name}" value="${status.value}" cssclass="${cssclass}"
maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}"
onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}"
@@ -122,16 +122,16 @@
onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}"
onblur="${onblur}" />
</c:when>
- <c:when test="${label}">
+ <c:when test="${type == 'label'}">
<div class="${divclass}">
- <label for="${name}">${labelmsg}:</label>
+ <label for="${name}">${labelmsg}</label>
<span class="text">${status.value}</span>
<div class="clear"><!-- --></div>
</div>
</c:when>
<c:otherwise>
<div class="${divclass}">
- <label for="${name}">${labelmsg}:</label>
+ <label for="${name}">${labelmsg}</label>
<ou:txtinput type="${type}" name="${name}" value="${status.value}" cssclass="${cssclass}"
maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}"
onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X