Author: apetrelli
Date: Sun Sep 20 11:26:26 2009
New Revision: 817009
URL: http://svn.apache.org/viewvc?rev=817009&view=rev
Log:
TILES-458
Refactored MVEL and OGNL support classes.
Fixed documentation about MVEL and OGNL.
Fixed tiles-portlet-wildcard pom.
Added:
tiles/framework/trunk/tiles-mvel/src/main/java/org/apache/tiles/mvel/
- copied from r816357,
tiles/framework/trunk/tiles-mvel/src/main/java/org/apache/tiles/evaluator/mvel/
tiles/framework/trunk/tiles-mvel/src/test/java/org/apache/tiles/mvel/
- copied from r816357,
tiles/framework/trunk/tiles-mvel/src/test/java/org/apache/tiles/evaluator/mvel/
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/
- copied from r816357,
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/evaluator/ognl/
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/
- copied from r816357,
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/evaluator/ognl/
Removed:
tiles/framework/trunk/tiles-mvel/src/main/java/org/apache/tiles/evaluator/mvel/
tiles/framework/trunk/tiles-mvel/src/test/java/org/apache/tiles/evaluator/mvel/
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/evaluator/ognl/
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/evaluator/ognl/
Modified:
tiles/framework/trunk/src/site/apt/tutorial/advanced/el-support.apt
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
tiles/framework/trunk/tiles-mvel/src/main/java/org/apache/tiles/mvel/MVELAttributeEvaluator.java
tiles/framework/trunk/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactory.java
tiles/framework/trunk/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextVariableResolverFactory.java
tiles/framework/trunk/tiles-mvel/src/test/java/org/apache/tiles/mvel/MVELAttributeEvaluatorTest.java
tiles/framework/trunk/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactoryTest.java
tiles/framework/trunk/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextVariableResolverFactoryTest.java
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/ApplicationScopeNestedObjectExtractor.java
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/DelegatePropertyAccessor.java
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessor.java
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectExtractor.java
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/OGNLAttributeEvaluator.java
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/PropertyAccessorDelegateFactory.java
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/RequestScopeNestedObjectExtractor.java
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/SessionScopeNestedObjectExtractor.java
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractor.java
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactory.java
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/ApplicationScopeNestedObjectExtractorTest.java
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/DelegatePropertyAccessorTest.java
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessorTest.java
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/RequestScopeNestedObjectExtractorTest.java
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/SessionScopeNestedObjectExtractorTest.java
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractorTest.java
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactoryTest.java
tiles/framework/trunk/tiles-portlet-wildcard/pom.xml
Modified: tiles/framework/trunk/src/site/apt/tutorial/advanced/el-support.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/tutorial/advanced/el-support.apt?rev=817009&r1=817008&r2=817009&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/apt/tutorial/advanced/el-support.apt
(original)
+++ tiles/framework/trunk/src/site/apt/tutorial/advanced/el-support.apt Sun Sep
20 11:26:26 2009
@@ -92,7 +92,7 @@
}
------------------------------------
-** Configuration under Servlets 2.4/JSP 2.1
+** Configuration under Servlets 2.4/JSP 2.0
If you are using Servlets 2.4/JSP 2.0, you still can use Tiles EL support
but:
@@ -168,7 +168,7 @@
* {MVEL Support}
To use MVEL support you need to register an instance of
-
{{{../../apidocs/org/apache/tiles/evaluator/mvel/MVELAttributeEvaluator.html}
MVELAttributeEvaluator}}
+ {{{../../apidocs/org/apache/tiles/mvel/MVELAttributeEvaluator.html}
MVELAttributeEvaluator}}
along with other supporting objects.
------------------------------------
@@ -214,7 +214,7 @@
* {OGNL Support}
To use OGNL support you need to register an instance of
-
{{{../../apidocs/org/apache/tiles/evaluator/ognl/OGNLAttributeEvaluator.html}
OGNLAttributeEvaluator}}
+ {{{../../apidocs/org/apache/tiles/ognl/OGNLAttributeEvaluator.html}
OGNLAttributeEvaluator}}
along with other supporting objects.
------------------------------------
Modified:
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java?rev=817009&r1=817008&r2=817009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
(original)
+++
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
Sun Sep 20 11:26:26 2009
@@ -59,18 +59,6 @@
import org.apache.tiles.el.TilesContextELResolver;
import org.apache.tiles.evaluator.AttributeEvaluatorFactory;
import org.apache.tiles.evaluator.BasicAttributeEvaluatorFactory;
-import org.apache.tiles.evaluator.mvel.MVELAttributeEvaluator;
-import org.apache.tiles.evaluator.mvel.TilesContextBeanVariableResolverFactory;
-import org.apache.tiles.evaluator.mvel.TilesContextVariableResolverFactory;
-import org.apache.tiles.evaluator.ognl.ApplicationScopeNestedObjectExtractor;
-import org.apache.tiles.evaluator.ognl.DelegatePropertyAccessor;
-import org.apache.tiles.evaluator.ognl.NestedObjectDelegatePropertyAccessor;
-import org.apache.tiles.evaluator.ognl.OGNLAttributeEvaluator;
-import org.apache.tiles.evaluator.ognl.PropertyAccessorDelegateFactory;
-import org.apache.tiles.evaluator.ognl.RequestScopeNestedObjectExtractor;
-import org.apache.tiles.evaluator.ognl.SessionScopeNestedObjectExtractor;
-import
org.apache.tiles.evaluator.ognl.TilesApplicationContextNestedObjectExtractor;
-import
org.apache.tiles.evaluator.ognl.TilesContextPropertyAccessorDelegateFactory;
import org.apache.tiles.factory.BasicTilesContainerFactory;
import org.apache.tiles.factory.TilesContainerFactoryException;
import
org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContextFactory;
@@ -78,6 +66,18 @@
import org.apache.tiles.impl.BasicTilesContainer;
import org.apache.tiles.impl.mgmt.CachingTilesContainer;
import org.apache.tiles.locale.LocaleResolver;
+import org.apache.tiles.mvel.MVELAttributeEvaluator;
+import org.apache.tiles.mvel.TilesContextBeanVariableResolverFactory;
+import org.apache.tiles.mvel.TilesContextVariableResolverFactory;
+import org.apache.tiles.ognl.ApplicationScopeNestedObjectExtractor;
+import org.apache.tiles.ognl.DelegatePropertyAccessor;
+import org.apache.tiles.ognl.NestedObjectDelegatePropertyAccessor;
+import org.apache.tiles.ognl.OGNLAttributeEvaluator;
+import org.apache.tiles.ognl.PropertyAccessorDelegateFactory;
+import org.apache.tiles.ognl.RequestScopeNestedObjectExtractor;
+import org.apache.tiles.ognl.SessionScopeNestedObjectExtractor;
+import org.apache.tiles.ognl.TilesApplicationContextNestedObjectExtractor;
+import org.apache.tiles.ognl.TilesContextPropertyAccessorDelegateFactory;
import org.apache.tiles.renderer.impl.BasicRendererFactory;
import org.apache.tiles.util.URLUtil;
import org.apache.tiles.velocity.context.VelocityTilesRequestContextFactory;
Modified:
tiles/framework/trunk/tiles-mvel/src/main/java/org/apache/tiles/mvel/MVELAttributeEvaluator.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-mvel/src/main/java/org/apache/tiles/mvel/MVELAttributeEvaluator.java?rev=817009&r1=816357&r2=817009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-mvel/src/main/java/org/apache/tiles/mvel/MVELAttributeEvaluator.java
(original)
+++
tiles/framework/trunk/tiles-mvel/src/main/java/org/apache/tiles/mvel/MVELAttributeEvaluator.java
Sun Sep 20 11:26:26 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.evaluator.mvel;
+package org.apache.tiles.mvel;
import java.util.Map;
Modified:
tiles/framework/trunk/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactory.java?rev=817009&r1=816357&r2=817009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactory.java
(original)
+++
tiles/framework/trunk/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactory.java
Sun Sep 20 11:26:26 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.evaluator.mvel;
+package org.apache.tiles.mvel;
import java.util.HashMap;
Modified:
tiles/framework/trunk/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextVariableResolverFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextVariableResolverFactory.java?rev=817009&r1=816357&r2=817009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextVariableResolverFactory.java
(original)
+++
tiles/framework/trunk/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextVariableResolverFactory.java
Sun Sep 20 11:26:26 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.evaluator.mvel;
+package org.apache.tiles.mvel;
import java.beans.PropertyDescriptor;
import java.lang.reflect.InvocationTargetException;
Modified:
tiles/framework/trunk/tiles-mvel/src/test/java/org/apache/tiles/mvel/MVELAttributeEvaluatorTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-mvel/src/test/java/org/apache/tiles/mvel/MVELAttributeEvaluatorTest.java?rev=817009&r1=816357&r2=817009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-mvel/src/test/java/org/apache/tiles/mvel/MVELAttributeEvaluatorTest.java
(original)
+++
tiles/framework/trunk/tiles-mvel/src/test/java/org/apache/tiles/mvel/MVELAttributeEvaluatorTest.java
Sun Sep 20 11:26:26 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.evaluator.mvel;
+package org.apache.tiles.mvel;
import java.util.HashMap;
import java.util.Map;
@@ -30,6 +30,9 @@
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextHolder;
+import org.apache.tiles.mvel.MVELAttributeEvaluator;
+import org.apache.tiles.mvel.TilesContextBeanVariableResolverFactory;
+import org.apache.tiles.mvel.TilesContextVariableResolverFactory;
import org.easymock.EasyMock;
import org.mvel2.integration.VariableResolverFactory;
Modified:
tiles/framework/trunk/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactoryTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactoryTest.java?rev=817009&r1=816357&r2=817009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactoryTest.java
(original)
+++
tiles/framework/trunk/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactoryTest.java
Sun Sep 20 11:26:26 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.evaluator.mvel;
+package org.apache.tiles.mvel;
import static org.junit.Assert.*;
import static org.easymock.EasyMock.*;
@@ -30,6 +30,7 @@
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextHolder;
+import org.apache.tiles.mvel.TilesContextBeanVariableResolverFactory;
import org.junit.Before;
import org.junit.Test;
import org.mvel2.UnresolveablePropertyException;
Modified:
tiles/framework/trunk/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextVariableResolverFactoryTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextVariableResolverFactoryTest.java?rev=817009&r1=816357&r2=817009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextVariableResolverFactoryTest.java
(original)
+++
tiles/framework/trunk/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextVariableResolverFactoryTest.java
Sun Sep 20 11:26:26 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.evaluator.mvel;
+package org.apache.tiles.mvel;
import static org.junit.Assert.*;
import static org.easymock.EasyMock.*;
@@ -30,6 +30,7 @@
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextHolder;
+import org.apache.tiles.mvel.TilesContextVariableResolverFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified:
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/ApplicationScopeNestedObjectExtractor.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/ApplicationScopeNestedObjectExtractor.java?rev=817009&r1=816357&r2=817009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/ApplicationScopeNestedObjectExtractor.java
(original)
+++
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/ApplicationScopeNestedObjectExtractor.java
Sun Sep 20 11:26:26 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.evaluator.ognl;
+package org.apache.tiles.ognl;
import java.util.Map;
Modified:
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/DelegatePropertyAccessor.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/DelegatePropertyAccessor.java?rev=817009&r1=816357&r2=817009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/DelegatePropertyAccessor.java
(original)
+++
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/DelegatePropertyAccessor.java
Sun Sep 20 11:26:26 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.evaluator.ognl;
+package org.apache.tiles.ognl;
import java.util.Map;
Modified:
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessor.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessor.java?rev=817009&r1=816357&r2=817009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessor.java
(original)
+++
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessor.java
Sun Sep 20 11:26:26 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.evaluator.ognl;
+package org.apache.tiles.ognl;
import java.util.Map;
Modified:
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectExtractor.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectExtractor.java?rev=817009&r1=816357&r2=817009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectExtractor.java
(original)
+++
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectExtractor.java
Sun Sep 20 11:26:26 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.evaluator.ognl;
+package org.apache.tiles.ognl;
/**
* Extracts an object using another object as a basis.
Modified:
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/OGNLAttributeEvaluator.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/OGNLAttributeEvaluator.java?rev=817009&r1=816357&r2=817009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/OGNLAttributeEvaluator.java
(original)
+++
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/OGNLAttributeEvaluator.java
Sun Sep 20 11:26:26 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.evaluator.ognl;
+package org.apache.tiles.ognl;
import java.util.Map;
Modified:
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/PropertyAccessorDelegateFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/PropertyAccessorDelegateFactory.java?rev=817009&r1=816357&r2=817009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/PropertyAccessorDelegateFactory.java
(original)
+++
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/PropertyAccessorDelegateFactory.java
Sun Sep 20 11:26:26 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.evaluator.ognl;
+package org.apache.tiles.ognl;
import ognl.PropertyAccessor;
Modified:
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/RequestScopeNestedObjectExtractor.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/RequestScopeNestedObjectExtractor.java?rev=817009&r1=816357&r2=817009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/RequestScopeNestedObjectExtractor.java
(original)
+++
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/RequestScopeNestedObjectExtractor.java
Sun Sep 20 11:26:26 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.evaluator.ognl;
+package org.apache.tiles.ognl;
import java.util.Map;
Modified:
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/SessionScopeNestedObjectExtractor.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/SessionScopeNestedObjectExtractor.java?rev=817009&r1=816357&r2=817009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/SessionScopeNestedObjectExtractor.java
(original)
+++
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/SessionScopeNestedObjectExtractor.java
Sun Sep 20 11:26:26 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.evaluator.ognl;
+package org.apache.tiles.ognl;
import java.util.Map;
Modified:
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractor.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractor.java?rev=817009&r1=816357&r2=817009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractor.java
(original)
+++
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractor.java
Sun Sep 20 11:26:26 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.evaluator.ognl;
+package org.apache.tiles.ognl;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.TilesRequestContext;
Modified:
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactory.java?rev=817009&r1=816357&r2=817009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactory.java
(original)
+++
tiles/framework/trunk/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactory.java
Sun Sep 20 11:26:26 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.evaluator.ognl;
+package org.apache.tiles.ognl;
import java.util.Map;
Modified:
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/ApplicationScopeNestedObjectExtractorTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/ApplicationScopeNestedObjectExtractorTest.java?rev=817009&r1=816357&r2=817009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/ApplicationScopeNestedObjectExtractorTest.java
(original)
+++
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/ApplicationScopeNestedObjectExtractorTest.java
Sun Sep 20 11:26:26 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.evaluator.ognl;
+package org.apache.tiles.ognl;
import static org.junit.Assert.*;
import static org.easymock.EasyMock.*;
@@ -29,6 +29,8 @@
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.ognl.ApplicationScopeNestedObjectExtractor;
+import org.apache.tiles.ognl.NestedObjectExtractor;
import org.junit.Test;
/**
Modified:
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/DelegatePropertyAccessorTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/DelegatePropertyAccessorTest.java?rev=817009&r1=816357&r2=817009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/DelegatePropertyAccessorTest.java
(original)
+++
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/DelegatePropertyAccessorTest.java
Sun Sep 20 11:26:26 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.evaluator.ognl;
+package org.apache.tiles.ognl;
import static org.junit.Assert.*;
import static org.easymock.classextension.EasyMock.*;
@@ -30,6 +30,8 @@
import ognl.OgnlException;
import ognl.PropertyAccessor;
+import org.apache.tiles.ognl.DelegatePropertyAccessor;
+import org.apache.tiles.ognl.PropertyAccessorDelegateFactory;
import org.junit.Test;
/**
Modified:
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessorTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessorTest.java?rev=817009&r1=816357&r2=817009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessorTest.java
(original)
+++
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessorTest.java
Sun Sep 20 11:26:26 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.evaluator.ognl;
+package org.apache.tiles.ognl;
import static org.junit.Assert.*;
import static org.easymock.classextension.EasyMock.*;
@@ -30,6 +30,8 @@
import ognl.OgnlException;
import ognl.PropertyAccessor;
+import org.apache.tiles.ognl.NestedObjectDelegatePropertyAccessor;
+import org.apache.tiles.ognl.NestedObjectExtractor;
import org.junit.Test;
/**
Modified:
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java?rev=817009&r1=816357&r2=817009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java
(original)
+++
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java
Sun Sep 20 11:26:26 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.evaluator.ognl;
+package org.apache.tiles.ognl;
import java.util.HashMap;
import java.util.Map;
@@ -32,6 +32,15 @@
import org.apache.tiles.Expression;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.ognl.ApplicationScopeNestedObjectExtractor;
+import org.apache.tiles.ognl.DelegatePropertyAccessor;
+import org.apache.tiles.ognl.NestedObjectDelegatePropertyAccessor;
+import org.apache.tiles.ognl.OGNLAttributeEvaluator;
+import org.apache.tiles.ognl.PropertyAccessorDelegateFactory;
+import org.apache.tiles.ognl.RequestScopeNestedObjectExtractor;
+import org.apache.tiles.ognl.SessionScopeNestedObjectExtractor;
+import org.apache.tiles.ognl.TilesApplicationContextNestedObjectExtractor;
+import org.apache.tiles.ognl.TilesContextPropertyAccessorDelegateFactory;
import org.easymock.EasyMock;
/**
Modified:
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/RequestScopeNestedObjectExtractorTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/RequestScopeNestedObjectExtractorTest.java?rev=817009&r1=816357&r2=817009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/RequestScopeNestedObjectExtractorTest.java
(original)
+++
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/RequestScopeNestedObjectExtractorTest.java
Sun Sep 20 11:26:26 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.evaluator.ognl;
+package org.apache.tiles.ognl;
import static org.junit.Assert.*;
import static org.easymock.EasyMock.*;
@@ -28,6 +28,9 @@
import java.util.Map;
import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.ognl.NestedObjectExtractor;
+import org.apache.tiles.ognl.RequestScopeNestedObjectExtractor;
+import org.apache.tiles.ognl.SessionScopeNestedObjectExtractor;
import org.junit.Test;
/**
Modified:
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/SessionScopeNestedObjectExtractorTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/SessionScopeNestedObjectExtractorTest.java?rev=817009&r1=816357&r2=817009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/SessionScopeNestedObjectExtractorTest.java
(original)
+++
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/SessionScopeNestedObjectExtractorTest.java
Sun Sep 20 11:26:26 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.evaluator.ognl;
+package org.apache.tiles.ognl;
import static org.junit.Assert.*;
import static org.easymock.EasyMock.*;
@@ -28,6 +28,9 @@
import java.util.Map;
import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.ognl.NestedObjectExtractor;
+import org.apache.tiles.ognl.RequestScopeNestedObjectExtractor;
+import org.apache.tiles.ognl.SessionScopeNestedObjectExtractor;
import org.junit.Test;
/**
Modified:
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractorTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractorTest.java?rev=817009&r1=816357&r2=817009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractorTest.java
(original)
+++
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractorTest.java
Sun Sep 20 11:26:26 2009
@@ -19,13 +19,15 @@
* under the License.
*/
-package org.apache.tiles.evaluator.ognl;
+package org.apache.tiles.ognl;
import static org.junit.Assert.*;
import static org.easymock.EasyMock.*;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.ognl.NestedObjectExtractor;
+import org.apache.tiles.ognl.TilesApplicationContextNestedObjectExtractor;
import org.junit.Test;
/**
Modified:
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactoryTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactoryTest.java?rev=817009&r1=816357&r2=817009&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactoryTest.java
(original)
+++
tiles/framework/trunk/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactoryTest.java
Sun Sep 20 11:26:26 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.evaluator.ognl;
+package org.apache.tiles.ognl;
import static org.junit.Assert.*;
import static org.easymock.EasyMock.*;
@@ -31,6 +31,8 @@
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.ognl.PropertyAccessorDelegateFactory;
+import org.apache.tiles.ognl.TilesContextPropertyAccessorDelegateFactory;
import org.junit.Test;
/**
Modified: tiles/framework/trunk/tiles-portlet-wildcard/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-portlet-wildcard/pom.xml?rev=817009&r1=817008&r2=817009&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-portlet-wildcard/pom.xml (original)
+++ tiles/framework/trunk/tiles-portlet-wildcard/pom.xml Sun Sep 20 11:26:26
2009
@@ -36,7 +36,7 @@
<description>Tiles Wildcard file loading in Portlets: Allows to load
resources using wildcards.</description>
<properties>
-
<tiles.osgi.symbolicName>org.apache.tiles.servlet.wildcard</tiles.osgi.symbolicName>
+
<tiles.osgi.symbolicName>org.apache.tiles.portlet.wildcard</tiles.osgi.symbolicName>
</properties>
<build>
