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/27 20:15:17 UTC
svn commit: r1305937 - in /tiles/framework/trunk:
tiles-autotag/tiles-autotag-core-runtime/src/main/java/org/apache/tiles/autotag/core/runtime/composition/
tiles-autotag/tiles-autotag-core-runtime/src/test/java/org/apache/tiles/autotag/core/runtime/com...
Author: nlebas
Date: Tue Mar 27 18:15:15 2012
New Revision: 1305937
URL: http://svn.apache.org/viewvc?rev=1305937&view=rev
Log:
moved ComposeStackUtil out of autotag because it is tiles-specific
Added:
tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/ComposeStackUtil.java
- copied, changed from r1305936, tiles/framework/trunk/tiles-autotag/tiles-autotag-core-runtime/src/main/java/org/apache/tiles/autotag/core/runtime/composition/ComposeStackUtil.java
tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/ComposeStackUtilTest.java
- copied, changed from r1305936, tiles/framework/trunk/tiles-autotag/tiles-autotag-core-runtime/src/test/java/org/apache/tiles/autotag/core/runtime/composition/ComposeStackUtilTest.java
Removed:
tiles/framework/trunk/tiles-autotag/tiles-autotag-core-runtime/src/main/java/org/apache/tiles/autotag/core/runtime/composition/ComposeStackUtil.java
tiles/framework/trunk/tiles-autotag/tiles-autotag-core-runtime/src/main/java/org/apache/tiles/autotag/core/runtime/composition/package-info.java
tiles/framework/trunk/tiles-autotag/tiles-autotag-core-runtime/src/test/java/org/apache/tiles/autotag/core/runtime/composition/ComposeStackUtilTest.java
Modified:
tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/AddAttributeModel.java
tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/AddListAttributeModel.java
tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/DefinitionModel.java
tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java
tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java
tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java
tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java
tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/AddAttributeModelTest.java
tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/AddListAttributeModelTest.java
tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/DefinitionModelTest.java
tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java
tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/InsertAttributeModelTest.java
tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/PutAttributeModelTest.java
tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/PutListAttributeModelTest.java
Modified: tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/AddAttributeModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/AddAttributeModel.java?rev=1305937&r1=1305936&r2=1305937&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/AddAttributeModel.java (original)
+++ tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/AddAttributeModel.java Tue Mar 27 18:15:15 2012
@@ -28,7 +28,6 @@ import org.apache.tiles.Attribute;
import org.apache.tiles.Expression;
import org.apache.tiles.ListAttribute;
import org.apache.tiles.autotag.core.runtime.ModelBody;
-import org.apache.tiles.autotag.core.runtime.composition.ComposeStackUtil;
import org.apache.tiles.request.Request;
/**
Modified: tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/AddListAttributeModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/AddListAttributeModel.java?rev=1305937&r1=1305936&r2=1305937&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/AddListAttributeModel.java (original)
+++ tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/AddListAttributeModel.java Tue Mar 27 18:15:15 2012
@@ -26,7 +26,6 @@ import java.util.Deque;
import org.apache.tiles.ListAttribute;
import org.apache.tiles.autotag.core.runtime.ModelBody;
-import org.apache.tiles.autotag.core.runtime.composition.ComposeStackUtil;
import org.apache.tiles.request.Request;
/**
Copied: tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/ComposeStackUtil.java (from r1305936, tiles/framework/trunk/tiles-autotag/tiles-autotag-core-runtime/src/main/java/org/apache/tiles/autotag/core/runtime/composition/ComposeStackUtil.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/ComposeStackUtil.java?p2=tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/ComposeStackUtil.java&p1=tiles/framework/trunk/tiles-autotag/tiles-autotag-core-runtime/src/main/java/org/apache/tiles/autotag/core/runtime/composition/ComposeStackUtil.java&r1=1305936&r2=1305937&rev=1305937&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-core-runtime/src/main/java/org/apache/tiles/autotag/core/runtime/composition/ComposeStackUtil.java (original)
+++ tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/ComposeStackUtil.java Tue Mar 27 18:15:15 2012
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.autotag.core.runtime.composition;
+package org.apache.tiles.template;
import java.util.Deque;
import java.util.LinkedList;
Modified: tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/DefinitionModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/DefinitionModel.java?rev=1305937&r1=1305936&r2=1305937&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/DefinitionModel.java (original)
+++ tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/DefinitionModel.java Tue Mar 27 18:15:15 2012
@@ -29,7 +29,6 @@ import org.apache.tiles.Definition;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.autotag.core.runtime.ModelBody;
import org.apache.tiles.autotag.core.runtime.annotation.Parameter;
-import org.apache.tiles.autotag.core.runtime.composition.ComposeStackUtil;
import org.apache.tiles.mgmt.MutableTilesContainer;
import org.apache.tiles.request.Request;
Modified: tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java?rev=1305937&r1=1305936&r2=1305937&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java (original)
+++ tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java Tue Mar 27 18:15:15 2012
@@ -30,7 +30,6 @@ import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.autotag.core.runtime.ModelBody;
import org.apache.tiles.autotag.core.runtime.annotation.Parameter;
-import org.apache.tiles.autotag.core.runtime.composition.ComposeStackUtil;
import org.apache.tiles.request.Request;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java?rev=1305937&r1=1305936&r2=1305937&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java (original)
+++ tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java Tue Mar 27 18:15:15 2012
@@ -28,7 +28,6 @@ import org.apache.tiles.Attribute;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.autotag.core.runtime.ModelBody;
-import org.apache.tiles.autotag.core.runtime.composition.ComposeStackUtil;
import org.apache.tiles.request.Request;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java?rev=1305937&r1=1305936&r2=1305937&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java (original)
+++ tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java Tue Mar 27 18:15:15 2012
@@ -31,7 +31,6 @@ import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.autotag.core.runtime.ModelBody;
import org.apache.tiles.autotag.core.runtime.annotation.Parameter;
-import org.apache.tiles.autotag.core.runtime.composition.ComposeStackUtil;
import org.apache.tiles.request.Request;
/**
Modified: tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java?rev=1305937&r1=1305936&r2=1305937&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java (original)
+++ tiles/framework/trunk/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java Tue Mar 27 18:15:15 2012
@@ -31,7 +31,6 @@ import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.autotag.core.runtime.ModelBody;
import org.apache.tiles.autotag.core.runtime.annotation.Parameter;
-import org.apache.tiles.autotag.core.runtime.composition.ComposeStackUtil;
import org.apache.tiles.request.Request;
/**
Modified: tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/AddAttributeModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/AddAttributeModelTest.java?rev=1305937&r1=1305936&r2=1305937&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/AddAttributeModelTest.java (original)
+++ tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/AddAttributeModelTest.java Tue Mar 27 18:15:15 2012
@@ -35,7 +35,6 @@ import java.util.Map;
import org.apache.tiles.Attribute;
import org.apache.tiles.ListAttribute;
import org.apache.tiles.autotag.core.runtime.ModelBody;
-import org.apache.tiles.autotag.core.runtime.composition.ComposeStackUtil;
import org.apache.tiles.request.Request;
import org.junit.Before;
import org.junit.Test;
Modified: tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/AddListAttributeModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/AddListAttributeModelTest.java?rev=1305937&r1=1305936&r2=1305937&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/AddListAttributeModelTest.java (original)
+++ tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/AddListAttributeModelTest.java Tue Mar 27 18:15:15 2012
@@ -33,7 +33,6 @@ import java.util.Map;
import org.apache.tiles.ListAttribute;
import org.apache.tiles.autotag.core.runtime.ModelBody;
-import org.apache.tiles.autotag.core.runtime.composition.ComposeStackUtil;
import org.apache.tiles.request.Request;
import org.junit.Before;
import org.junit.Test;
Copied: tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/ComposeStackUtilTest.java (from r1305936, tiles/framework/trunk/tiles-autotag/tiles-autotag-core-runtime/src/test/java/org/apache/tiles/autotag/core/runtime/composition/ComposeStackUtilTest.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/ComposeStackUtilTest.java?p2=tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/ComposeStackUtilTest.java&p1=tiles/framework/trunk/tiles-autotag/tiles-autotag-core-runtime/src/test/java/org/apache/tiles/autotag/core/runtime/composition/ComposeStackUtilTest.java&r1=1305936&r2=1305937&rev=1305937&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-core-runtime/src/test/java/org/apache/tiles/autotag/core/runtime/composition/ComposeStackUtilTest.java (original)
+++ tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/ComposeStackUtilTest.java Tue Mar 27 18:15:15 2012
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.autotag.core.runtime.composition;
+package org.apache.tiles.template;
import static org.easymock.EasyMock.*;
import static org.junit.Assert.*;
@@ -31,6 +31,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.tiles.request.Request;
+import org.apache.tiles.template.ComposeStackUtil;
import org.junit.Test;
/**
@@ -51,7 +52,7 @@ public class ComposeStackUtilTest {
private static final long LONG_VALUE = 2L;
/**
- * Test method for {@link org.apache.tiles.autotag.core.runtime.composition.ComposeStackUtil
+ * Test method for {@link org.apache.tiles.template.ComposeStackUtil
* #findAncestorWithClass(java.util.Stack, java.lang.Class)}.
*/
@Test
Modified: tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/DefinitionModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/DefinitionModelTest.java?rev=1305937&r1=1305936&r2=1305937&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/DefinitionModelTest.java (original)
+++ tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/DefinitionModelTest.java Tue Mar 27 18:15:15 2012
@@ -34,7 +34,6 @@ import org.apache.tiles.Attribute;
import org.apache.tiles.Definition;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.autotag.core.runtime.ModelBody;
-import org.apache.tiles.autotag.core.runtime.composition.ComposeStackUtil;
import org.apache.tiles.mgmt.MutableTilesContainer;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
Modified: tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java?rev=1305937&r1=1305936&r2=1305937&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java (original)
+++ tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java Tue Mar 27 18:15:15 2012
@@ -36,7 +36,6 @@ import org.apache.tiles.AttributeContext
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.autotag.core.runtime.ModelBody;
-import org.apache.tiles.autotag.core.runtime.composition.ComposeStackUtil;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
import org.junit.Before;
Modified: tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/InsertAttributeModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/InsertAttributeModelTest.java?rev=1305937&r1=1305936&r2=1305937&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/InsertAttributeModelTest.java (original)
+++ tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/InsertAttributeModelTest.java Tue Mar 27 18:15:15 2012
@@ -34,7 +34,6 @@ import org.apache.tiles.AttributeContext
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.autotag.core.runtime.ModelBody;
-import org.apache.tiles.autotag.core.runtime.composition.ComposeStackUtil;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
import org.junit.Before;
Modified: tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/PutAttributeModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/PutAttributeModelTest.java?rev=1305937&r1=1305936&r2=1305937&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/PutAttributeModelTest.java (original)
+++ tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/PutAttributeModelTest.java Tue Mar 27 18:15:15 2012
@@ -36,7 +36,6 @@ import org.apache.tiles.ListAttribute;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.autotag.core.runtime.ModelBody;
-import org.apache.tiles.autotag.core.runtime.composition.ComposeStackUtil;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
import org.junit.Before;
Modified: tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/PutListAttributeModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/PutListAttributeModelTest.java?rev=1305937&r1=1305936&r2=1305937&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/PutListAttributeModelTest.java (original)
+++ tiles/framework/trunk/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/PutListAttributeModelTest.java Tue Mar 27 18:15:15 2012
@@ -36,7 +36,6 @@ import org.apache.tiles.ListAttribute;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.autotag.core.runtime.ModelBody;
-import org.apache.tiles.autotag.core.runtime.composition.ComposeStackUtil;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
import org.junit.Before;