You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2009/09/19 15:45:41 UTC
svn commit: r816924 - in /tiles/framework/trunk/tiles-el/src:
main/java/org/apache/tiles/el/ main/java/org/apache/tiles/evaluator/el/
main/java/org/apache/tiles/jsp/evaluator/el/ test/java/org/apache/tiles/el/
Author: apetrelli
Date: Sat Sep 19 13:45:40 2009
New Revision: 816924
URL: http://svn.apache.org/viewvc?rev=816924&view=rev
Log:
TILES-458
tiles-el: re-added old packages that now contain only deprecated classes.
Added:
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java (with props)
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ELContextImpl.java (with props)
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ExpressionFactoryFactory.java (with props)
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TilesContextBeanELResolver.java (with props)
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TilesContextELResolver.java (with props)
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TomcatExpressionFactoryFactory.java
- copied, changed from r816921, tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TomcatExpressionFactoryFactory.java
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/package.html (with props)
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/jsp/evaluator/el/JspExpressionFactoryFactory.java (with props)
Removed:
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TomcatExpressionFactoryFactory.java
Modified:
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ELContextImpl.java
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ExpressionFactoryFactory.java
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TilesContextELResolver.java
tiles/framework/trunk/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java
Modified: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java?rev=816924&r1=816923&r2=816924&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java (original)
+++ tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java Sat Sep 19 13:45:40 2009
@@ -46,7 +46,7 @@
* contained in request, session and application scope.
*
* @version $Rev$ $Date$
- * @since 2.1.0
+ * @since 2.2.1
*/
public class ELAttributeEvaluator extends AbstractAttributeEvaluator implements
TilesApplicationContextAware {
@@ -55,7 +55,7 @@
* Initialization parameter to decide the implementation of
* {@link ExpressionFactoryFactory}.
*
- * @since 2.1.0
+ * @since 2.2.1
*/
public static final String EXPRESSION_FACTORY_FACTORY_INIT_PARAM =
"org.apache.tiles.evaluator.el.ExpressionFactoryFactory";
@@ -63,28 +63,28 @@
/**
* The Tiles application context.
*
- * @since 2.1.0
+ * @since 2.2.1
*/
protected TilesApplicationContext applicationContext;
/**
* The EL expression factory.
*
- * @since 2.1.0
+ * @since 2.2.1
*/
protected ExpressionFactory expressionFactory;
/**
* The EL resolver to use.
*
- * @since 2.1.0
+ * @since 2.2.1
*/
protected ELResolver resolver;
/**
* Constructor.
*
- * @since 2.1.0
+ * @since 2.2.1
*/
public ELAttributeEvaluator() {
}
@@ -134,7 +134,7 @@
* Sets the expression factory to use.
*
* @param expressionFactory The expression factory.
- * @since 2.1.0
+ * @since 2.2.1
*/
public void setExpressionFactory(ExpressionFactory expressionFactory) {
this.expressionFactory = expressionFactory;
@@ -144,7 +144,7 @@
* Sets the EL resolver to use.
*
* @param resolver The EL resolver.
- * @since 2.1.0
+ * @since 2.2.1
*/
public void setResolver(ELResolver resolver) {
this.resolver = resolver;
Modified: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ELContextImpl.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ELContextImpl.java?rev=816924&r1=816923&r2=816924&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ELContextImpl.java (original)
+++ tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ELContextImpl.java Sat Sep 19 13:45:40 2009
@@ -35,9 +35,9 @@
* Implementation of ELContext.<br>
* Copied from Apache Tomcat 6.0.16 source code.
*
- * @since 2.1.0
+ * @since 2.2.1
*/
-public final class ELContextImpl extends ELContext {
+public class ELContextImpl extends ELContext {
/**
* A null function mapper.
@@ -123,6 +123,7 @@
* Sets the function mapper to use.
*
* @param functionMapper The function mapper.
+ * @since 2.2.1
*/
public void setFunctionMapper(FunctionMapper functionMapper) {
this.functionMapper = functionMapper;
@@ -132,6 +133,7 @@
* Sets the variable mapper to use.
*
* @param variableMapper The variable mapper.
+ * @since 2.2.1
*/
public void setVariableMapper(VariableMapper variableMapper) {
this.variableMapper = variableMapper;
Modified: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ExpressionFactoryFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ExpressionFactoryFactory.java?rev=816924&r1=816923&r2=816924&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ExpressionFactoryFactory.java (original)
+++ tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/ExpressionFactoryFactory.java Sat Sep 19 13:45:40 2009
@@ -27,7 +27,7 @@
* Interface to define a factory of {@link ExpressionFactory}.
*
* @version $Rev$ $Date$
- * @since 2.1.0
+ * @since 2.2.1
*/
public interface ExpressionFactoryFactory {
@@ -35,7 +35,7 @@
* Returns the expression factory to use.
*
* @return The expression factory.
- * @since 2.1.0
+ * @since 2.2.1
*/
ExpressionFactory getExpressionFactory();
}
Modified: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java?rev=816924&r1=816923&r2=816924&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java (original)
+++ tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java Sat Sep 19 13:45:40 2009
@@ -32,7 +32,7 @@
* Uses the JSP 2.1 {@link ExpressionFactory} to be used in Tiles.
*
* @version $Rev$ $Date$
- * @since 2.1.0
+ * @since 2.2.1
*/
public class JspExpressionFactoryFactory implements ExpressionFactoryFactory,
TilesApplicationContextAware {
@@ -40,7 +40,7 @@
/**
* The servlet context.
*
- * @since 2.1.0
+ * @since 2.2.1
*/
protected ServletContext servletContext;
Modified: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java?rev=816924&r1=816923&r2=816924&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java (original)
+++ tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java Sat Sep 19 13:45:40 2009
@@ -36,7 +36,7 @@
* Resolves beans in request, session and application scope.
*
* @version $Rev$ $Date$
- * @since 2.1.0
+ * @since 2.2.1
*/
public class TilesContextBeanELResolver extends ELResolver {
@@ -121,6 +121,7 @@
*
* @param map The map containing the bean to be inspected.
* @param list The list to fill.
+ * @since 2.2.1
*/
protected void collectBeanInfo(Map<String, ? extends Object> map,
List<FeatureDescriptor> list) {
@@ -148,6 +149,7 @@
* @param context The context to use.
* @param property The property used as an attribute name.
* @return The found bean, if it exists, or <code>null</code> otherwise.
+ * @since 2.2.1
*/
protected Object findObjectByProperty(ELContext context, Object property) {
Object retValue = null;
@@ -177,6 +179,7 @@
* @param map The map to use.
* @param property The property to use as a key.
* @return The object, if present, or <code>null</code> otherwise.
+ * @since 2.2.1
*/
protected Object getObject(Map<String, ? extends Object> map,
String property) {
Modified: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TilesContextELResolver.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TilesContextELResolver.java?rev=816924&r1=816923&r2=816924&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TilesContextELResolver.java (original)
+++ tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TilesContextELResolver.java Sat Sep 19 13:45:40 2009
@@ -35,7 +35,7 @@
* {@link TilesApplicationContext}.
*
* @version $Rev$ $Date$
- * @since 2.1.0
+ * @since 2.2.1
*/
public class TilesContextELResolver extends BeanELResolver {
Added: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java?rev=816924&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java (added)
+++ tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java Sat Sep 19 13:45:40 2009
@@ -0,0 +1,36 @@
+/*
+ * $Id$
+ *
+ * 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.tiles.evaluator.el;
+
+
+/**
+ * Evaluates string expression with typical EL syntax.<br>
+ * You can use normal EL syntax, knowing that the root objects are
+ * {@link org.apache.tiles.TilesRequestContext},
+ * {@link org.apache.tiles.TilesApplicationContext} and beans contained in
+ * request, session and application scope.
+ *
+ * @version $Rev$ $Date$
+ * @since 2.1.0
+ * @deprecated Use {@link org.apache.tiles.el.ELAttributeEvaluator}.
+ */
+public class ELAttributeEvaluator extends org.apache.tiles.el.ELAttributeEvaluator {
+}
Propchange: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ELContextImpl.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ELContextImpl.java?rev=816924&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ELContextImpl.java (added)
+++ tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ELContextImpl.java Sat Sep 19 13:45:40 2009
@@ -0,0 +1,45 @@
+/*
+ * $Id$
+ *
+ * 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.tiles.evaluator.el;
+
+import javax.el.ELResolver;
+
+/**
+ * Implementation of ELContext.<br>
+ * Copied from Apache Tomcat 6.0.16 source code.
+ *
+ * @since 2.1.0
+ * @deprecated Use {@link org.apache.tiles.el.ELContextImpl}.
+ */
+public final class ELContextImpl extends org.apache.tiles.el.ELContextImpl {
+
+ /**
+ * Constructor.
+ *
+ * @param resolver The resolver to use.
+ * @deprecated Use
+ * {@link org.apache.tiles.el.ELContextImpl#ELContextImpl(ELResolver)}.
+ */
+ public ELContextImpl(ELResolver resolver) {
+ super(resolver);
+ }
+}
Propchange: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ELContextImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ELContextImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ExpressionFactoryFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ExpressionFactoryFactory.java?rev=816924&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ExpressionFactoryFactory.java (added)
+++ tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ExpressionFactoryFactory.java Sat Sep 19 13:45:40 2009
@@ -0,0 +1,34 @@
+/*
+ * $Id$
+ *
+ * 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.tiles.evaluator.el;
+
+import javax.el.ExpressionFactory;
+
+/**
+ * Interface to define a factory of {@link ExpressionFactory}.
+ *
+ * @version $Rev$ $Date$
+ * @since 2.1.0
+ * @deprecated Use {@link org.apache.tiles.el.ExpressionFactoryFactory}.
+ */
+public interface ExpressionFactoryFactory extends org.apache.tiles.el.ExpressionFactoryFactory {
+}
Propchange: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ExpressionFactoryFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ExpressionFactoryFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TilesContextBeanELResolver.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TilesContextBeanELResolver.java?rev=816924&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TilesContextBeanELResolver.java (added)
+++ tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TilesContextBeanELResolver.java Sat Sep 19 13:45:40 2009
@@ -0,0 +1,33 @@
+/*
+ * $Id$
+ *
+ * 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.tiles.evaluator.el;
+
+
+/**
+ * Resolves beans in request, session and application scope.
+ *
+ * @version $Rev$ $Date$
+ * @since 2.1.0
+ * @deprecated Use {@link TilesContextBeanELResolver}.
+ */
+public class TilesContextBeanELResolver extends
+ org.apache.tiles.el.TilesContextBeanELResolver {
+}
Propchange: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TilesContextBeanELResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TilesContextBeanELResolver.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TilesContextELResolver.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TilesContextELResolver.java?rev=816924&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TilesContextELResolver.java (added)
+++ tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TilesContextELResolver.java Sat Sep 19 13:45:40 2009
@@ -0,0 +1,36 @@
+/*
+ * $Id$
+ *
+ * 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.tiles.evaluator.el;
+
+import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.context.TilesRequestContext;
+
+/**
+ * Resolves properties of {@link TilesRequestContext} and
+ * {@link TilesApplicationContext}.
+ *
+ * @version $Rev$ $Date$
+ * @since 2.1.0
+ * @deprecated Use {@link TilesContextELResolver}.
+ */
+public class TilesContextELResolver extends
+ org.apache.tiles.el.TilesContextELResolver {
+}
Propchange: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TilesContextELResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TilesContextELResolver.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TomcatExpressionFactoryFactory.java (from r816921, tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TomcatExpressionFactoryFactory.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TomcatExpressionFactoryFactory.java?p2=tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TomcatExpressionFactoryFactory.java&p1=tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TomcatExpressionFactoryFactory.java&r1=816921&r2=816924&rev=816924&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/TomcatExpressionFactoryFactory.java (original)
+++ tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TomcatExpressionFactoryFactory.java Sat Sep 19 13:45:40 2009
@@ -19,11 +19,12 @@
* under the License.
*/
-package org.apache.tiles.el;
+package org.apache.tiles.evaluator.el;
import javax.el.ExpressionFactory;
import org.apache.el.ExpressionFactoryImpl;
+import org.apache.tiles.el.ExpressionFactoryFactory;
/**
* Creates an expression factory using Tomcat's Jasper engine.
Added: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/package.html
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/package.html?rev=816924&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/package.html (added)
+++ tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/package.html Sat Sep 19 13:45:40 2009
@@ -0,0 +1,30 @@
+<!--
+/*
+ * $Id$
+ *
+ * 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.
+ */
+-->
+<html>
+<head>
+ <title>Tiles attribute evaluator EL implementation (deprecated)</title>
+</head>
+<body>
+Deprecated package containing only deprecated classes that can perform EL evaluation for attributes.
+</body>
+</html>
\ No newline at end of file
Propchange: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/package.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/evaluator/el/package.html
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/jsp/evaluator/el/JspExpressionFactoryFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/jsp/evaluator/el/JspExpressionFactoryFactory.java?rev=816924&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/jsp/evaluator/el/JspExpressionFactoryFactory.java (added)
+++ tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/jsp/evaluator/el/JspExpressionFactoryFactory.java Sat Sep 19 13:45:40 2009
@@ -0,0 +1,35 @@
+/*
+ * $Id$
+ *
+ * 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.tiles.jsp.evaluator.el;
+
+import javax.el.ExpressionFactory;
+
+/**
+ * Uses the JSP 2.1 {@link ExpressionFactory} to be used in Tiles.
+ *
+ * @version $Rev$ $Date$
+ * @since 2.1.0
+ * @deprecated Use {@link org.apache.tiles.el.JspExpressionFactoryFactory}.
+ */
+public class JspExpressionFactoryFactory extends
+ org.apache.tiles.el.JspExpressionFactoryFactory {
+}
Propchange: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/jsp/evaluator/el/JspExpressionFactoryFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/jsp/evaluator/el/JspExpressionFactoryFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: tiles/framework/trunk/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java?rev=816924&r1=816923&r2=816924&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java (original)
+++ tiles/framework/trunk/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java Sat Sep 19 13:45:40 2009
@@ -30,7 +30,7 @@
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.el.ELAttributeEvaluator;
-import org.apache.tiles.el.TomcatExpressionFactoryFactory;
+import org.apache.tiles.evaluator.el.TomcatExpressionFactoryFactory;
import org.easymock.EasyMock;
/**