You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by jb...@apache.org on 2015/01/12 05:20:21 UTC
svn commit: r1651034 [1/2] - in /tomcat/taglibs/standard/trunk:
compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/
compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/
compat/src/main/java/org/apache/taglibs/standard/tag/comp...
Author: jboynes
Date: Mon Jan 12 04:20:20 2015
New Revision: 1651034
URL: http://svn.apache.org/r1651034
Log:
Add missing tags and TLDs to standard-compat jar
Added:
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/BundleTag.java (with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/FormatDateTag.java (with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/FormatNumberTag.java (with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/MessageTag.java (with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParamTag.java (with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseDateTag.java (with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseNumberTag.java (with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/RequestEncodingTag.java (with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetBundleTag.java (with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetLocaleTag.java (with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetTimeZoneTag.java (with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/TimeZoneTag.java (with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/DateParamTag.java (with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/ParamTag.java (with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/QueryTag.java (with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/SetDataSourceTag.java (with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/TransactionTag.java (with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/UpdateTag.java (with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ExprTag.java (with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ParamTag.java (with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ParseTag.java (with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/TransformTag.java (with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/JstlELCoreTLV.java (with props)
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/JstlELFmtTLV.java
- copied, changed from r1650930, tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELFmtTLV.java
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/JstlELSqlTLV.java
- copied, changed from r1650930, tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELSqlTLV.java
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/JstlELXmlTLV.java
- copied, changed from r1650930, tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELXmlTLV.java
tomcat/taglibs/standard/trunk/compat/src/main/resources/
tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/
tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/c-1_0.tld
tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/fmt-1_0.tld
tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/sql-1_0.tld
tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/x-1_0.tld
Modified:
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/RedirectTag.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/ExpressionUtil.java
Modified: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/RedirectTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/RedirectTag.java?rev=1651034&r1=1651033&r2=1651034&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/RedirectTag.java (original)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/RedirectTag.java Mon Jan 12 04:20:20 2015
@@ -52,7 +52,7 @@ public class RedirectTag extends Redirec
urlExpression = ExpressionUtil.createValueExpression(pageContext, url, String.class);
}
- public void setContextExpression(String context) {
+ public void setContext(String context) {
contextExpression = ExpressionUtil.createValueExpression(pageContext, context, String.class);
}
}
Added: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/BundleTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/BundleTag.java?rev=1651034&view=auto
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/BundleTag.java (added)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/BundleTag.java Mon Jan 12 04:20:20 2015
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.taglibs.standard.tag.compat.fmt;
+
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspException;
+
+import org.apache.taglibs.standard.tag.common.fmt.BundleSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ * Implementation of JSTL 1.0 {@code <bundle>} using the container's EL implementation.
+ */
+public class BundleTag extends BundleSupport {
+
+ private ValueExpression basenameExpression;
+ private ValueExpression prefixExpression;
+
+ public int doStartTag() throws JspException {
+ basename = ExpressionUtil.evaluate(basenameExpression, pageContext);
+ prefix = ExpressionUtil.evaluate(prefixExpression, pageContext);
+
+ return super.doStartTag();
+ }
+
+ public void release() {
+ super.release();
+
+ basenameExpression = null;
+ prefixExpression = null;
+ }
+
+
+ public void setBasename(String expression) {
+ basenameExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+
+ public void setPrefix(String expression) {
+ prefixExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+}
Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/BundleTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/FormatDateTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/FormatDateTag.java?rev=1651034&view=auto
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/FormatDateTag.java (added)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/FormatDateTag.java Mon Jan 12 04:20:20 2015
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.taglibs.standard.tag.compat.fmt;
+
+import java.util.Date;
+
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspException;
+
+import org.apache.taglibs.standard.tag.common.fmt.FormatDateSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ * Implementation of JSTL 1.0 {@code <formatDate>} using the container's EL implementation.
+ */
+public class FormatDateTag extends FormatDateSupport {
+
+ private ValueExpression valueExpression;
+ private ValueExpression typeExpression;
+ private ValueExpression dateStyleExpression;
+ private ValueExpression timeStyleExpression;
+ private ValueExpression patternExpression;
+ private ValueExpression timeZoneExpression;
+
+ @Override
+ public int doStartTag() throws JspException {
+ value = ExpressionUtil.evaluate(valueExpression, pageContext);
+ type = ExpressionUtil.evaluate(typeExpression, pageContext);
+ dateStyle = ExpressionUtil.evaluate(dateStyleExpression, pageContext);
+ timeStyle = ExpressionUtil.evaluate(timeStyleExpression, pageContext);
+ pattern = ExpressionUtil.evaluate(patternExpression, pageContext);
+ timeZone = ExpressionUtil.evaluate(timeZoneExpression, pageContext);
+
+ return super.doStartTag();
+ }
+
+ @Override
+ public void release() {
+ super.release();
+ valueExpression = null;
+ typeExpression = null;
+ dateStyleExpression = null;
+ timeStyleExpression = null;
+ patternExpression = null;
+ timeZoneExpression = null;
+ }
+
+ public void setValue(String expression) {
+ valueExpression = ExpressionUtil.createValueExpression(pageContext, expression, Date.class);
+ }
+
+ public void setType(String expression) {
+ typeExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+
+ public void setDateStyle(String expression) {
+ dateStyleExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+
+ public void setTimeStyle(String expression) {
+ timeStyleExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+
+ public void setPattern(String expression) {
+ patternExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+
+ public void setTimeZone(String expression) {
+ timeZoneExpression = ExpressionUtil.createValueExpression(pageContext, expression, Object.class);
+ }
+}
Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/FormatDateTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/FormatNumberTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/FormatNumberTag.java?rev=1651034&view=auto
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/FormatNumberTag.java (added)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/FormatNumberTag.java Mon Jan 12 04:20:20 2015
@@ -0,0 +1,119 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.taglibs.standard.tag.compat.fmt;
+
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspException;
+
+import org.apache.taglibs.standard.tag.common.fmt.FormatNumberSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ * Implementation of JSTL 1.0 {@code <formatNumber>} using the container's EL implementation.
+ */
+public class FormatNumberTag extends FormatNumberSupport {
+
+ private ValueExpression valueExpression;
+ private ValueExpression typeExpression;
+ private ValueExpression patternExpression;
+ private ValueExpression currencyCodeExpression;
+ private ValueExpression currencySymbolExpression;
+ private ValueExpression groupingUsedExpression;
+ private ValueExpression maxIntegerDigitsExpression;
+ private ValueExpression minIntegerDigitsExpression;
+ private ValueExpression maxFractionDigitsExpression;
+ private ValueExpression minFractionDigitsExpression;
+
+ @Override
+ public int doStartTag() throws JspException {
+ value = ExpressionUtil.evaluate(valueExpression, pageContext);
+ type = ExpressionUtil.evaluate(typeExpression, pageContext);
+ pattern = ExpressionUtil.evaluate(patternExpression, pageContext);
+ currencyCode = ExpressionUtil.evaluate(currencyCodeExpression, pageContext);
+ currencySymbol = ExpressionUtil.evaluate(currencySymbolExpression, pageContext);
+ isGroupingUsed = ExpressionUtil.evaluate(groupingUsedExpression, pageContext, false);
+ maxIntegerDigits = ExpressionUtil.evaluate(maxIntegerDigitsExpression, pageContext, 0);
+ minIntegerDigits = ExpressionUtil.evaluate(minIntegerDigitsExpression, pageContext, 0);
+ maxFractionDigits = ExpressionUtil.evaluate(maxFractionDigitsExpression, pageContext, 0);
+ minFractionDigits = ExpressionUtil.evaluate(minFractionDigitsExpression, pageContext, 0);
+
+ return super.doStartTag();
+ }
+
+ @Override
+ public void release() {
+ valueExpression = null;
+ typeExpression = null;
+ patternExpression = null;
+ currencyCodeExpression = null;
+ currencySymbolExpression = null;
+ groupingUsedExpression = null;
+ maxIntegerDigitsExpression = null;
+ minIntegerDigitsExpression = null;
+ maxFractionDigitsExpression = null;
+ minFractionDigitsExpression = null;
+
+ super.release();
+ }
+
+ public void setValue(String expression) {
+ valueExpression = ExpressionUtil.createValueExpression(pageContext, expression, Object.class);
+ valueSpecified = true;
+ }
+
+ public void setType(String expression) {
+ typeExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+
+ public void setPattern(String expression) {
+ patternExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+
+ public void setCurrencyCode(String expression) {
+ currencyCodeExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+
+ public void setCurrencySymbol(String expression) {
+ currencySymbolExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+
+ public void setGroupingUsed(String expression) {
+ groupingUsedExpression = ExpressionUtil.createValueExpression(pageContext, expression, Boolean.class);
+ groupingUsedSpecified = true;
+ }
+
+ public void setMaxIntegerDigits(String expression) {
+ maxIntegerDigitsExpression = ExpressionUtil.createValueExpression(pageContext, expression, Integer.class);
+ maxIntegerDigitsSpecified = true;
+ }
+
+ public void setMinIntegerDigits(String expression) {
+ minIntegerDigitsExpression = ExpressionUtil.createValueExpression(pageContext, expression, Integer.class);
+ minIntegerDigitsSpecified = true;
+ }
+
+ public void setMaxFactionDigits(String expression) {
+ maxFractionDigitsExpression = ExpressionUtil.createValueExpression(pageContext, expression, Integer.class);
+ maxFractionDigitsSpecified = true;
+ }
+
+ public void setMinFractionDigits(String expression) {
+ minFractionDigitsExpression = ExpressionUtil.createValueExpression(pageContext, expression, Integer.class);
+ minFractionDigitsSpecified = true;
+ }
+}
Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/FormatNumberTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/MessageTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/MessageTag.java?rev=1651034&view=auto
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/MessageTag.java (added)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/MessageTag.java Mon Jan 12 04:20:20 2015
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.taglibs.standard.tag.compat.fmt;
+
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.jstl.fmt.LocalizationContext;
+
+import org.apache.taglibs.standard.tag.common.fmt.MessageSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ * Implementation of JSTL 1.0 {@code <message>} using the container's EL implementation.
+ */
+public class MessageTag extends MessageSupport {
+
+ private ValueExpression keyExpression;
+ private ValueExpression bundleExpression;
+
+ @Override
+ public int doStartTag() throws JspException {
+ keyAttrValue = ExpressionUtil.evaluate(keyExpression, pageContext);
+ bundleAttrValue = ExpressionUtil.evaluate(bundleExpression, pageContext);
+
+ return super.doStartTag();
+ }
+
+ @Override
+ public void release() {
+ super.release();
+
+ keyExpression = null;
+ bundleExpression = null;
+ }
+
+ public void setKey(String expression) {
+ keyExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ keySpecified = true;
+ }
+
+ public void setBundle(String expression) {
+ bundleExpression = ExpressionUtil.createValueExpression(pageContext, expression, LocalizationContext.class);
+ bundleSpecified = true;
+ }
+}
Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/MessageTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParamTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParamTag.java?rev=1651034&view=auto
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParamTag.java (added)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParamTag.java Mon Jan 12 04:20:20 2015
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.taglibs.standard.tag.compat.fmt;
+
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspException;
+
+import org.apache.taglibs.standard.tag.common.fmt.ParamSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ * Implementation of JSTL 1.0 {@code <param>} using the container's EL implementation.
+ */
+public class ParamTag extends ParamSupport {
+ private ValueExpression valueExpression;
+
+ @Override
+ public int doStartTag() throws JspException {
+ value = ExpressionUtil.evaluate(valueExpression, pageContext);
+
+ return super.doStartTag();
+ }
+
+ @Override
+ public void release() {
+ super.release();
+
+ valueExpression = null;
+ }
+
+ public void setValue(String expression) {
+ valueExpression = ExpressionUtil.createValueExpression(pageContext, expression, Object.class);
+ valueSpecified = true;
+ }
+}
Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParamTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseDateTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseDateTag.java?rev=1651034&view=auto
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseDateTag.java (added)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseDateTag.java Mon Jan 12 04:20:20 2015
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.taglibs.standard.tag.compat.fmt;
+
+import java.util.Date;
+
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspException;
+
+import org.apache.taglibs.standard.tag.common.fmt.LocaleUtil;
+import org.apache.taglibs.standard.tag.common.fmt.ParseDateSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ * Implementation of JSTL 1.0 {@code <parseDate>} using the container's EL implementation.
+ */
+public class ParseDateTag extends ParseDateSupport {
+
+ private ValueExpression valueExpression;
+ private ValueExpression typeExpression;
+ private ValueExpression dateStyleExpression;
+ private ValueExpression timeStyleExpression;
+ private ValueExpression patternExpression;
+ private ValueExpression timeZoneExpression;
+ private ValueExpression parseLocaleExpression;
+
+ @Override
+ public int doStartTag() throws JspException {
+ value = ExpressionUtil.evaluate(valueExpression, pageContext);
+ type = ExpressionUtil.evaluate(typeExpression, pageContext);
+ dateStyle = ExpressionUtil.evaluate(dateStyleExpression, pageContext);
+ timeStyle = ExpressionUtil.evaluate(timeStyleExpression, pageContext);
+ pattern = ExpressionUtil.evaluate(patternExpression, pageContext);
+ timeZone = ExpressionUtil.evaluate(timeZoneExpression, pageContext);
+ parseLocale = LocaleUtil.parseLocaleAttributeValue(
+ ExpressionUtil.evaluate(parseLocaleExpression, pageContext));
+
+ return super.doStartTag();
+ }
+
+ @Override
+ public void release() {
+ super.release();
+ valueExpression = null;
+ typeExpression = null;
+ dateStyleExpression = null;
+ timeStyleExpression = null;
+ patternExpression = null;
+ timeZoneExpression = null;
+ parseLocaleExpression = null;
+ }
+
+ public void setValue(String expression) {
+ valueExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ valueSpecified = true;
+ }
+
+ public void setType(String expression) {
+ typeExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+
+ public void setDateStyle(String expression) {
+ dateStyleExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+
+ public void setTimeStyle(String expression) {
+ timeStyleExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+
+ public void setPattern(String expression) {
+ patternExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+
+ public void setTimeZone(String expression) {
+ timeZoneExpression = ExpressionUtil.createValueExpression(pageContext, expression, Object.class);
+ }
+
+ public void setParseLocale(String expression) {
+ parseLocaleExpression = ExpressionUtil.createValueExpression(pageContext, expression, Object.class);
+ }
+}
Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseDateTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseNumberTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseNumberTag.java?rev=1651034&view=auto
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseNumberTag.java (added)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseNumberTag.java Mon Jan 12 04:20:20 2015
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.taglibs.standard.tag.compat.fmt;
+
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspException;
+
+import org.apache.taglibs.standard.tag.common.fmt.LocaleUtil;
+import org.apache.taglibs.standard.tag.common.fmt.ParseNumberSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ * Implementation of JSTL 1.0 {@code <parseNumber>} using the container's EL implementation.
+ */
+public class ParseNumberTag extends ParseNumberSupport {
+
+ private ValueExpression valueExpression;
+ private ValueExpression typeExpression;
+ private ValueExpression patternExpression;
+ private ValueExpression parseLocaleExpression;
+ private ValueExpression integerOnlyExpression;
+
+ @Override
+ public int doStartTag() throws JspException {
+ value = ExpressionUtil.evaluate(valueExpression, pageContext);
+ type = ExpressionUtil.evaluate(typeExpression, pageContext);
+ pattern = ExpressionUtil.evaluate(patternExpression, pageContext);
+ parseLocale = LocaleUtil.parseLocaleAttributeValue(
+ ExpressionUtil.evaluate(parseLocaleExpression, pageContext));
+ isIntegerOnly = ExpressionUtil.evaluate(integerOnlyExpression, pageContext, false);
+
+ return super.doStartTag();
+ }
+
+ @Override
+ public void release() {
+ valueExpression = null;
+ typeExpression = null;
+ patternExpression = null;
+ parseLocaleExpression = null;
+ integerOnlyExpression = null;
+
+ super.release();
+ }
+
+ public void setValue(String expression) {
+ valueExpression = ExpressionUtil.createValueExpression(pageContext, expression, Object.class);
+ valueSpecified = true;
+ }
+
+ public void setType(String expression) {
+ typeExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+
+ public void setPattern(String expression) {
+ patternExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+
+ public void setParseLocale(String expression) {
+ parseLocaleExpression = ExpressionUtil.createValueExpression(pageContext, expression, Object.class);
+ }
+
+ public void setIntegerOnly(String expression) {
+ integerOnlyExpression = ExpressionUtil.createValueExpression(pageContext, expression, Boolean.class);
+ integerOnlySpecified = true;
+ }
+}
Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseNumberTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/RequestEncodingTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/RequestEncodingTag.java?rev=1651034&view=auto
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/RequestEncodingTag.java (added)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/RequestEncodingTag.java Mon Jan 12 04:20:20 2015
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.taglibs.standard.tag.compat.fmt;
+
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspException;
+
+import org.apache.taglibs.standard.tag.common.fmt.ParamSupport;
+import org.apache.taglibs.standard.tag.common.fmt.RequestEncodingSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ * Implementation of JSTL 1.0 {@code <requestEncoding>} using the container's EL implementation.
+ */
+public class RequestEncodingTag extends RequestEncodingSupport {
+ private ValueExpression valueExpression;
+
+ @Override
+ public int doStartTag() throws JspException {
+ value = ExpressionUtil.evaluate(valueExpression, pageContext);
+
+ return super.doStartTag();
+ }
+
+ @Override
+ public void release() {
+ super.release();
+
+ valueExpression = null;
+ }
+
+ public void setValue(String expression) {
+ valueExpression = ExpressionUtil.createValueExpression(pageContext, expression, Object.class);
+ }
+}
Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/RequestEncodingTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetBundleTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetBundleTag.java?rev=1651034&view=auto
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetBundleTag.java (added)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetBundleTag.java Mon Jan 12 04:20:20 2015
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.taglibs.standard.tag.compat.fmt;
+
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspException;
+
+import org.apache.taglibs.standard.tag.common.fmt.BundleSupport;
+import org.apache.taglibs.standard.tag.common.fmt.SetBundleSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ * Implementation of JSTL 1.0 {@code <setBundle>} using the container's EL implementation.
+ */
+public class SetBundleTag extends SetBundleSupport {
+
+ private ValueExpression basenameExpression;
+
+ public int doStartTag() throws JspException {
+ basename = ExpressionUtil.evaluate(basenameExpression, pageContext);
+
+ return super.doStartTag();
+ }
+
+ public void release() {
+ super.release();
+
+ basenameExpression = null;
+ }
+
+
+ public void setBasename(String expression) {
+ basenameExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+}
Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetBundleTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetLocaleTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetLocaleTag.java?rev=1651034&view=auto
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetLocaleTag.java (added)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetLocaleTag.java Mon Jan 12 04:20:20 2015
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.taglibs.standard.tag.compat.fmt;
+
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspException;
+
+import org.apache.taglibs.standard.tag.common.fmt.ParamSupport;
+import org.apache.taglibs.standard.tag.common.fmt.SetLocaleSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ * Implementation of JSTL 1.0 {@code <param>} using the container's EL implementation.
+ */
+public class SetLocaleTag extends SetLocaleSupport {
+ private ValueExpression valueExpression;
+ private ValueExpression variantExpression;
+
+ @Override
+ public int doStartTag() throws JspException {
+ value = ExpressionUtil.evaluate(valueExpression, pageContext);
+ variant = ExpressionUtil.evaluate(variantExpression, pageContext);
+
+ return super.doStartTag();
+ }
+
+ @Override
+ public void release() {
+ super.release();
+
+ valueExpression = null;
+ variantExpression = null;
+ }
+
+ public void setValue(String expression) {
+ valueExpression = ExpressionUtil.createValueExpression(pageContext, expression, Object.class);
+ }
+
+ public void setVariant(String expression) {
+ variantExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+}
Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetLocaleTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetTimeZoneTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetTimeZoneTag.java?rev=1651034&view=auto
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetTimeZoneTag.java (added)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetTimeZoneTag.java Mon Jan 12 04:20:20 2015
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.taglibs.standard.tag.compat.fmt;
+
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspException;
+
+import org.apache.taglibs.standard.tag.common.fmt.ParamSupport;
+import org.apache.taglibs.standard.tag.common.fmt.SetTimeZoneSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ * Implementation of JSTL 1.0 {@code <setTimeZone>} using the container's EL implementation.
+ */
+public class SetTimeZoneTag extends SetTimeZoneSupport {
+ private ValueExpression valueExpression;
+
+ @Override
+ public int doStartTag() throws JspException {
+ value = ExpressionUtil.evaluate(valueExpression, pageContext);
+
+ return super.doStartTag();
+ }
+
+ @Override
+ public void release() {
+ super.release();
+
+ valueExpression = null;
+ }
+
+ public void setValue(String expression) {
+ valueExpression = ExpressionUtil.createValueExpression(pageContext, expression, Object.class);
+ }
+}
Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetTimeZoneTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/TimeZoneTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/TimeZoneTag.java?rev=1651034&view=auto
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/TimeZoneTag.java (added)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/TimeZoneTag.java Mon Jan 12 04:20:20 2015
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.taglibs.standard.tag.compat.fmt;
+
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspException;
+
+import org.apache.taglibs.standard.tag.common.fmt.TimeZoneSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ * Implementation of JSTL 1.0 {@code <timeZone>} using the container's EL implementation.
+ */
+public class TimeZoneTag extends TimeZoneSupport {
+ private ValueExpression valueExpression;
+
+ @Override
+ public int doStartTag() throws JspException {
+ value = ExpressionUtil.evaluate(valueExpression, pageContext);
+
+ return super.doStartTag();
+ }
+
+ @Override
+ public void release() {
+ super.release();
+
+ valueExpression = null;
+ }
+
+ public void setValue(String expression) {
+ valueExpression = ExpressionUtil.createValueExpression(pageContext, expression, Object.class);
+ }
+}
Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/TimeZoneTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/DateParamTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/DateParamTag.java?rev=1651034&view=auto
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/DateParamTag.java (added)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/DateParamTag.java Mon Jan 12 04:20:20 2015
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.taglibs.standard.tag.compat.sql;
+
+import java.util.Date;
+
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspException;
+
+import org.apache.taglibs.standard.tag.common.sql.DateParamTagSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ * Implementation of JSTL 1.0 {@code <dateParam>} using the container's EL implementation.
+ */
+public class DateParamTag extends DateParamTagSupport {
+ private ValueExpression valueExpression;
+ private ValueExpression typeExpression;
+
+ @Override
+ public int doStartTag() throws JspException {
+ value = ExpressionUtil.evaluate(valueExpression, pageContext);
+ type = ExpressionUtil.evaluate(typeExpression, pageContext);
+
+ return super.doStartTag();
+ }
+
+ @Override
+ public void release() {
+ super.release();
+
+ valueExpression = null;
+ typeExpression = null;
+ }
+
+ public void setValue(String expression) {
+ valueExpression = ExpressionUtil.createValueExpression(pageContext, expression, Date.class);
+ }
+
+ public void setType(String expression) {
+ typeExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+}
Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/DateParamTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/ParamTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/ParamTag.java?rev=1651034&view=auto
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/ParamTag.java (added)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/ParamTag.java Mon Jan 12 04:20:20 2015
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.taglibs.standard.tag.compat.sql;
+
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspException;
+
+import org.apache.taglibs.standard.tag.common.sql.ParamTagSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ * Implementation of JSTL 1.0 {@code <param>} using the container's EL implementation.
+ */
+public class ParamTag extends ParamTagSupport {
+ private ValueExpression valueExpression;
+
+ @Override
+ public int doStartTag() throws JspException {
+ value = ExpressionUtil.evaluate(valueExpression, pageContext);
+
+ return super.doStartTag();
+ }
+
+ @Override
+ public void release() {
+ super.release();
+
+ valueExpression = null;
+ }
+
+ public void setValue(String expression) {
+ valueExpression = ExpressionUtil.createValueExpression(pageContext, expression, Object.class);
+ }
+}
Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/ParamTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/QueryTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/QueryTag.java?rev=1651034&view=auto
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/QueryTag.java (added)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/QueryTag.java Mon Jan 12 04:20:20 2015
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.taglibs.standard.tag.compat.sql;
+
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspException;
+
+import org.apache.taglibs.standard.tag.common.sql.QueryTagSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ * Implementation of JSTL 1.0 {@code <query>} using the container's EL implementation.
+ */
+public class QueryTag extends QueryTagSupport {
+ private ValueExpression dataSourceExpression;
+ private ValueExpression sqlExpression;
+ private ValueExpression startRowExpression;
+ private ValueExpression maxRowsExpression;
+
+ @Override
+ public int doStartTag() throws JspException {
+ rawDataSource = ExpressionUtil.evaluate(dataSourceExpression, pageContext);
+ sql = ExpressionUtil.evaluate(sqlExpression, pageContext);
+ startRow = ExpressionUtil.evaluate(startRowExpression, pageContext, 0);
+ maxRows = ExpressionUtil.evaluate(maxRowsExpression, pageContext, -1);
+
+ return super.doStartTag();
+ }
+
+ @Override
+ public void release() {
+ super.release();
+
+ dataSourceExpression = null;
+ sqlExpression = null;
+ startRowExpression = null;
+ maxRowsExpression = null;
+ }
+
+ public void setDataSource(String expression) {
+ dataSourceExpression = ExpressionUtil.createValueExpression(pageContext, expression, Object.class);
+ dataSourceSpecified = true;
+ }
+
+ public void setSql(String expression) {
+ sqlExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+
+ public void setStartRow(String expression) {
+ startRowExpression = ExpressionUtil.createValueExpression(pageContext, expression, Integer.class);
+ }
+
+ public void setMaxRows(String expression) {
+ maxRowsExpression = ExpressionUtil.createValueExpression(pageContext, expression, Integer.class);
+ maxRowsSpecified = true;
+ }
+}
Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/QueryTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/SetDataSourceTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/SetDataSourceTag.java?rev=1651034&view=auto
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/SetDataSourceTag.java (added)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/SetDataSourceTag.java Mon Jan 12 04:20:20 2015
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.taglibs.standard.tag.compat.sql;
+
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspException;
+
+import org.apache.taglibs.standard.tag.common.sql.SetDataSourceTagSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ * Implementation of JSTL 1.0 {@code <setDataSource>} using the container's EL implementation.
+ */
+public class SetDataSourceTag extends SetDataSourceTagSupport {
+ private ValueExpression dataSourceExpression;
+ private ValueExpression driverClassNameExpression;
+ private ValueExpression jdbcUrlExpression;
+ private ValueExpression usernameExpression;
+ private ValueExpression passwordExpression;
+
+ @Override
+ public int doStartTag() throws JspException {
+ dataSource = ExpressionUtil.evaluate(dataSourceExpression, pageContext);
+ driverClassName = ExpressionUtil.evaluate(driverClassNameExpression, pageContext);
+ jdbcURL = ExpressionUtil.evaluate(jdbcUrlExpression, pageContext);
+ userName = ExpressionUtil.evaluate(usernameExpression, pageContext);
+ password = ExpressionUtil.evaluate(passwordExpression, pageContext);
+
+ return super.doStartTag();
+ }
+
+ @Override
+ public void release() {
+ super.release();
+
+ dataSourceExpression = null;
+ driverClassNameExpression = null;
+ jdbcUrlExpression = null;
+ usernameExpression = null;
+ passwordExpression = null;
+ }
+
+ public void setDataSource(String expression) {
+ dataSourceExpression = ExpressionUtil.createValueExpression(pageContext, expression, Object.class);
+ dataSourceSpecified = true;
+ }
+
+ public void setDriver(String expression) {
+ driverClassNameExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+
+ public void setUrl(String expression) {
+ jdbcUrlExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+
+ public void setUser(String expression) {
+ usernameExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+
+ public void setPassword(String expression) {
+ passwordExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+}
Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/SetDataSourceTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/TransactionTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/TransactionTag.java?rev=1651034&view=auto
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/TransactionTag.java (added)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/TransactionTag.java Mon Jan 12 04:20:20 2015
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.taglibs.standard.tag.compat.sql;
+
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspException;
+
+import org.apache.taglibs.standard.tag.common.sql.TransactionTagSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ * Implementation of JSTL 1.0 {@code <transaction>} using the container's EL implementation.
+ */
+public class TransactionTag extends TransactionTagSupport {
+ private ValueExpression dataSourceExpression;
+ private ValueExpression isolationExpression;
+
+ @Override
+ public int doStartTag() throws JspException {
+ rawDataSource = ExpressionUtil.evaluate(dataSourceExpression, pageContext);
+ if (isolationExpression != null) {
+ super.setIsolation((String) ExpressionUtil.evaluate(isolationExpression, pageContext));
+ }
+
+ return super.doStartTag();
+ }
+
+ @Override
+ public void release() {
+ super.release();
+
+ dataSourceExpression = null;
+ isolationExpression = null;
+ }
+
+ public void setDataSource(String expression) {
+ dataSourceExpression = ExpressionUtil.createValueExpression(pageContext, expression, Object.class);
+ dataSourceSpecified = true;
+ }
+
+ public void setIsolation(String expression) {
+ isolationExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+}
Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/TransactionTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/UpdateTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/UpdateTag.java?rev=1651034&view=auto
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/UpdateTag.java (added)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/UpdateTag.java Mon Jan 12 04:20:20 2015
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.taglibs.standard.tag.compat.sql;
+
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspException;
+
+import org.apache.taglibs.standard.tag.common.sql.UpdateTagSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ * Implementation of JSTL 1.0 {@code <update>} using the container's EL implementation.
+ */
+public class UpdateTag extends UpdateTagSupport {
+ private ValueExpression dataSourceExpression;
+ private ValueExpression sqlExpression;
+
+ @Override
+ public int doStartTag() throws JspException {
+ rawDataSource = ExpressionUtil.evaluate(dataSourceExpression, pageContext);
+ sql = ExpressionUtil.evaluate(sqlExpression, pageContext);
+
+ return super.doStartTag();
+ }
+
+ @Override
+ public void release() {
+ super.release();
+
+ dataSourceExpression = null;
+ sqlExpression = null;
+ }
+
+ public void setDataSource(String expression) {
+ dataSourceExpression = ExpressionUtil.createValueExpression(pageContext, expression, Object.class);
+ dataSourceSpecified = true;
+ }
+
+ public void setSql(String expression) {
+ sqlExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+}
Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/UpdateTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ExprTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ExprTag.java?rev=1651034&view=auto
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ExprTag.java (added)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ExprTag.java Mon Jan 12 04:20:20 2015
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.taglibs.standard.tag.compat.xml;
+
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspException;
+
+import org.apache.taglibs.standard.tag.common.sql.ParamTagSupport;
+import org.apache.taglibs.standard.tag.common.xml.ExprSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ * Implementation of JSTL 1.0 {@code <out>} using the container's EL implementation.
+ */
+public class ExprTag extends ExprSupport {
+ private ValueExpression escapeXmlExpression;
+
+ @Override
+ public int doStartTag() throws JspException {
+ escapeXml = ExpressionUtil.evaluate(escapeXmlExpression, pageContext, true);
+
+ return super.doStartTag();
+ }
+
+ @Override
+ public void release() {
+ super.release();
+
+ escapeXmlExpression = null;
+ }
+
+ public void setEscapeXml(String expression) {
+ escapeXmlExpression = ExpressionUtil.createValueExpression(pageContext, expression, Boolean.class);
+ }
+}
Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ExprTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ParamTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ParamTag.java?rev=1651034&view=auto
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ParamTag.java (added)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ParamTag.java Mon Jan 12 04:20:20 2015
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.taglibs.standard.tag.compat.xml;
+
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspException;
+
+import org.apache.taglibs.standard.tag.common.sql.ParamTagSupport;
+import org.apache.taglibs.standard.tag.common.xml.ParamSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ * Implementation of JSTL 1.0 {@code <param>} using the container's EL implementation.
+ */
+public class ParamTag extends ParamSupport {
+ private ValueExpression nameExpression;
+ private ValueExpression valueExpression;
+
+ @Override
+ public int doStartTag() throws JspException {
+ name = ExpressionUtil.evaluate(nameExpression, pageContext);
+ value = ExpressionUtil.evaluate(valueExpression, pageContext);
+
+ return super.doStartTag();
+ }
+
+ @Override
+ public void release() {
+ super.release();
+
+ nameExpression = null;
+ valueExpression = null;
+ }
+
+ public void setName(String expression) {
+ nameExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+
+ public void setValue(String expression) {
+ valueExpression = ExpressionUtil.createValueExpression(pageContext, expression, Object.class);
+ }
+}
Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ParamTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ParseTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ParseTag.java?rev=1651034&view=auto
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ParseTag.java (added)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ParseTag.java Mon Jan 12 04:20:20 2015
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.taglibs.standard.tag.compat.xml;
+
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspException;
+
+import org.apache.taglibs.standard.tag.common.xml.ParseSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+import org.xml.sax.XMLFilter;
+
+/**
+ * Implementation of JSTL 1.0 {@code <param>} using the container's EL implementation.
+ */
+public class ParseTag extends ParseSupport {
+ private ValueExpression xmlExpression;
+ private ValueExpression systemIdExpression;
+ private ValueExpression filterExpression;
+
+ @Override
+ public int doStartTag() throws JspException {
+ xml = ExpressionUtil.evaluate(xmlExpression, pageContext);
+ systemId = ExpressionUtil.evaluate(systemIdExpression, pageContext);
+ filter = ExpressionUtil.evaluate(filterExpression, pageContext);
+
+ return super.doStartTag();
+ }
+
+ @Override
+ public void release() {
+ super.release();
+
+ xmlExpression = null;
+ systemIdExpression = null;
+ filterExpression = null;
+ }
+
+ public void setXml(String expression) {
+ xmlExpression = ExpressionUtil.createValueExpression(pageContext, expression, Object.class);
+ }
+
+ public void setSystemId(String expression) {
+ systemIdExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+
+ public void setFilter(String expression) {
+ filterExpression = ExpressionUtil.createValueExpression(pageContext, expression, XMLFilter.class);
+ }
+}
Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ParseTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/TransformTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/TransformTag.java?rev=1651034&view=auto
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/TransformTag.java (added)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/TransformTag.java Mon Jan 12 04:20:20 2015
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.taglibs.standard.tag.compat.xml;
+
+import javax.el.ValueExpression;
+import javax.servlet.jsp.JspException;
+import javax.xml.transform.Result;
+
+import org.apache.taglibs.standard.tag.common.xml.TransformSupport;
+import org.apache.taglibs.standard.util.ExpressionUtil;
+
+/**
+ * Implementation of JSTL 1.0 {@code <param>} using the container's EL implementation.
+ */
+public class TransformTag extends TransformSupport {
+ private ValueExpression xmlExpression;
+ private ValueExpression xmlSystemIdExpression;
+ private ValueExpression xsltExpression;
+ private ValueExpression xsltSystemIdExpression;
+ private ValueExpression resultExpression;
+
+ @Override
+ public int doStartTag() throws JspException {
+ xml = ExpressionUtil.evaluate(xmlExpression, pageContext);
+ xmlSystemId = ExpressionUtil.evaluate(xmlSystemIdExpression, pageContext);
+ xslt = ExpressionUtil.evaluate(xsltExpression, pageContext);
+ xsltSystemId = ExpressionUtil.evaluate(xsltSystemIdExpression, pageContext);
+ result = ExpressionUtil.evaluate(resultExpression, pageContext);
+
+ return super.doStartTag();
+ }
+
+ @Override
+ public void release() {
+ super.release();
+
+ xmlExpression = null;
+ xmlSystemIdExpression = null;
+ xsltExpression = null;
+ xsltSystemIdExpression = null;
+ resultExpression = null;
+ }
+
+ public void setXml(String expression) {
+ xmlExpression = ExpressionUtil.createValueExpression(pageContext, expression, Object.class);
+ xmlSpecified = true;
+ }
+
+ public void setXmlSystemId(String expression) {
+ xmlSystemIdExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+
+ public void setXslt(String expression) {
+ xsltExpression = ExpressionUtil.createValueExpression(pageContext, expression, Object.class);
+ }
+
+ public void setXsltSystemId(String expression) {
+ xsltSystemIdExpression = ExpressionUtil.createValueExpression(pageContext, expression, String.class);
+ }
+
+ public void setResult(String expression) {
+ resultExpression = ExpressionUtil.createValueExpression(pageContext, expression, Result.class);
+ }
+}
Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/TransformTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/JstlELCoreTLV.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/JstlELCoreTLV.java?rev=1651034&view=auto
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/JstlELCoreTLV.java (added)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/JstlELCoreTLV.java Mon Jan 12 04:20:20 2015
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.taglibs.standard.tlv.compat;
+
+import org.apache.taglibs.standard.tlv.JstlCoreTLV;
+
+/**
+ */
+public class JstlELCoreTLV extends JstlCoreTLV {
+ @Override
+ protected String validateExpression(String elem, String att, String expr) {
+ return null;
+ }
+}
Propchange: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/JstlELCoreTLV.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/JstlELFmtTLV.java (from r1650930, tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELFmtTLV.java)
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/JstlELFmtTLV.java?p2=tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/JstlELFmtTLV.java&p1=tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELFmtTLV.java&r1=1650930&r2=1651034&rev=1651034&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELFmtTLV.java (original)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/JstlELFmtTLV.java Mon Jan 12 04:20:20 2015
@@ -5,16 +5,16 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.taglibs.standard.tlv.el;
+package org.apache.taglibs.standard.tlv.compat;
import org.apache.taglibs.standard.tlv.JstlFmtTLV;
@@ -23,6 +23,6 @@ import org.apache.taglibs.standard.tlv.J
public class JstlELFmtTLV extends JstlFmtTLV {
@Override
protected String validateExpression(String elem, String att, String expr) {
- return ValidationUtil.validateExpression(elem, att, expr);
+ return null;
}
}
Copied: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/JstlELSqlTLV.java (from r1650930, tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELSqlTLV.java)
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/JstlELSqlTLV.java?p2=tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/JstlELSqlTLV.java&p1=tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELSqlTLV.java&r1=1650930&r2=1651034&rev=1651034&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELSqlTLV.java (original)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/JstlELSqlTLV.java Mon Jan 12 04:20:20 2015
@@ -5,16 +5,16 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.taglibs.standard.tlv.el;
+package org.apache.taglibs.standard.tlv.compat;
import org.apache.taglibs.standard.tlv.JstlSqlTLV;
@@ -23,6 +23,6 @@ import org.apache.taglibs.standard.tlv.J
public class JstlELSqlTLV extends JstlSqlTLV {
@Override
protected String validateExpression(String elem, String att, String expr) {
- return ValidationUtil.validateExpression(elem, att, expr);
+ return null;
}
}
Copied: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/JstlELXmlTLV.java (from r1650930, tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELXmlTLV.java)
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/JstlELXmlTLV.java?p2=tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/JstlELXmlTLV.java&p1=tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELXmlTLV.java&r1=1650930&r2=1651034&rev=1651034&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELXmlTLV.java (original)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/JstlELXmlTLV.java Mon Jan 12 04:20:20 2015
@@ -5,16 +5,16 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.taglibs.standard.tlv.el;
+package org.apache.taglibs.standard.tlv.compat;
import org.apache.taglibs.standard.tlv.JstlXmlTLV;
@@ -23,6 +23,6 @@ import org.apache.taglibs.standard.tlv.J
public class JstlELXmlTLV extends JstlXmlTLV {
@Override
protected String validateExpression(String elem, String att, String expr) {
- return ValidationUtil.validateExpression(elem, att, expr);
+ return null;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org