Author: apetrelli
Date: Wed Mar 17 20:53:19 2010
New Revision: 924484
URL: http://svn.apache.org/viewvc?rev=924484&view=rev
Log:
TILESSB-28
Moved classes from Tiles-Freemarker to Autotag-Freemarker runtime module.
Added:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/BodyFMModel.java
- copied, changed from r922873,
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/BodyFMModel.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/BodylessFMModel.java
- copied, changed from r922873,
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/BodylessFMModel.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreeMarkerUtil.java
- copied, changed from r922873,
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagException.java
(with props)
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerModelBody.java
- copied, changed from r922873,
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/FreemarkerModelBody.java
Removed:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/META-INF/
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/pom.xml
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/resources/org/apache/tiles/autotag/freemarker/fmModel.vm
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffFMModel.javat
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffNoBodyFMModel.javat
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/pom.xml?rev=924484&r1=924483&r2=924484&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/pom.xml
(original)
+++ tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/pom.xml
Wed Mar 17 20:53:19 2010
@@ -10,4 +10,21 @@
<version>1.0-SNAPSHOT</version>
<name>Autotag - Freemarker runtime classes</name>
<description>Runtime classes for Autotag-Freemarker support.</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-autotag-core-runtime</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.16</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-request-freemarker</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
Copied:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/BodyFMModel.java
(from r922873,
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/BodyFMModel.java)
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/BodyFMModel.java?p2=tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/BodyFMModel.java&p1=tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/BodyFMModel.java&r1=922873&r2=924484&rev=924484&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/BodyFMModel.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/BodyFMModel.java
Wed Mar 17 20:53:19 2010
@@ -1,10 +1,9 @@
-package org.apache.tiles.freemarker.template;
+package org.apache.tiles.autotag.freemarker.runtime;
import java.io.IOException;
import java.util.Map;
import org.apache.tiles.autotag.core.runtime.ModelBody;
-import org.apache.tiles.freemarker.FreemarkerModelBody;
import org.apache.tiles.request.Request;
import org.apache.tiles.request.freemarker.FreemarkerRequest;
import org.apache.tiles.request.freemarker.FreemarkerRequestUtil;
Copied:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/BodylessFMModel.java
(from r922873,
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/BodylessFMModel.java)
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/BodylessFMModel.java?p2=tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/BodylessFMModel.java&p1=tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/BodylessFMModel.java&r1=922873&r2=924484&rev=924484&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/BodylessFMModel.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/BodylessFMModel.java
Wed Mar 17 20:53:19 2010
@@ -1,4 +1,4 @@
-package org.apache.tiles.freemarker.template;
+package org.apache.tiles.autotag.freemarker.runtime;
import java.io.IOException;
import java.util.Map;
Copied:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreeMarkerUtil.java
(from r922873,
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java)
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreeMarkerUtil.java?p2=tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreeMarkerUtil.java&p1=tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java&r1=922873&r2=924484&rev=924484&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreeMarkerUtil.java
Wed Mar 17 20:53:19 2010
@@ -19,9 +19,7 @@
* under the License.
*/
-package org.apache.tiles.freemarker.context;
-
-import org.apache.tiles.freemarker.FreeMarkerTilesException;
+package org.apache.tiles.autotag.freemarker.runtime;
import freemarker.template.TemplateModel;
import freemarker.template.TemplateModelException;
@@ -57,7 +55,7 @@ public final class FreeMarkerUtil {
try {
return (String) DeepUnwrap.unwrap(model);
} catch (TemplateModelException e) {
- throw new FreeMarkerTilesException("Cannot unwrap a model", e);
+ throw new FreemarkerAutotagException("Cannot unwrap a model", e);
}
}
@@ -74,7 +72,7 @@ public final class FreeMarkerUtil {
Boolean retValue = (Boolean) DeepUnwrap.unwrap(model);
return retValue != null ? retValue : defaultValue;
} catch (TemplateModelException e) {
- throw new FreeMarkerTilesException("Cannot unwrap a model", e);
+ throw new FreemarkerAutotagException("Cannot unwrap a model", e);
}
}
@@ -89,7 +87,7 @@ public final class FreeMarkerUtil {
try {
return DeepUnwrap.unwrap(model);
} catch (TemplateModelException e) {
- throw new FreeMarkerTilesException("Cannot unwrap a model", e);
+ throw new FreemarkerAutotagException("Cannot unwrap a model", e);
}
}
@@ -108,7 +106,7 @@ public final class FreeMarkerUtil {
}
return retValue;
} catch (TemplateModelException e) {
- throw new FreeMarkerTilesException("Cannot unwrap a model", e);
+ throw new FreemarkerAutotagException("Cannot unwrap a model", e);
}
}
}
Added:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagException.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagException.java?rev=924484&view=auto
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagException.java
(added)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagException.java
Wed Mar 17 20:53:19 2010
@@ -0,0 +1,20 @@
+package org.apache.tiles.autotag.freemarker.runtime;
+
+public class FreemarkerAutotagException extends RuntimeException {
+
+ public FreemarkerAutotagException() {
+ }
+
+ public FreemarkerAutotagException(String message) {
+ super(message);
+ }
+
+ public FreemarkerAutotagException(Throwable cause) {
+ super(cause);
+ }
+
+ public FreemarkerAutotagException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+}
Propchange:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagException.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerModelBody.java
(from r922873,
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/FreemarkerModelBody.java)
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerModelBody.java?p2=tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerModelBody.java&p1=tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/FreemarkerModelBody.java&r1=922873&r2=924484&rev=924484&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/FreemarkerModelBody.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerModelBody.java
Wed Mar 17 20:53:19 2010
@@ -1,4 +1,4 @@
-package org.apache.tiles.freemarker;
+package org.apache.tiles.autotag.freemarker.runtime;
import java.io.IOException;
import java.io.Writer;
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/resources/org/apache/tiles/autotag/freemarker/fmModel.vm
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/resources/org/apache/tiles/autotag/freemarker/fmModel.vm?rev=924484&r1=924483&r2=924484&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/resources/org/apache/tiles/autotag/freemarker/fmModel.vm
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/resources/org/apache/tiles/autotag/freemarker/fmModel.vm
Wed Mar 17 20:53:19 2010
@@ -25,8 +25,8 @@ import java.util.Map;
#if(${clazz.hasBody()})
import org.apache.tiles.autotag.core.runtime.ModelBody;
#end
-import
org.apache.tiles.freemarker.template.Body#if(!${clazz.hasBody()})less#{end}FMModel;
-import org.apache.tiles.freemarker.context.FreeMarkerUtil;
+import
org.apache.tiles.autotag.freemarker.runtime.Body#if(!${clazz.hasBody()})less#{end}FMModel;
+import org.apache.tiles.autotag.freemarker.runtime.FreeMarkerUtil;
import org.apache.tiles.request.Request;
import freemarker.template.TemplateModel;
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffFMModel.javat
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffFMModel.javat?rev=924484&r1=924483&r2=924484&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffFMModel.javat
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffFMModel.javat
Wed Mar 17 20:53:19 2010
@@ -4,8 +4,8 @@ import java.io.IOException;
import java.util.Map;
import org.apache.tiles.autotag.core.runtime.ModelBody;
-import org.apache.tiles.freemarker.template.BodyFMModel;
-import org.apache.tiles.freemarker.context.FreeMarkerUtil;
+import org.apache.tiles.autotag.freemarker.runtime.BodyFMModel;
+import org.apache.tiles.autotag.freemarker.runtime.FreeMarkerUtil;
import org.apache.tiles.request.Request;
import freemarker.template.TemplateModel;
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffNoBodyFMModel.javat
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffNoBodyFMModel.javat?rev=924484&r1=924483&r2=924484&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffNoBodyFMModel.javat
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffNoBodyFMModel.javat
Wed Mar 17 20:53:19 2010
@@ -3,8 +3,8 @@ package org.apache.tiles.autotag.freemar
import java.io.IOException;
import java.util.Map;
-import org.apache.tiles.freemarker.template.BodylessFMModel;
-import org.apache.tiles.freemarker.context.FreeMarkerUtil;
+import org.apache.tiles.autotag.freemarker.runtime.BodylessFMModel;
+import org.apache.tiles.autotag.freemarker.runtime.FreeMarkerUtil;
import org.apache.tiles.request.Request;
import freemarker.template.TemplateModel;
