svn commit: r1377697 - in /tiles/request/trunk/tiles-request-mustache: pom.xml src/test/java/org/apache/tiles/request/mustache/MustacheRendererTest.java

[mc...@apache.org]

Author: mck
Date: Mon Aug 27 14:37:49 2012
New Revision: 1377697

URL: http://svn.apache.org/viewvc?rev=1377697&view=rev
Log:
rollback tiles-request-mustache-1.1 and r1377665

Modified:
    tiles/request/trunk/tiles-request-mustache/pom.xml
    tiles/request/trunk/tiles-request-mustache/src/test/java/org/apache/tiles/request/mustache/MustacheRendererTest.java

Modified: tiles/request/trunk/tiles-request-mustache/pom.xml
URL: http://svn.apache.org/viewvc/tiles/request/trunk/tiles-request-mustache/pom.xml?rev=1377697&r1=1377696&r2=1377697&view=diff
==============================================================================
--- tiles/request/trunk/tiles-request-mustache/pom.xml (original)
+++ tiles/request/trunk/tiles-request-mustache/pom.xml Mon Aug 27 14:37:49 2012
@@ -24,18 +24,17 @@ under the License.
   <parent>
     <artifactId>tiles-request</artifactId>
     <groupId>org.apache.tiles</groupId>
-    <version>1.0.1</version>
+    <version>1.1-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.tiles</groupId>
   <artifactId>tiles-request-mustache</artifactId>
-  <version>1.2-SNAPSHOT</version>
+  <version>1.1-SNAPSHOT</version>
   <name>Tiles request - Mustache support</name>
   <description>Tiles request implementation for Mustache templates.</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.tiles</groupId>
       <artifactId>tiles-request-api</artifactId>
-      <version>1.0.1</version>
     </dependency>
     <dependency>
         <groupId>com.github.spullara.mustache.java</groupId>

Modified: tiles/request/trunk/tiles-request-mustache/src/test/java/org/apache/tiles/request/mustache/MustacheRendererTest.java
URL: http://svn.apache.org/viewvc/tiles/request/trunk/tiles-request-mustache/src/test/java/org/apache/tiles/request/mustache/MustacheRendererTest.java?rev=1377697&r1=1377696&r2=1377697&view=diff
==============================================================================
--- tiles/request/trunk/tiles-request-mustache/src/test/java/org/apache/tiles/request/mustache/MustacheRendererTest.java (original)
+++ tiles/request/trunk/tiles-request-mustache/src/test/java/org/apache/tiles/request/mustache/MustacheRendererTest.java Mon Aug 27 14:37:49 2012
@@ -65,10 +65,10 @@ public final class MustacheRendererTest 
         Map<String,Object> context = Collections.singletonMap("testKey", (Object)"test value");
 
         expect(applicationContext.getResource(isA(String.class))).andReturn(applicationResource).anyTimes();
-        expect(request.getAvailableScopes()).andReturn(Arrays.asList("request"/*Request.REQUEST_SCOPE*/, "session", "application"/*Request.APPLICATION_SCOPE*/));
-        expect(request.getContext("request"/*Request.REQUEST_SCOPE*/)).andReturn(context);
+        expect(request.getAvailableScopes()).andReturn(Arrays.asList(Request.REQUEST_SCOPE, "session", Request.APPLICATION_SCOPE));
+        expect(request.getContext(Request.REQUEST_SCOPE)).andReturn(context);
         expect(request.getContext("session")).andReturn(Collections.<String,Object>emptyMap());
-        expect(request.getContext("application"/*Request.APPLICATION_SCOPE*/)).andReturn(Collections.<String,Object>emptyMap());
+        expect(request.getContext(Request.APPLICATION_SCOPE)).andReturn(Collections.<String,Object>emptyMap());
         expect(request.getWriter()).andReturn(writer).anyTimes();
 
         replay(request, applicationContext, applicationResource);