View | Details | Raw Unified | Return to bug 50414
Collapse All | Expand All

(-)src/main/java/org/apache/taglibs/standard/tlv/el/JstlELCoreTLV.java (-1 / +3 lines)
Lines 14-21 Link Here
14
 * See the License for the specific language governing permissions and
14
 * See the License for the specific language governing permissions and
15
 * limitations under the License.
15
 * limitations under the License.
16
 */
16
 */
17
package org.apache.taglibs.standard.tlv;
17
package org.apache.taglibs.standard.tlv.el;
18
18
19
import org.apache.taglibs.standard.tlv.JstlCoreTLV;
20
19
/**
21
/**
20
 */
22
 */
21
public class JstlELCoreTLV extends JstlCoreTLV {
23
public class JstlELCoreTLV extends JstlCoreTLV {
(-)src/main/java/org/apache/taglibs/standard/tlv/el/JstlELFmtTLV.java (-1 / +3 lines)
Lines 14-21 Link Here
14
 * See the License for the specific language governing permissions and
14
 * See the License for the specific language governing permissions and
15
 * limitations under the License.
15
 * limitations under the License.
16
 */
16
 */
17
package org.apache.taglibs.standard.tlv;
17
package org.apache.taglibs.standard.tlv.el;
18
18
19
import org.apache.taglibs.standard.tlv.JstlFmtTLV;
20
19
/**
21
/**
20
 */
22
 */
21
public class JstlELFmtTLV extends JstlFmtTLV {
23
public class JstlELFmtTLV extends JstlFmtTLV {
(-)src/main/java/org/apache/taglibs/standard/tlv/el/JstlELSqlTLV.java (-1 / +3 lines)
Lines 14-21 Link Here
14
 * See the License for the specific language governing permissions and
14
 * See the License for the specific language governing permissions and
15
 * limitations under the License.
15
 * limitations under the License.
16
 */
16
 */
17
package org.apache.taglibs.standard.tlv;
17
package org.apache.taglibs.standard.tlv.el;
18
18
19
import org.apache.taglibs.standard.tlv.JstlSqlTLV;
20
19
/**
21
/**
20
 */
22
 */
21
public class JstlELSqlTLV extends JstlSqlTLV {
23
public class JstlELSqlTLV extends JstlSqlTLV {
(-)src/main/java/org/apache/taglibs/standard/tlv/el/JstlELXmlTLV.java (-1 / +3 lines)
Lines 14-21 Link Here
14
 * See the License for the specific language governing permissions and
14
 * See the License for the specific language governing permissions and
15
 * limitations under the License.
15
 * limitations under the License.
16
 */
16
 */
17
package org.apache.taglibs.standard.tlv;
17
package org.apache.taglibs.standard.tlv.el;
18
18
19
import org.apache.taglibs.standard.tlv.JstlXmlTLV;
20
19
/**
21
/**
20
 */
22
 */
21
public class JstlELXmlTLV extends JstlXmlTLV {
23
public class JstlELXmlTLV extends JstlXmlTLV {
(-)src/main/java/org/apache/taglibs/standard/tlv/el/ValidationUtil.java (-1 / +2 lines)
Lines 14-21 Link Here
14
 * See the License for the specific language governing permissions and
14
 * See the License for the specific language governing permissions and
15
 * limitations under the License.
15
 * limitations under the License.
16
 */
16
 */
17
package org.apache.taglibs.standard.tlv;
17
package org.apache.taglibs.standard.tlv.el;
18
18
19
19
import javax.servlet.jsp.JspException;
20
import javax.servlet.jsp.JspException;
20
21
21
import org.apache.taglibs.standard.lang.support.ExpressionEvaluator;
22
import org.apache.taglibs.standard.lang.support.ExpressionEvaluator;
(-)src/main/java/org/apache/taglibs/standard/tlv/JstlELCoreTLV.java (-26 lines)
Lines 1-26 Link Here
1
/*
2
 * Licensed to the Apache Software Foundation (ASF) under one or more
3
 * contributor license agreements.  See the NOTICE file distributed with
4
 * this work for additional information regarding copyright ownership.
5
 * The ASF licenses this file to You under the Apache License, Version 2.0
6
 * (the "License"); you may not use this file except in compliance with
7
 * the License.  You may obtain a copy of the License at
8
 * 
9
 *      http://www.apache.org/licenses/LICENSE-2.0
10
 * 
11
 * Unless required by applicable law or agreed to in writing, software
12
 * distributed under the License is distributed on an "AS IS" BASIS,
13
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14
 * See the License for the specific language governing permissions and
15
 * limitations under the License.
16
 */
17
package org.apache.taglibs.standard.tlv;
18
19
/**
20
 */
21
public class JstlELCoreTLV extends JstlCoreTLV {
22
    @Override
23
    protected String validateExpression(String elem, String att, String expr) {
24
        return ValidationUtil.validateExpression(elem, att, expr);
25
    }
26
}
(-)src/main/java/org/apache/taglibs/standard/tlv/JstlELFmtTLV.java (-26 lines)
Lines 1-26 Link Here
1
/*
2
 * Licensed to the Apache Software Foundation (ASF) under one or more
3
 * contributor license agreements.  See the NOTICE file distributed with
4
 * this work for additional information regarding copyright ownership.
5
 * The ASF licenses this file to You under the Apache License, Version 2.0
6
 * (the "License"); you may not use this file except in compliance with
7
 * the License.  You may obtain a copy of the License at
8
 * 
9
 *      http://www.apache.org/licenses/LICENSE-2.0
10
 * 
11
 * Unless required by applicable law or agreed to in writing, software
12
 * distributed under the License is distributed on an "AS IS" BASIS,
13
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14
 * See the License for the specific language governing permissions and
15
 * limitations under the License.
16
 */
17
package org.apache.taglibs.standard.tlv;
18
19
/**
20
 */
21
public class JstlELFmtTLV extends JstlFmtTLV {
22
    @Override
23
    protected String validateExpression(String elem, String att, String expr) {
24
        return ValidationUtil.validateExpression(elem, att, expr);
25
    }
26
}
(-)src/main/java/org/apache/taglibs/standard/tlv/JstlELSqlTLV.java (-26 lines)
Lines 1-26 Link Here
1
/*
2
 * Licensed to the Apache Software Foundation (ASF) under one or more
3
 * contributor license agreements.  See the NOTICE file distributed with
4
 * this work for additional information regarding copyright ownership.
5
 * The ASF licenses this file to You under the Apache License, Version 2.0
6
 * (the "License"); you may not use this file except in compliance with
7
 * the License.  You may obtain a copy of the License at
8
 * 
9
 *      http://www.apache.org/licenses/LICENSE-2.0
10
 * 
11
 * Unless required by applicable law or agreed to in writing, software
12
 * distributed under the License is distributed on an "AS IS" BASIS,
13
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14
 * See the License for the specific language governing permissions and
15
 * limitations under the License.
16
 */
17
package org.apache.taglibs.standard.tlv;
18
19
/**
20
 */
21
public class JstlELSqlTLV extends JstlSqlTLV {
22
    @Override
23
    protected String validateExpression(String elem, String att, String expr) {
24
        return ValidationUtil.validateExpression(elem, att, expr);
25
    }
26
}
(-)src/main/java/org/apache/taglibs/standard/tlv/JstlELXmlTLV.java (-26 lines)
Lines 1-26 Link Here
1
/*
2
 * Licensed to the Apache Software Foundation (ASF) under one or more
3
 * contributor license agreements.  See the NOTICE file distributed with
4
 * this work for additional information regarding copyright ownership.
5
 * The ASF licenses this file to You under the Apache License, Version 2.0
6
 * (the "License"); you may not use this file except in compliance with
7
 * the License.  You may obtain a copy of the License at
8
 * 
9
 *      http://www.apache.org/licenses/LICENSE-2.0
10
 * 
11
 * Unless required by applicable law or agreed to in writing, software
12
 * distributed under the License is distributed on an "AS IS" BASIS,
13
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14
 * See the License for the specific language governing permissions and
15
 * limitations under the License.
16
 */
17
package org.apache.taglibs.standard.tlv;
18
19
/**
20
 */
21
public class JstlELXmlTLV extends JstlXmlTLV {
22
    @Override
23
    protected String validateExpression(String elem, String att, String expr) {
24
        return ValidationUtil.validateExpression(elem, att, expr);
25
    }
26
}
(-)src/main/java/org/apache/taglibs/standard/tlv/ValidationUtil.java (-49 lines)
Lines 1-49 Link Here
1
/*
2
 * Licensed to the Apache Software Foundation (ASF) under one or more
3
 * contributor license agreements.  See the NOTICE file distributed with
4
 * this work for additional information regarding copyright ownership.
5
 * The ASF licenses this file to You under the Apache License, Version 2.0
6
 * (the "License"); you may not use this file except in compliance with
7
 * the License.  You may obtain a copy of the License at
8
 * 
9
 *      http://www.apache.org/licenses/LICENSE-2.0
10
 * 
11
 * Unless required by applicable law or agreed to in writing, software
12
 * distributed under the License is distributed on an "AS IS" BASIS,
13
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14
 * See the License for the specific language governing permissions and
15
 * limitations under the License.
16
 */
17
package org.apache.taglibs.standard.tlv;
18
19
import javax.servlet.jsp.JspException;
20
21
import org.apache.taglibs.standard.lang.support.ExpressionEvaluator;
22
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
23
24
/**
25
 */
26
public class ValidationUtil {
27
    static String validateExpression(
28
            String elem, String att, String expr) {
29
30
        // let's just use the cache kept by the ExpressionEvaluatorManager
31
        ExpressionEvaluator current;
32
        try {
33
            current =
34
                    ExpressionEvaluatorManager.getEvaluatorByName(
35
                            ExpressionEvaluatorManager.EVALUATOR_CLASS);
36
        } catch (JspException ex) {
37
            // (using JspException here feels ugly, but it's what EEM uses)
38
            return ex.getMessage();
39
        }
40
41
        String response = current.validate(att, expr);
42
        if (response == null) {
43
            return response;
44
        } else {
45
            return "tag = '" + elem + "' / attribute = '" + att + "': "
46
                    + response;
47
        }
48
    }
49
}
(-)src/main/resources/META-INF/c-1_0.tld (-1 / +1 lines)
Lines 12-18 Link Here
12
12
13
    <validator>
13
    <validator>
14
        <validator-class>
14
        <validator-class>
15
            org.apache.taglibs.standard.tlv.JstlELCoreTLV
15
            org.apache.taglibs.standard.tlv.el.JstlELCoreTLV
16
        </validator-class>
16
        </validator-class>
17
        <init-param>
17
        <init-param>
18
            <param-name>expressionAttributes</param-name>
18
            <param-name>expressionAttributes</param-name>
(-)src/main/resources/META-INF/fmt-1_0.tld (-1 / +1 lines)
Lines 12-18 Link Here
12
12
13
    <validator>
13
    <validator>
14
        <validator-class>
14
        <validator-class>
15
            org.apache.taglibs.standard.tlv.JstlELFmtTLV
15
            org.apache.taglibs.standard.tlv.el.JstlELFmtTLV
16
        </validator-class>
16
        </validator-class>
17
        <init-param>
17
        <init-param>
18
            <param-name>expressionAttributes</param-name>
18
            <param-name>expressionAttributes</param-name>
(-)src/main/resources/META-INF/sql-1_0.tld (-1 / +1 lines)
Lines 12-18 Link Here
12
12
13
    <validator>
13
    <validator>
14
        <validator-class>
14
        <validator-class>
15
            org.apache.taglibs.standard.tlv.JstlELSqlTLV
15
            org.apache.taglibs.standard.tlv.el.JstlELSqlTLV
16
        </validator-class>
16
        </validator-class>
17
        <init-param>
17
        <init-param>
18
            <param-name>expressionAttributes</param-name>
18
            <param-name>expressionAttributes</param-name>
(-)src/main/resources/META-INF/x-1_0.tld (-1 / +1 lines)
Lines 12-18 Link Here
12
12
13
    <validator>
13
    <validator>
14
        <validator-class>
14
        <validator-class>
15
            org.apache.taglibs.standard.tlv.JstlELXmlTLV
15
            org.apache.taglibs.standard.tlv.el.JstlELXmlTLV
16
        </validator-class>
16
        </validator-class>
17
        <init-param>
17
        <init-param>
18
            <param-name>expressionAttributes</param-name>
18
            <param-name>expressionAttributes</param-name>

Return to bug 50414