--- src/main/java/org/apache/taglibs/standard/tlv/el/JstlELCoreTLV.java (revision 0) +++ src/main/java/org/apache/taglibs/standard/tlv/el/JstlELCoreTLV.java (working copy) @@ -14,8 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.taglibs.standard.tlv; +package org.apache.taglibs.standard.tlv.el; +import org.apache.taglibs.standard.tlv.JstlCoreTLV; + /** */ public class JstlELCoreTLV extends JstlCoreTLV { --- src/main/java/org/apache/taglibs/standard/tlv/el/JstlELFmtTLV.java (revision 0) +++ src/main/java/org/apache/taglibs/standard/tlv/el/JstlELFmtTLV.java (working copy) @@ -14,8 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.taglibs.standard.tlv; +package org.apache.taglibs.standard.tlv.el; +import org.apache.taglibs.standard.tlv.JstlFmtTLV; + /** */ public class JstlELFmtTLV extends JstlFmtTLV { --- src/main/java/org/apache/taglibs/standard/tlv/el/JstlELSqlTLV.java (revision 0) +++ src/main/java/org/apache/taglibs/standard/tlv/el/JstlELSqlTLV.java (working copy) @@ -14,8 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.taglibs.standard.tlv; +package org.apache.taglibs.standard.tlv.el; +import org.apache.taglibs.standard.tlv.JstlSqlTLV; + /** */ public class JstlELSqlTLV extends JstlSqlTLV { --- src/main/java/org/apache/taglibs/standard/tlv/el/JstlELXmlTLV.java (revision 0) +++ src/main/java/org/apache/taglibs/standard/tlv/el/JstlELXmlTLV.java (working copy) @@ -14,8 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.taglibs.standard.tlv; +package org.apache.taglibs.standard.tlv.el; +import org.apache.taglibs.standard.tlv.JstlXmlTLV; + /** */ public class JstlELXmlTLV extends JstlXmlTLV { --- src/main/java/org/apache/taglibs/standard/tlv/el/ValidationUtil.java (revision 0) +++ src/main/java/org/apache/taglibs/standard/tlv/el/ValidationUtil.java (working copy) @@ -14,8 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.taglibs.standard.tlv; +package org.apache.taglibs.standard.tlv.el; + import javax.servlet.jsp.JspException; import org.apache.taglibs.standard.lang.support.ExpressionEvaluator; --- src/main/java/org/apache/taglibs/standard/tlv/JstlELCoreTLV.java (revision 1041712) +++ src/main/java/org/apache/taglibs/standard/tlv/JstlELCoreTLV.java (working copy) @@ -1,26 +0,0 @@ -/* - * 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); - } -} --- src/main/java/org/apache/taglibs/standard/tlv/JstlELFmtTLV.java (revision 1041712) +++ src/main/java/org/apache/taglibs/standard/tlv/JstlELFmtTLV.java (working copy) @@ -1,26 +0,0 @@ -/* - * 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); - } -} --- src/main/java/org/apache/taglibs/standard/tlv/JstlELSqlTLV.java (revision 1041712) +++ src/main/java/org/apache/taglibs/standard/tlv/JstlELSqlTLV.java (working copy) @@ -1,26 +0,0 @@ -/* - * 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); - } -} --- src/main/java/org/apache/taglibs/standard/tlv/JstlELXmlTLV.java (revision 1041712) +++ src/main/java/org/apache/taglibs/standard/tlv/JstlELXmlTLV.java (working copy) @@ -1,26 +0,0 @@ -/* - * 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); - } -} --- src/main/java/org/apache/taglibs/standard/tlv/ValidationUtil.java (revision 1041712) +++ src/main/java/org/apache/taglibs/standard/tlv/ValidationUtil.java (working copy) @@ -1,49 +0,0 @@ -/* - * 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; - } - } -} --- src/main/resources/META-INF/c-1_0.tld (revision 1041712) +++ src/main/resources/META-INF/c-1_0.tld (working copy) @@ -12,7 +12,7 @@ - org.apache.taglibs.standard.tlv.JstlELCoreTLV + org.apache.taglibs.standard.tlv.el.JstlELCoreTLV expressionAttributes --- src/main/resources/META-INF/fmt-1_0.tld (revision 1041712) +++ src/main/resources/META-INF/fmt-1_0.tld (working copy) @@ -12,7 +12,7 @@ - org.apache.taglibs.standard.tlv.JstlELFmtTLV + org.apache.taglibs.standard.tlv.el.JstlELFmtTLV expressionAttributes --- src/main/resources/META-INF/sql-1_0.tld (revision 1041712) +++ src/main/resources/META-INF/sql-1_0.tld (working copy) @@ -12,7 +12,7 @@ - org.apache.taglibs.standard.tlv.JstlELSqlTLV + org.apache.taglibs.standard.tlv.el.JstlELSqlTLV expressionAttributes --- src/main/resources/META-INF/x-1_0.tld (revision 1041712) +++ src/main/resources/META-INF/x-1_0.tld (working copy) @@ -12,7 +12,7 @@ - org.apache.taglibs.standard.tlv.JstlELXmlTLV + org.apache.taglibs.standard.tlv.el.JstlELXmlTLV expressionAttributes