svn commit: r1621979 - in /ofbiz/trunk/framework: webapp/src/org/ofbiz/webapp/ps
Locked
 
|
Author: jacopoc
Date: Tue Sep 2 13:31:31 2014 New Revision: 1621979 URL: http://svn.apache.org/r1621979 Log: Removed the old and no more used custom JSP taglib. Removed: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/pseudotag/ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/AbstractParameterTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/EntityFieldTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/FormatTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/I18nBundleTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/I18nMessageArgumentTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/I18nMessageTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IfTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/InputValueTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTEI.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorHasNextTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTEI.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTEI.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ParamTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/PrintTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ServiceTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/UnlessTag.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/UrlTag.java ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/ofbiz.tld ofbiz/trunk/framework/webtools/webapp/webtools/entity/EditEntity.jsp ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.jsp Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ContentUrlTag.java ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsrawdump.jsp Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ContentUrlTag.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ContentUrlTag.java?rev=1621979&r1=1621978&r2=1621979&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ContentUrlTag.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/taglib/ContentUrlTag.java Tue Sep 2 13:31:31 2014 @@ -20,12 +20,8 @@ package org.ofbiz.webapp.taglib; import java.io.IOException; import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.BodyContent; -import javax.servlet.jsp.tagext.BodyTagSupport; import org.ofbiz.base.util.Debug; -import org.ofbiz.base.util.UtilJ2eeCompat; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; @@ -35,19 +31,9 @@ import org.ofbiz.entity.GenericValue; /** * ContentUrlTag - Creates a URL string prepending the content prefix from url.properties */ -@SuppressWarnings("serial") -public class ContentUrlTag extends BodyTagSupport { +public class ContentUrlTag { - public static final String module = UrlTag.class.getName(); - - @Deprecated - public static void appendContentPrefix(HttpServletRequest request, StringBuffer urlBuffer) { - try { - appendContentPrefix(request, (Appendable) urlBuffer); - } catch (IOException e) { - throw UtilMisc.initCause(new InternalError(e.getMessage()), e); - } - } + public static final String module = ContentUrlTag.class.getName(); public static void appendContentPrefix(HttpServletRequest request, StringBuilder urlBuffer) { try { @@ -100,30 +86,4 @@ public class ContentUrlTag extends BodyT ContentUrlTag.appendContentPrefix(request, buf); return buf.toString(); } - - @Override - public int doEndTag() throws JspException { - HttpServletRequest request = (HttpServletRequest) pageContext.getRequest(); - - BodyContent body = getBodyContent(); - String bodyString = body.getString(); - - StringBuilder newURL = new StringBuilder(); - - appendContentPrefix(request, newURL); - newURL.append(bodyString); - body.clearBody(); - - try { - getPreviousOut().print(newURL.toString()); - } catch (IOException e) { - if (UtilJ2eeCompat.useNestedJspException(pageContext.getServletContext())) { - throw new JspException(e.getMessage(), e); - } else { - Debug.logError(e, "Server does not support nested exceptions, here is the exception", module); - throw new JspException(e.toString()); - } - } - return SKIP_BODY; - } } Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml?rev=1621979&r1=1621978&r2=1621979&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml Tue Sep 2 13:31:31 2014 @@ -105,11 +105,6 @@ under the License. <welcome-file>index.jsp</welcome-file> </welcome-file-list> - <taglib> - <taglib-uri>ofbizTags</taglib-uri> - <taglib-location>/WEB-INF/ofbiz.tld</taglib-location> - </taglib> - <!-- HTTP Response Code definitions: | "400" ; Bad Request | "401" ; Unauthorized Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsrawdump.jsp URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsrawdump.jsp?rev=1621979&r1=1621978&r2=1621979&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsrawdump.jsp (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsrawdump.jsp Tue Sep 2 13:31:31 2014 @@ -15,7 +15,7 @@ software distributed under the License i KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---%><%@ page import="java.io.*, java.util.*, java.net.*, org.w3c.dom.*, org.ofbiz.security.*, org.ofbiz.entity.*, org.ofbiz.entity.condition.*, org.ofbiz.entity.util.*, org.ofbiz.base.util.*, org.ofbiz.entity.model.*, org.ofbiz.entity.transaction.*" %><%@ taglib uri="ofbizTags" prefix="ofbiz" %><jsp:useBean id="security" type="org.ofbiz.security.Security" scope="request" /><jsp:useBean id="delegator" type="org.ofbiz.entity.GenericDelegator" scope="request" /><% +--%><%@ page import="java.io.*, java.util.*, java.net.*, org.w3c.dom.*, org.ofbiz.security.*, org.ofbiz.entity.*, org.ofbiz.entity.condition.*, org.ofbiz.entity.util.*, org.ofbiz.base.util.*, org.ofbiz.entity.model.*, org.ofbiz.entity.transaction.*" %><jsp:useBean id="security" type="org.ofbiz.security.Security" scope="request" /><jsp:useBean id="delegator" type="org.ofbiz.entity.GenericDelegator" scope="request" /><% if(security.hasPermission("ENTITY_MAINT", session)) { TreeSet passedEntityNames = (TreeSet) session.getAttribute("xmlrawdump_entitylist"); session.removeAttribute("xmlrawdump_entitylist"); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |