Author: jboynes Date: Sat Oct 23 16:18:34 2010 New Revision: 1026635 URL: http://svn.apache.org/viewvc?rev=1026635&view=rev Log: refactor 1.0 EL tag support into jstlel module
Added: tomcat/taglibs/standard/trunk/jstlel/src/ tomcat/taglibs/standard/trunk/jstlel/src/main/ tomcat/taglibs/standard/trunk/jstlel/src/main/java/ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/ - copied from r1026616, tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/lang/ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/ - copied from r1026616, tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/el/ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELCoreTLV.java tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELFmtTLV.java tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELSqlTLV.java tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELXmlTLV.java tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/ValidationUtil.java tomcat/taglibs/standard/trunk/jstlel/src/main/resources/ tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/ tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/c-1_0.tld (contents, props changed) - copied, changed from r1026616, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/c-1_0.tld tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/fmt-1_0.tld (contents, props changed) - copied, changed from r1026616, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fmt-1_0.tld tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/sql-1_0.tld (contents, props changed) - copied, changed from r1026616, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/sql-1_0.tld tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/x-1_0.tld (contents, props changed) - copied, changed from r1026616, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/x-1_0.tld tomcat/taglibs/standard/trunk/jstlel/src/test/ tomcat/taglibs/standard/trunk/jstlel/src/test/java/ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/ tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/ - copied from r1026616, tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/lang/ tomcat/taglibs/standard/trunk/jstlel/src/test/resources/ - copied from r1026616, tomcat/taglibs/standard/trunk/impl/src/test/resources/ Removed: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/extra/ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/lang/ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/el/ tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/c-1_0.tld tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fmt-1_0.tld tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/sql-1_0.tld tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/x-1_0.tld tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/lang/ tomcat/taglibs/standard/trunk/impl/src/test/resources/ Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java tomcat/taglibs/standard/trunk/jstlel/pom.xml Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java?rev=1026635&r1=1026634&r2=1026635&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java (original) +++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java Sat Oct 23 16:18:34 2010 @@ -26,7 +26,6 @@ import java.util.Set; import java.util.StringTokenizer; import java.util.Vector; -import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.PageData; import javax.servlet.jsp.tagext.TagData; import javax.servlet.jsp.tagext.TagLibraryValidator; @@ -35,8 +34,6 @@ import javax.xml.parsers.ParserConfigura import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import org.apache.taglibs.standard.lang.support.ExpressionEvaluator; -import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager; import org.apache.taglibs.standard.resources.Resources; import org.xml.sax.Attributes; import org.xml.sax.SAXException; @@ -174,26 +171,12 @@ public abstract class JstlBaseTLV extend // Protected utility functions // delegate validation to the appropriate expression language + // TODO refactor this into EL tag specific functionality + @Deprecated protected String validateExpression( String elem, String att, String expr) { - // let's just use the cache kept by the ExpressionEvaluatorManager - ExpressionEvaluator current; - try { - current = - ExpressionEvaluatorManager.getEvaluatorByName( - ExpressionEvaluatorManager.EVALUATOR_CLASS); - } catch (JspException ex) { - // (using JspException here feels ugly, but it's what EEM uses) - return ex.getMessage(); - } - - String response = current.validate(att, expr); - if (response == null) - return response; - else - return "tag = '" + elem + "' / attribute = '" + att + "': " - + response; + return null; } // utility methods to help us match elements in our tagset Modified: tomcat/taglibs/standard/trunk/jstlel/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/pom.xml?rev=1026635&r1=1026634&r2=1026635&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/jstlel/pom.xml (original) +++ tomcat/taglibs/standard/trunk/jstlel/pom.xml Sat Oct 23 16:18:34 2010 @@ -70,9 +70,13 @@ <dependencies> <dependency> <groupId>org.apache.taglibs</groupId> + <artifactId>taglibs-standard-spec</artifactId> + <version>1.2-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.taglibs</groupId> <artifactId>taglibs-standard-impl</artifactId> <version>1.2-SNAPSHOT</version> - <scope>provided</scope> </dependency> <dependency> Added: tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELCoreTLV.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELCoreTLV.java?rev=1026635&view=auto ============================================================================== --- tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELCoreTLV.java (added) +++ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELCoreTLV.java Sat Oct 23 16:18:34 2010 @@ -0,0 +1,26 @@ +/* + * 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; + +/** + */ +public class JstlELCoreTLV extends JstlCoreTLV { + @Override + protected String validateExpression(String elem, String att, String expr) { + return ValidationUtil.validateExpression(elem, att, expr); + } +} Added: tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELFmtTLV.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELFmtTLV.java?rev=1026635&view=auto ============================================================================== --- tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELFmtTLV.java (added) +++ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELFmtTLV.java Sat Oct 23 16:18:34 2010 @@ -0,0 +1,26 @@ +/* + * 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; + +/** + */ +public class JstlELFmtTLV extends JstlFmtTLV { + @Override + protected String validateExpression(String elem, String att, String expr) { + return ValidationUtil.validateExpression(elem, att, expr); + } +} Added: tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELSqlTLV.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELSqlTLV.java?rev=1026635&view=auto ============================================================================== --- tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELSqlTLV.java (added) +++ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELSqlTLV.java Sat Oct 23 16:18:34 2010 @@ -0,0 +1,26 @@ +/* + * 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; + +/** + */ +public class JstlELSqlTLV extends JstlSqlTLV { + @Override + protected String validateExpression(String elem, String att, String expr) { + return ValidationUtil.validateExpression(elem, att, expr); + } +} Added: tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELXmlTLV.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELXmlTLV.java?rev=1026635&view=auto ============================================================================== --- tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELXmlTLV.java (added) +++ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/JstlELXmlTLV.java Sat Oct 23 16:18:34 2010 @@ -0,0 +1,26 @@ +/* + * 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; + +/** + */ +public class JstlELXmlTLV extends JstlXmlTLV { + @Override + protected String validateExpression(String elem, String att, String expr) { + return ValidationUtil.validateExpression(elem, att, expr); + } +} Added: tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/ValidationUtil.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/ValidationUtil.java?rev=1026635&view=auto ============================================================================== --- tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/ValidationUtil.java (added) +++ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/ValidationUtil.java Sat Oct 23 16:18:34 2010 @@ -0,0 +1,48 @@ +/* + * 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; + +import javax.servlet.jsp.JspException; + +import org.apache.taglibs.standard.lang.support.ExpressionEvaluator; +import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager; + +/** + */ +public class ValidationUtil { + static String validateExpression( + String elem, String att, String expr) { + + // let's just use the cache kept by the ExpressionEvaluatorManager + ExpressionEvaluator current; + try { + current = + ExpressionEvaluatorManager.getEvaluatorByName( + ExpressionEvaluatorManager.EVALUATOR_CLASS); + } catch (JspException ex) { + // (using JspException here feels ugly, but it's what EEM uses) + return ex.getMessage(); + } + + String response = current.validate(att, expr); + if (response == null) + return response; + else + return "tag = '" + elem + "' / attribute = '" + att + "': " + + response; + } +} Copied: tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/c-1_0.tld (from r1026616, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/c-1_0.tld) URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/c-1_0.tld?p2=tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/c-1_0.tld&p1=tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/c-1_0.tld&r1=1026616&r2=1026635&rev=1026635&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/c-1_0.tld (original) +++ tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/c-1_0.tld Sat Oct 23 16:18:34 2010 @@ -12,7 +12,7 @@ <validator> <validator-class> - org.apache.taglibs.standard.tlv.JstlCoreTLV + org.apache.taglibs.standard.tlv.JstlELCoreTLV </validator-class> <init-param> <param-name>expressionAttributes</param-name> Propchange: tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/c-1_0.tld ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/c-1_0.tld ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Copied: tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/fmt-1_0.tld (from r1026616, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fmt-1_0.tld) URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/fmt-1_0.tld?p2=tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/fmt-1_0.tld&p1=tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fmt-1_0.tld&r1=1026616&r2=1026635&rev=1026635&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fmt-1_0.tld (original) +++ tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/fmt-1_0.tld Sat Oct 23 16:18:34 2010 @@ -12,7 +12,7 @@ <validator> <validator-class> - org.apache.taglibs.standard.tlv.JstlFmtTLV + org.apache.taglibs.standard.tlv.JstlELFmtTLV </validator-class> <init-param> <param-name>expressionAttributes</param-name> Propchange: tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/fmt-1_0.tld ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/fmt-1_0.tld ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Copied: tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/sql-1_0.tld (from r1026616, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/sql-1_0.tld) URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/sql-1_0.tld?p2=tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/sql-1_0.tld&p1=tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/sql-1_0.tld&r1=1026616&r2=1026635&rev=1026635&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/sql-1_0.tld (original) +++ tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/sql-1_0.tld Sat Oct 23 16:18:34 2010 @@ -12,7 +12,7 @@ <validator> <validator-class> - org.apache.taglibs.standard.tlv.JstlSqlTLV + org.apache.taglibs.standard.tlv.JstlELSqlTLV </validator-class> <init-param> <param-name>expressionAttributes</param-name> Propchange: tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/sql-1_0.tld ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/sql-1_0.tld ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Copied: tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/x-1_0.tld (from r1026616, tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/x-1_0.tld) URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/x-1_0.tld?p2=tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/x-1_0.tld&p1=tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/x-1_0.tld&r1=1026616&r2=1026635&rev=1026635&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/x-1_0.tld (original) +++ tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/x-1_0.tld Sat Oct 23 16:18:34 2010 @@ -12,7 +12,7 @@ <validator> <validator-class> - org.apache.taglibs.standard.tlv.JstlXmlTLV + org.apache.taglibs.standard.tlv.JstlELXmlTLV </validator-class> <init-param> <param-name>expressionAttributes</param-name> Propchange: tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/x-1_0.tld ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/taglibs/standard/trunk/jstlel/src/main/resources/META-INF/x-1_0.tld ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org