You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by nl...@apache.org on 2012/03/26 21:27:19 UTC
svn commit: r1305506 - in /tiles/framework/trunk/tiles-request/tiles-request-mustache/src: main/java/org/apache/tiles/request/ main/java/org/apache/tiles/request/extractor/ main/java/org/apache/tiles/request/mustache/ main/java/org/apache/tiles/request...

Author: nlebas
Date: Mon Mar 26 19:27:18 2012
New Revision: 1305506

URL: http://svn.apache.org/viewvc?rev=1305506&view=rev
Log:
create o.a.t.r.mustache package to avoid collisions

Added:
    tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/mustache/
    tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/mustache/MustacheRenderer.java
      - copied, changed from r1302746, tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/render/MustacheRenderer.java
    tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/mustache/MustacheScopeExtractor.java
      - copied, changed from r1302746, tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/extractor/MustacheScopeExtractor.java
    tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/mustache/MustacheScopeMap.java
      - copied, changed from r1302746, tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/MustacheScopeMap.java
    tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/mustache/package-info.java
    tiles/framework/trunk/tiles-request/tiles-request-mustache/src/test/java/org/apache/tiles/request/mustache/
    tiles/framework/trunk/tiles-request/tiles-request-mustache/src/test/java/org/apache/tiles/request/mustache/MustacheRendererTest.java
      - copied, changed from r1302746, tiles/framework/trunk/tiles-request/tiles-request-mustache/src/test/java/org/apache/tiles/request/render/MustacheRendererTest.java
Removed:
    tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/MustacheScopeMap.java
    tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/extractor/MustacheScopeExtractor.java
    tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/render/MustacheRenderer.java
    tiles/framework/trunk/tiles-request/tiles-request-mustache/src/test/java/org/apache/tiles/request/render/MustacheRendererTest.java

Copied: tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/mustache/MustacheRenderer.java (from r1302746, tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/render/MustacheRenderer.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/mustache/MustacheRenderer.java?p2=tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/mustache/MustacheRenderer.java&p1=tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/render/MustacheRenderer.java&r1=1302746&r2=1305506&rev=1305506&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/render/MustacheRenderer.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/mustache/MustacheRenderer.java Mon Mar 26 19:27:18 2012
@@ -19,7 +19,7 @@
  * under the License.
  */
 
-package org.apache.tiles.request.render;
+package org.apache.tiles.request.mustache;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -35,6 +35,8 @@ import com.sampullara.mustache.Scope;
 import org.apache.tiles.request.ApplicationContext;
 import org.apache.tiles.request.ApplicationResource;
 import org.apache.tiles.request.Request;
+import org.apache.tiles.request.render.CannotRenderException;
+import org.apache.tiles.request.render.Renderer;
 
 /**
  * The Mustache-specific renderer.

Copied: tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/mustache/MustacheScopeExtractor.java (from r1302746, tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/extractor/MustacheScopeExtractor.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/mustache/MustacheScopeExtractor.java?p2=tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/mustache/MustacheScopeExtractor.java&p1=tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/extractor/MustacheScopeExtractor.java&r1=1302746&r2=1305506&rev=1305506&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/extractor/MustacheScopeExtractor.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/mustache/MustacheScopeExtractor.java Mon Mar 26 19:27:18 2012
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.tiles.request.extractor;
+package org.apache.tiles.request.mustache;
 
 import java.util.Collections;
 import java.util.Enumeration;

Copied: tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/mustache/MustacheScopeMap.java (from r1302746, tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/MustacheScopeMap.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/mustache/MustacheScopeMap.java?p2=tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/mustache/MustacheScopeMap.java&p1=tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/MustacheScopeMap.java&r1=1302746&r2=1305506&rev=1305506&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/MustacheScopeMap.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/mustache/MustacheScopeMap.java Mon Mar 26 19:27:18 2012
@@ -18,13 +18,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tiles.request;
+package org.apache.tiles.request.mustache;
 
 import java.util.Set;
 
 import com.sampullara.mustache.Scope;
 import org.apache.tiles.request.collection.ScopeMap;
-import org.apache.tiles.request.extractor.MustacheScopeExtractor;
 
 
 final class MustacheScopeMap extends ScopeMap {

Added: tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/mustache/package-info.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/mustache/package-info.java?rev=1305506&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/mustache/package-info.java (added)
+++ tiles/framework/trunk/tiles-request/tiles-request-mustache/src/main/java/org/apache/tiles/request/mustache/package-info.java Mon Mar 26 19:27:18 2012
@@ -0,0 +1,24 @@
+/*
+ * $Id: package-info.java 1049711 2010-12-15 21:12:00Z apetrelli $
+ *
+ * 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.
+ */
+/**
+ * Support of Tiles request for Mustache.
+ */
+package org.apache.tiles.request.mustache;

Copied: tiles/framework/trunk/tiles-request/tiles-request-mustache/src/test/java/org/apache/tiles/request/mustache/MustacheRendererTest.java (from r1302746, tiles/framework/trunk/tiles-request/tiles-request-mustache/src/test/java/org/apache/tiles/request/render/MustacheRendererTest.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-mustache/src/test/java/org/apache/tiles/request/mustache/MustacheRendererTest.java?p2=tiles/framework/trunk/tiles-request/tiles-request-mustache/src/test/java/org/apache/tiles/request/mustache/MustacheRendererTest.java&p1=tiles/framework/trunk/tiles-request/tiles-request-mustache/src/test/java/org/apache/tiles/request/render/MustacheRendererTest.java&r1=1302746&r2=1305506&rev=1305506&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-mustache/src/test/java/org/apache/tiles/request/render/MustacheRendererTest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-mustache/src/test/java/org/apache/tiles/request/mustache/MustacheRendererTest.java Mon Mar 26 19:27:18 2012
@@ -18,7 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tiles.request.render;
+package org.apache.tiles.request.mustache;
 
 
 import java.io.IOException;
@@ -30,6 +30,9 @@ import java.util.regex.Pattern;
 
 import org.apache.tiles.request.ApplicationContext;
 import org.apache.tiles.request.ApplicationResource;
+import org.apache.tiles.request.mustache.MustacheRenderer;
+import org.apache.tiles.request.render.CannotRenderException;
+import org.apache.tiles.request.render.Renderer;
 import org.apache.tiles.request.servlet.ServletRequest;
 import org.junit.Test;