Author: apetrelli
Date: Tue Dec 22 20:18:35 2009
New Revision: 893303
URL: http://svn.apache.org/viewvc?rev=893303&view=rev
Log:
TILESSB-18
Moved "ApplicationContextAware" into another package.
Added:
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/ApplicationContextAware.java
- copied, changed from r892972,
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/awareness/ApplicationContextAware.java
Removed:
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/awareness/ApplicationContextAware.java
Modified:
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java
Copied:
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/ApplicationContextAware.java
(from r892972,
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/awareness/ApplicationContextAware.java)
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/ApplicationContextAware.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/ApplicationContextAware.java&p1=tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/awareness/ApplicationContextAware.java&r1=892972&r2=893303&rev=893303&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/awareness/ApplicationContextAware.java
(original)
+++
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/util/ApplicationContextAware.java
Tue Dec 22 20:18:35 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.awareness;
+package org.apache.tiles.request.util;
import org.apache.tiles.request.ApplicationContext;
Modified:
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java?rev=893303&r1=893302&r2=893303&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java
Tue Dec 22 20:18:35 2009
@@ -24,7 +24,6 @@
import java.util.Map;
import org.apache.tiles.TilesContainer;
-import org.apache.tiles.awareness.ApplicationContextAware;
import org.apache.tiles.awareness.TilesContainerAware;
import org.apache.tiles.evaluator.AttributeEvaluatorFactory;
import org.apache.tiles.evaluator.AttributeEvaluatorFactoryAware;
@@ -32,6 +31,7 @@
import org.apache.tiles.renderer.AttributeRenderer;
import org.apache.tiles.renderer.RendererFactory;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.util.ApplicationContextAware;
/**
* Basic renderer factory implementation.
Modified:
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java?rev=893303&r1=893302&r2=893303&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java
Tue Dec 22 20:18:35 2009
@@ -25,8 +25,8 @@
import javax.servlet.ServletContext;
import javax.servlet.jsp.JspFactory;
-import org.apache.tiles.awareness.ApplicationContextAware;
import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.util.ApplicationContextAware;
/**
* Uses the JSP 2.1 {...@link ExpressionFactory} to be used in Tiles.
Modified:
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java?rev=893303&r1=893302&r2=893303&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java
Tue Dec 22 20:18:35 2009
@@ -33,7 +33,6 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.tiles.Attribute;
-import org.apache.tiles.awareness.ApplicationContextAware;
import org.apache.tiles.freemarker.FreeMarkerTilesException;
import org.apache.tiles.freemarker.servlet.TilesFreemarkerServlet;
import org.apache.tiles.impl.InvalidTemplateException;
@@ -42,6 +41,7 @@
import org.apache.tiles.request.Request;
import org.apache.tiles.request.servlet.ExternalWriterHttpServletResponse;
import org.apache.tiles.request.servlet.ServletRequest;
+import org.apache.tiles.request.util.ApplicationContextAware;
import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.util.IteratorEnumeration;
Modified:
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java?rev=893303&r1=893302&r2=893303&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java
Tue Dec 22 20:18:35 2009
@@ -29,12 +29,12 @@
import javax.servlet.ServletContext;
import org.apache.tiles.Attribute;
-import org.apache.tiles.awareness.ApplicationContextAware;
import org.apache.tiles.impl.InvalidTemplateException;
import org.apache.tiles.renderer.impl.AbstractTypeDetectingAttributeRenderer;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
import org.apache.tiles.request.servlet.ServletRequest;
+import org.apache.tiles.request.util.ApplicationContextAware;
import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.util.IteratorEnumeration;
import org.apache.velocity.Template;
