You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by mc...@apache.org on 2012/04/30 11:23:20 UTC
svn commit: r1332134 - in /tiles/framework/trunk:
tiles-parent/tiles-core/src/main/java/org/apache/tiles/startup/
tiles-parent/tiles-core/src/test/java/org/apache/tiles/startup/
tiles-parent/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/ tiles-re...
Author: mck
Date: Mon Apr 30 09:23:19 2012
New Revision: 1332134
URL: http://svn.apache.org/viewvc?rev=1332134&view=rev
Log:
http://mail-archives.apache.org/mod_mbox/tiles-dev/201202.mbox/%3C4F43A891.4090401%40nlebas.net%3E
Removed:
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/scope/
Modified:
tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/startup/AbstractTilesInitializer.java
tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/startup/AbstractTilesInitializerTest.java
tiles/framework/trunk/tiles-parent/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/UseAttributeTagTest.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/AbstractClientRequest.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/DefaultRequestWrapper.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/DispatchRequestWrapper.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/Request.java
tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/DefaultRequestWrapperTest.java
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestTest.java
tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/JspRequest.java
tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/JspRequestTest.java
tiles/framework/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequest.java
tiles/framework/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java
tiles/framework/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java
Modified: tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/startup/AbstractTilesInitializer.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/startup/AbstractTilesInitializer.java?rev=1332134&r1=1332133&r2=1332134&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/startup/AbstractTilesInitializer.java (original)
+++ tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/startup/AbstractTilesInitializer.java Mon Apr 30 09:23:19 2012
@@ -26,7 +26,6 @@ import org.apache.tiles.access.TilesAcce
import org.apache.tiles.factory.AbstractTilesContainerFactory;
import org.apache.tiles.request.ApplicationAccess;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.scope.ReflectionContextResolver;
/**
* Default Tiles initialization delegate implementation under a servlet
Modified: tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/startup/AbstractTilesInitializerTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/startup/AbstractTilesInitializerTest.java?rev=1332134&r1=1332133&r2=1332134&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/startup/AbstractTilesInitializerTest.java (original)
+++ tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/startup/AbstractTilesInitializerTest.java Mon Apr 30 09:23:19 2012
@@ -31,7 +31,6 @@ import org.apache.tiles.access.TilesAcce
import org.apache.tiles.factory.AbstractTilesContainerFactory;
import org.apache.tiles.request.ApplicationAccess;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.scope.ReflectionContextResolver;
import org.junit.Before;
import org.junit.Test;
Modified: tiles/framework/trunk/tiles-parent/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/UseAttributeTagTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/UseAttributeTagTest.java?rev=1332134&r1=1332133&r2=1332134&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/UseAttributeTagTest.java (original)
+++ tiles/framework/trunk/tiles-parent/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/UseAttributeTagTest.java Mon Apr 30 09:23:19 2012
@@ -43,7 +43,6 @@ import org.apache.tiles.access.TilesAcce
import org.apache.tiles.request.ApplicationAccess;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.jsp.JspRequest;
-import org.apache.tiles.request.scope.ReflectionContextResolver;
import org.junit.Before;
import org.junit.Test;
Modified: tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/AbstractClientRequest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/AbstractClientRequest.java?rev=1332134&r1=1332133&r2=1332134&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/AbstractClientRequest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/AbstractClientRequest.java Mon Apr 30 09:23:19 2012
@@ -69,11 +69,6 @@ public abstract class AbstractClientRequ
return applicationContext;
}
- @Override
- public List<String> getAvailableScopes() {
- return getNativeScopes();
- }
-
/**
* Returns the application scope.
*
Modified: tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/DefaultRequestWrapper.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/DefaultRequestWrapper.java?rev=1332134&r1=1332133&r2=1332134&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/DefaultRequestWrapper.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/DefaultRequestWrapper.java Mon Apr 30 09:23:19 2012
@@ -125,11 +125,6 @@ public class DefaultRequestWrapper imple
}
/** {@inheritDoc} */
- public List<String> getNativeScopes() {
- return Collections.<String>emptyList();
- }
-
- /** {@inheritDoc} */
public List<String> getAvailableScopes() {
return context.getAvailableScopes();
}
Modified: tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/DispatchRequestWrapper.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/DispatchRequestWrapper.java?rev=1332134&r1=1332133&r2=1332134&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/DispatchRequestWrapper.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/DispatchRequestWrapper.java Mon Apr 30 09:23:19 2012
@@ -79,11 +79,6 @@ public class DispatchRequestWrapper exte
}
/** {@inheritDoc} */
- public List<String> getNativeScopes() {
- return Collections.<String>emptyList();
- }
-
- /** {@inheritDoc} */
public List<String> getAvailableScopes() {
return context.getAvailableScopes();
}
Modified: tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/Request.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/Request.java?rev=1332134&r1=1332133&r2=1332134&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/Request.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-api/src/main/java/org/apache/tiles/request/Request.java Mon Apr 30 09:23:19 2012
@@ -71,15 +71,6 @@ public interface Request {
Map<String, Object> getContext(String scope);
/**
- * Returns the native scopes, i.e. scopes that are native to the
- * implementation of the request itself (request, session and application
- * for example).
- *
- * @return The native scopes.
- */
- List<String> getNativeScopes();
-
- /**
* Returns all available scopes, that are the ones returned by
* {@link #getNativeScopes()} plus derivative scopes (e.g. flash scope).
*
Modified: tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/DefaultRequestWrapperTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/DefaultRequestWrapperTest.java?rev=1332134&r1=1332133&r2=1332134&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/DefaultRequestWrapperTest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-api/src/test/java/org/apache/tiles/request/DefaultRequestWrapperTest.java Mon Apr 30 09:23:19 2012
@@ -151,19 +151,6 @@ public class DefaultRequestWrapperTest {
}
/**
- * Test method for {@link org.apache.tiles.request.DefaultRequestWrapper#getNativeScopes()}.
- */
- @Test
- public void testGetNativeScopes() {
- Request wrappedRequest = createMockRequest();
-
- replay(wrappedRequest);
- RequestWrapper request = createRequestWrapper(wrappedRequest);
- assertTrue(0 == request.getNativeScopes().size());
- verify(wrappedRequest);
- }
-
- /**
* Test method for {@link org.apache.tiles.request.DefaultRequestWrapper#getAvailableScopes()}.
*/
@SuppressWarnings("unchecked")
Modified: tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java?rev=1332134&r1=1332133&r2=1332134&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java Mon Apr 30 09:23:19 2012
@@ -121,7 +121,7 @@ public class FreemarkerRequest extends A
}
@Override
- public List<String> getNativeScopes() {
+ public List<String> getAvailableScopes() {
return SCOPES;
}
Modified: tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestTest.java?rev=1332134&r1=1332133&r2=1332134&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestTest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestTest.java Mon Apr 30 09:23:19 2012
@@ -157,18 +157,6 @@ public class FreemarkerRequestTest {
}
/**
- * Tests {@link FreemarkerRequest#getNativeScopes()}.
- */
- @Test
- public void testGetNativeScopes() {
- DispatchRequest enclosedRequest = createMock(DispatchRequest.class);
- replay(enclosedRequest);
- context = new FreemarkerRequest(enclosedRequest, env);
- assertArrayEquals(new String[] {"page"}, context.getNativeScopes().toArray());
- verify(enclosedRequest);
- }
-
- /**
* Tests {@link FreemarkerRequest#getRequestLocale()}.
*/
@Test
Modified: tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/JspRequest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/JspRequest.java?rev=1332134&r1=1332133&r2=1332134&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/JspRequest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/JspRequest.java Mon Apr 30 09:23:19 2012
@@ -112,7 +112,7 @@ public class JspRequest extends Abstract
}
@Override
- public List<String> getNativeScopes() {
+ public List<String> getAvailableScopes() {
return SCOPES;
}
Modified: tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/JspRequestTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/JspRequestTest.java?rev=1332134&r1=1332133&r2=1332134&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/JspRequestTest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/JspRequestTest.java Mon Apr 30 09:23:19 2012
@@ -72,17 +72,6 @@ public class JspRequestTest {
}
/**
- * Test method for {@link org.apache.tiles.request.jsp.JspRequest#getNativeScopes()}.
- */
- @Test
- public void testGetNativeScopes() {
- replay(context, enclosedRequest);
- assertArrayEquals(new String[] { "page", "request", "session",
- "application" }, request.getNativeScopes().toArray());
- verify(context, enclosedRequest);
- }
-
- /**
* Test method for {@link org.apache.tiles.request.jsp.JspRequest#getWriter()}.
*/
@Test
Modified: tiles/framework/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequest.java?rev=1332134&r1=1332133&r2=1332134&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/request/portlet/PortletRequest.java Mon Apr 30 09:23:19 2012
@@ -229,7 +229,7 @@ public class PortletRequest extends Abst
}
@Override
- public List<String> getNativeScopes() {
+ public List<String> getAvailableScopes() {
return SCOPES;
}
Modified: tiles/framework/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java?rev=1332134&r1=1332133&r2=1332134&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java Mon Apr 30 09:23:19 2012
@@ -310,15 +310,6 @@ public class PortletRequestTest {
}
/**
- * Test method for {@link org.apache.tiles.request.portlet.PortletRequest#getNativeScopes()}.
- */
- @Test
- public void testGetNativeScopes() {
- assertArrayEquals(new String[] { "request", "portletSession",
- "session", "application" }, req.getNativeScopes().toArray());
- }
-
- /**
* Test method for {@link org.apache.tiles.request.portlet.PortletRequest#getOutputStream()}.
* @throws IOException If something goes wrong.
*/
Modified: tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java?rev=1332134&r1=1332133&r2=1332134&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java Mon Apr 30 09:23:19 2012
@@ -216,7 +216,7 @@ public class ServletRequest extends Abst
}
@Override
- public List<String> getNativeScopes() {
+ public List<String> getAvailableScopes() {
return SCOPES;
}
Modified: tiles/framework/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java?rev=1332134&r1=1332133&r2=1332134&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java Mon Apr 30 09:23:19 2012
@@ -274,14 +274,6 @@ public class ServletRequestTest {
}
/**
- * Test method for {@link org.apache.tiles.request.servlet.ServletRequest#getNativeScopes()}.
- */
- @Test
- public void testGetNativeScopes() {
- assertArrayEquals(new String[] {"request", "session", "application"}, req.getNativeScopes().toArray());
- }
-
- /**
* Test method for {@link org.apache.tiles.request.servlet.ServletRequest#getOutputStream()}.
* @throws IOException If something goes wrong.
*/
Modified: tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java?rev=1332134&r1=1332133&r2=1332134&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java Mon Apr 30 09:23:19 2012
@@ -103,7 +103,7 @@ public class VelocityRequest extends Abs
}
@Override
- public List<String> getNativeScopes() {
+ public List<String> getAvailableScopes() {
return SCOPES;
}
Modified: tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java?rev=1332134&r1=1332133&r2=1332134&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/VelocityRequestTest.java Mon Apr 30 09:23:19 2012
@@ -91,18 +91,6 @@ public class VelocityRequestTest {
}
/**
- * Tests {@link FreemarkerRequest#getNativeScopes()}.
- */
- @Test
- public void testGetNativeScopes() {
- DispatchRequest enclosedRequest = createMock(DispatchRequest.class);
- replay(enclosedRequest);
- context = new VelocityRequest(enclosedRequest, velocityContext, writer);
- assertArrayEquals(new String[] {"page"}, context.getNativeScopes().toArray());
- verify(enclosedRequest);
- }
-
- /**
* Tests {@link VelocityRequest#doInclude(String)}.
*
* @throws IOException If something goes wrong.
Re: svn commit: r1332134 - in /tiles/framework/trunk:
tiles-parent/tiles-core/src/main/java/org/apache/tiles/startup/
tiles-parent/tiles-core/src/test/java/org/apache/tiles/startup/
tiles-parent/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/
tiles-re...
Posted by Mick Semb Wever <mc...@apache.org>.
On Mon, 2012-04-30 at 08:51 -0400, Nicolas LE BAS wrote:
> I think this is a slight mistake: SCOPES contains only {"page"}, it
> should contain {"page", parent.availableScopes}.
>
> Same for Velocity (JSP is correct however).
I completely missed that.
Did it ever work that way?
(has it been messed up recently?)
~mck
--
Daddy, why doesn't this magnet pick up this floppy disk?
| http://github.com/finn-no | http://tech.finn.no |
Re: svn commit: r1332134 - in /tiles/framework/trunk: tiles-parent/tiles-core/src/main/java/org/apache/tiles/startup/
tiles-parent/tiles-core/src/test/java/org/apache/tiles/startup/ tiles-parent/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/
tiles-re...
Posted by Nicolas LE BAS <ma...@nlebas.net>.
I think this is a slight mistake: SCOPES contains only {"page"}, it
should contain {"page", parent.availableScopes}.
Same for Velocity (JSP is correct however).
And the unit test is missing.
On 12-04-30 05:23 AM, mck@apache.org wrote:
> Modified: tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java
> URL:http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java?rev=1332134&r1=1332133&r2=1332134&view=diff
> ==============================================================================
> --- tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java (original)
> +++ tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java Mon Apr 30 09:23:19 2012
> @@ -121,7 +121,7 @@ public class FreemarkerRequest extends A
> }
>
> @Override
> - public List<String> getNativeScopes() {
> + public List<String> getAvailableScopes() {
> return SCOPES;
> }
>